Page MenuHomePhorge
Files F32174414

D14989.1765064033.diff
No OneTemporary
Actions

Size
13 KB
Referenced Files
None
Subscribers
None

D14989.1765064033.diff
View Options

diff --git a/native/.flowconfig b/native/.flowconfig
--- a/native/.flowconfig
+++ b/native/.flowconfig
@@ -20,9 +20,6 @@
[untyped]
.*/node_modules/@react-native-community/cli/.*/.*
-[declarations]
-.*/node_modules/react-native-camera/*
-
[include]
../node_modules
../lib
diff --git a/native/flow-typed/npm/expo-barcode-scanner_vx.x.x.js b/native/flow-typed/npm/expo-barcode-scanner_vx.x.x.js
deleted file mode 100644
--- a/native/flow-typed/npm/expo-barcode-scanner_vx.x.x.js
+++ /dev/null
@@ -1,150 +0,0 @@
-// flow-typed signature: 8a42efbaee521b12bea4117c5019bce6
-// flow-typed version: <<STUB>>/expo-barcode-scanner_v12.1.0/flow_v0.182.0
-
-declare module 'expo-barcode-scanner' {
- declare type StyleObj =
- | null
- | void
- | number
- | false
- | ''
- | $ReadOnlyArray<StyleObj>
- | { [name: string]: any, ... };
-
- declare type ViewStyleProp = StyleObj;
- declare type ViewProps = {|
- style?: ViewStyleProp,
- |};
-
- declare opaque type BCT$aztec: number;
- declare opaque type BCT$codebar: number;
- declare opaque type BCT$code39: number;
- declare opaque type BCT$code93: number;
- declare opaque type BCT$code128: number;
- declare opaque type BCT$code39mod43: number;
- declare opaque type BCT$datamatrix: number;
- declare opaque type BCT$ean13: number;
- declare opaque type BCT$ean8: number;
- declare opaque type BCT$interleaved2of5: number;
- declare opaque type BCT$itf14: number;
- declare opaque type BCT$maxicode: number;
- declare opaque type BCT$pdf417: number;
- declare opaque type BCT$rss14: number;
- declare opaque type BCT$rssexpanded: number;
- declare opaque type BCT$upc_a: number;
- declare opaque type BCT$upc_e: number;
- declare opaque type BCT$upc_ean: number;
- declare opaque type BCT$qr: number;
-
- declare export type BarCodeTypeValues =
- | BCT$aztec
- | BCT$codebar
- | BCT$code39
- | BCT$code93
- | BCT$code128
- | BCT$code39mod43
- | BCT$datamatrix
- | BCT$ean13
- | BCT$ean8
- | BCT$interleaved2of5
- | BCT$itf14
- | BCT$maxicode
- | BCT$pdf417
- | BCT$rss14
- | BCT$rssexpanded
- | BCT$upc_a
- | BCT$upc_e
- | BCT$upc_ean
- | BCT$qr;
-
- declare export type BarCodeType = $ReadOnly<{|
- +aztec: BCT$aztec,
- +codebar: BCT$codebar,
- +code39: BCT$code39,
- +code93: BCT$code93,
- +code128: BCT$code128,
- +code39mod43: BCT$code39mod43,
- +datamatrix: BCT$datamatrix,
- +ean13: BCT$ean13,
- +ean8: BCT$ean8,
- +interleaved2of5: BCT$interleaved2of5,
- +itf14: BCT$itf14,
- +maxicode: BCT$maxicode,
- +pdf417: BCT$pdf417,
- +rss14: BCT$rss14,
- +rssexpanded: BCT$rssexpanded,
- +upc_a: BCT$upc_a,
- +upc_e: BCT$upc_e,
- +upc_ean: BCT$upc_ean,
- +qr: BCT$qr,
- |}>;
-
- declare export type Type = $ReadOnly<{|
- +front: string,
- +back: string,
- |}>;
-
- declare export type BarCodePoint = {|
- +x: number,
- +y: number,
- |};
-
- declare export type BarCodeSize = {|
- +height: number,
- +width: number,
- |};
-
- declare export type BarCodeBounds = {|
- +origin: BarCodePoint,
- +size: BarCodeSize,
- |};
-
- declare export type BarCodeScannerResult = {|
- +type: string,
- +data: string,
- +bounds?: BarCodeBounds,
- +cornerPoints?: $ReadOnlyArray<BarCodePoint>,
- |};
-
-
- declare export type BarCodeEvent = {|
- ...BarCodeScannerResult,
- +target?: number,
- |};
-
- declare export type BarCodeEventCallbackArguments = {|
- +nativeEvent: BarCodeEvent,
- |};
-
- declare export type BarCodeScannedCallback = (params: BarCodeEvent) => void;
-
- declare export type BarCodeScannerProps = {|
- +type?: "front" | "back" | number,
- +barCodeTypes?: $ReadOnlyArray<BarCodeTypeValues>,
- +onBarCodeScanned?: BarCodeScannedCallback,
- ...ViewProps,
- |};
-
- declare export type PermissionStatus =
- | 'undetermined'
- | 'granted'
- | 'denied';
-
- declare export type PermissionExpiration = 'never' | number;
-
- declare export type PermissionResponse = {|
- +status: PermissionStatus,
- +expires: PermissionExpiration,
- +granted: boolean,
- +canAskAgain: boolean,
- |};
-
- declare export class BarCodeScanner extends React$Component<BarCodeScannerProps> {
- static Constants: $ReadOnly<{|
- BarCodeType: BarCodeType,
- Type: Type,
- |}>;
-
- static requestPermissionsAsync(): Promise<PermissionResponse>;
- }
-}
diff --git a/native/ios/Comm.xcodeproj/project.pbxproj b/native/ios/Comm.xcodeproj/project.pbxproj
--- a/native/ios/Comm.xcodeproj/project.pbxproj
+++ b/native/ios/Comm.xcodeproj/project.pbxproj
@@ -1617,7 +1617,6 @@
"\"${PODS_CONFIGURATION_BUILD_DIR}/libwebp\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/lottie-ios\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/lottie-react-native\"",
- "\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-camera\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-in-app-message\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-netinfo\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-notifications\"",
@@ -1759,7 +1758,6 @@
"\"${PODS_CONFIGURATION_BUILD_DIR}/libwebp\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/lottie-ios\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/lottie-react-native\"",
- "\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-camera\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-in-app-message\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-netinfo\"",
"\"${PODS_CONFIGURATION_BUILD_DIR}/react-native-notifications\"",
diff --git a/native/ios/Podfile.lock b/native/ios/Podfile.lock
--- a/native/ios/Podfile.lock
+++ b/native/ios/Podfile.lock
@@ -5,11 +5,6 @@
- DoubleConversion (1.1.6)
- EXApplication (6.1.4):
- ExpoModulesCore
- - EXBarCodeScanner (12.1.0):
- - EXImageLoader
- - ExpoModulesCore
- - ZXingObjC/OneD
- - ZXingObjC/PDF417
- EXConstants (17.1.6):
- ExpoModulesCore
- EXImageLoader (5.1.0):
@@ -1720,14 +1715,6 @@
- React-jsiexecutor
- React-RCTFBReactNativeSpec
- ReactCommon/turbomodule/core
- - react-native-camera (3.31.0):
- - React
- - react-native-camera/RCT (= 3.31.0)
- - react-native-camera/RN (= 3.31.0)
- - react-native-camera/RCT (3.31.0):
- - React
- - react-native-camera/RN (3.31.0):
- - React
- react-native-in-app-message (1.0.2):
- React
- react-native-netinfo (11.4.1):
@@ -2352,18 +2339,12 @@
- VisionCamera/React (4.6.4):
- React-Core
- Yoga (0.0.0)
- - ZXingObjC/Core (3.6.9)
- - ZXingObjC/OneD (3.6.9):
- - ZXingObjC/Core
- - ZXingObjC/PDF417 (3.6.9):
- - ZXingObjC/Core
DEPENDENCIES:
- boost (from `../../node_modules/react-native/third-party-podspecs/boost.podspec`)
- CommExpoPackage (from `../expo-modules/comm-expo-package/ios`)
- DoubleConversion (from `../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- EXApplication (from `../../node_modules/expo-application/ios`)
- - EXBarCodeScanner (from `../../node_modules/expo-barcode-scanner/ios`)
- EXConstants (from `../../node_modules/expo-constants/ios`)
- EXImageLoader (from `../../node_modules/expo-image-loader/ios`)
- EXJSONUtils (from `../../node_modules/expo-json-utils/ios`)
@@ -2427,7 +2408,6 @@
- React-logger (from `../../node_modules/react-native/ReactCommon/logger`)
- React-Mapbuffer (from `../../node_modules/react-native/ReactCommon`)
- React-microtasksnativemodule (from `../../node_modules/react-native/ReactCommon/react/nativemodule/microtasks`)
- - react-native-camera (from `../node_modules/react-native-camera`)
- react-native-in-app-message (from `../node_modules/react-native-in-app-message`)
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
- react-native-orientation-locker (from `../node_modules/react-native-orientation-locker`)
@@ -2497,7 +2477,6 @@
- SDWebImageSVGCoder
- SDWebImageWebPCoder
- SocketRocket
- - ZXingObjC
EXTERNAL SOURCES:
boost:
@@ -2508,8 +2487,6 @@
:podspec: "../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
EXApplication:
:path: "../../node_modules/expo-application/ios"
- EXBarCodeScanner:
- :path: "../../node_modules/expo-barcode-scanner/ios"
EXConstants:
:path: "../../node_modules/expo-constants/ios"
EXImageLoader:
@@ -2629,8 +2606,6 @@
:path: "../../node_modules/react-native/ReactCommon"
React-microtasksnativemodule:
:path: "../../node_modules/react-native/ReactCommon/react/nativemodule/microtasks"
- react-native-camera:
- :path: "../node_modules/react-native-camera"
react-native-in-app-message:
:path: "../node_modules/react-native-in-app-message"
react-native-netinfo:
@@ -2743,7 +2718,6 @@
CommExpoPackage: 3f9d8a25537fb9d80f79a63fd1e73c51f55b87e9
DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
EXApplication: b28de982d44768fc593de9d19ca5a7a0e49685b1
- EXBarCodeScanner: cb4deb49e59b6c7ed6bbf38d187802359908d2a8
EXConstants: be238322d57d084dc055dbd5d6fe6479510504ce
EXImageLoader: ab4fcf9240cf3636a83c00e3fc5229d692899428
EXJSONUtils: 1d3e4590438c3ee593684186007028a14b3686cd
@@ -2811,7 +2785,6 @@
React-logger: 368570a253f00879a1e4fea24ed4047e72e7bbf3
React-Mapbuffer: c04fcda1c6281fc0a6824c7dcc1633dd217ac1ec
React-microtasksnativemodule: ca2804a25fdcefffa0aa942aa23ab53b99614a34
- react-native-camera: b5c8c7a71feecfdd5b39f0dbbf6b64b957ed55f2
react-native-in-app-message: f91de5009620af01456531118264c93e249b83ec
react-native-netinfo: f0a9899081c185db1de5bb2fdc1c88c202a059ac
react-native-orientation-locker: 851f6510d8046ea2f14aa169b1e01fcd309a94ba
@@ -2870,7 +2843,6 @@
SQLCipher-Amalgamation: 121e91239c53a3aba13ca742d6dd824c627c66ee
VisionCamera: b5c2b3c45e641102902a5194af11dc532805221e
Yoga: c758bfb934100bb4bf9cbaccb52557cee35e8bdf
- ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
PODFILE CHECKSUM: 5e1474a246e82fdfddfca6475d6eb9acc06f5d5a
diff --git a/native/package.json b/native/package.json
--- a/native/package.json
+++ b/native/package.json
@@ -80,7 +80,6 @@
"ethers": "^6.11.1",
"expo": "^53.0.9",
"expo-application": "~6.1.4",
- "expo-barcode-scanner": "~12.1.0",
"expo-dev-client": "~5.1.8",
"expo-file-system": "~18.1.10",
"expo-font": "~13.3.1",
@@ -100,7 +99,6 @@
"olm": "git+https://github.com/CommE2E/olm.git#v0.2.5",
"react": "19.0.0",
"react-native": "0.79.2",
- "react-native-camera": "^3.31.0",
"react-native-device-info": "^10.3.0",
"react-native-figma-squircle": "^0.1.2",
"react-native-floating-action": "^1.22.0",
diff --git a/patches/react-native-camera+3.31.0.patch b/patches/react-native-camera+3.31.0.patch
deleted file mode 100644
--- a/patches/react-native-camera+3.31.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/node_modules/react-native-camera/src/RNCamera.js b/node_modules/react-native-camera/src/RNCamera.js
-index b7a271a..2df81f6 100644
---- a/node_modules/react-native-camera/src/RNCamera.js
-+++ b/node_modules/react-native-camera/src/RNCamera.js
-@@ -5,7 +5,6 @@ import {
- findNodeHandle,
- Platform,
- NativeModules,
-- ViewPropTypes,
- requireNativeComponent,
- View,
- ActivityIndicator,
-@@ -394,7 +393,6 @@ export default class Camera extends React.Component<PropsType, StateType> {
- };
-
- static propTypes = {
-- ...ViewPropTypes,
- zoom: PropTypes.number,
- useNativeZoom: PropTypes.bool,
- maxZoom: PropTypes.number,
diff --git a/yarn.lock b/yarn.lock
--- a/yarn.lock
+++ b/yarn.lock
@@ -11964,13 +11964,6 @@
"@expo/image-utils" "^0.7.4"
expo-constants "~17.1.5"
-expo-barcode-scanner@~12.1.0:
- version "12.1.0"
- resolved "https://registry.yarnpkg.com/expo-barcode-scanner/-/expo-barcode-scanner-12.1.0.tgz#3758b20e82bf1e30ad420df4106c8e868ed7b139"
- integrity sha512-R+SlrtS7zEomY48Vjc+XJVHp+qz/u4TKG3CQeFobtQlBXPJvK94055yUg9PxOAwIIrOp3093FSOZiu/OGuoxiA==
- dependencies:
- expo-image-loader "~4.0.0"
-
expo-constants@~17.1.5, expo-constants@~17.1.6:
version "17.1.6"
resolved "https://registry.yarnpkg.com/expo-constants/-/expo-constants-17.1.6.tgz#a31b019216f7f7bb4907aeffa2d6bf856751985e"
@@ -12029,11 +12022,6 @@
resolved "https://registry.yarnpkg.com/expo-haptics/-/expo-haptics-14.1.4.tgz#442f48b1bdf83484d4fcadc653445aaae6049b70"
integrity sha512-QZdE3NMX74rTuIl82I+n12XGwpDWKb8zfs5EpwsnGi/D/n7O2Jd4tO5ivH+muEG/OCJOMq5aeaVDqqaQOhTkcA==
-expo-image-loader@~4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/expo-image-loader/-/expo-image-loader-4.0.0.tgz#a17e5f95a4c1671791168dd5dfc221bf2f88480c"
- integrity sha512-hVMhXagsO1cSng5s70IEjuJAuHy2hX/inu5MM3T0ecJMf7L/7detKf22molQBRymerbk6Tzu+20h11eU0n/3jQ==
-
expo-image-loader@~5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/expo-image-loader/-/expo-image-loader-5.1.0.tgz#f7d65f9b9a9714eaaf5d50a406cb34cb25262153"
@@ -21184,13 +21172,6 @@
prop-types "^15.8.1"
react-base16-styling "^0.9.1"
-react-native-camera@^3.31.0:
- version "3.31.0"
- resolved "https://registry.yarnpkg.com/react-native-camera/-/react-native-camera-3.31.0.tgz#7b9b4dd30b6d1363bdffed4ce0a0bef93c3ebf87"
- integrity sha512-TTuse7JGVUbh/cj+a4OfyXoPqhwPyYx+63tzJWZT0sWwZX5bvlxjYaEur/U1hiZZjOC03muEIMkTD7nYp6ZVFA==
- dependencies:
- prop-types "^15.6.2"
-
react-native-codegen@^0.70.6:
version "0.70.6"
resolved "https://registry.yarnpkg.com/react-native-codegen/-/react-native-codegen-0.70.6.tgz#2ce17d1faad02ad4562345f8ee7cbe6397eda5cb"

File Metadata

Mime Type
text/plain
Expires
Sat, Dec 6, 11:33 PM (18 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5841442
Default Alt Text
D14989.1765064033.diff (13 KB)

Event Timeline