fix ios build

apps/wallet-mobile/ios/GoogleService-Info.plist

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>API_KEY</key>
+	<string>AIzaSyD8QLl-64ALVdYAqcuOgfeVfMn6ZLzyfIY</string>
+	<key>GCM_SENDER_ID</key>
+	<string>1028338182097</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.emurgo.yoroi</string>
+	<key>PROJECT_ID</key>
+	<string>yoroi-mobile-dev-1</string>
+	<key>STORAGE_BUCKET</key>
+	<string>yoroi-mobile-dev-1.firebasestorage.app</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:1028338182097:ios:8ba6c1dfcef5134bbca2f0</string>
+</dict>
+</plist>

apps/wallet-mobile/ios/Podfile

@@ -56,13 +56,7 @@ target 'yoroi' do
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
 
-  permissions_path = '../../../node_modules/react-native-permissions/ios'
-  pod 'Permission-Camera', :path => "#{permissions_path}/Camera"
-  pod 'Permission-BluetoothPeripheral', :path => "#{permissions_path}/BluetoothPeripheral"
-  pod 'Permission-FaceID', :path => "#{permissions_path}/FaceID"
-  pod 'Permission-LocationAccuracy', :path => "#{permissions_path}/LocationAccuracy"
-  pod 'Permission-LocationAlways', :path => "#{permissions_path}/LocationAlways"
-  pod 'Permission-LocationWhenInUse', :path => "#{permissions_path}/LocationWhenInUse"
+  pod 'RNPermissions', :path => '../../../node_modules/react-native-permissions'
   pod 'GoogleUtilities', :modular_headers => true
 
 

apps/wallet-mobile/ios/Podfile.lock

@@ -162,18 +162,6 @@ PODS:
     - nanopb/encode (= 3.30910.0)
   - nanopb/decode (3.30910.0)
   - nanopb/encode (3.30910.0)
-  - Permission-BluetoothPeripheral (3.8.4):
-    - RNPermissions
-  - Permission-Camera (3.8.4):
-    - RNPermissions
-  - Permission-FaceID (3.8.4):
-    - RNPermissions
-  - Permission-LocationAccuracy (3.8.4):
-    - RNPermissions
-  - Permission-LocationAlways (3.8.4):
-    - RNPermissions
-  - Permission-LocationWhenInUse (3.8.4):
-    - RNPermissions
   - PromisesObjC (2.4.0)
   - RCT-Folly (2021.07.22.00):
     - boost
@@ -574,7 +562,7 @@ PODS:
     - React-Core
   - RNLocalize (3.0.2):
     - React-Core
-  - RNPermissions (3.8.4):
+  - RNPermissions (5.2.1):
     - React-Core
   - RNReanimated (3.3.0):
     - DoubleConversion
@@ -664,12 +652,6 @@ DEPENDENCIES:
   - GoogleUtilities
   - hermes-engine (from `../../../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
   - libevent (~> 2.1.12)
-  - Permission-BluetoothPeripheral (from `../../../node_modules/react-native-permissions/ios/BluetoothPeripheral`)
-  - Permission-Camera (from `../../../node_modules/react-native-permissions/ios/Camera`)
-  - Permission-FaceID (from `../../../node_modules/react-native-permissions/ios/FaceID`)
-  - Permission-LocationAccuracy (from `../../../node_modules/react-native-permissions/ios/LocationAccuracy`)
-  - Permission-LocationAlways (from `../../../node_modules/react-native-permissions/ios/LocationAlways`)
-  - Permission-LocationWhenInUse (from `../../../node_modules/react-native-permissions/ios/LocationWhenInUse`)
   - RCT-Folly (from `../../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../../../node_modules/react-native/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../../../node_modules/react-native/Libraries/TypeSafety`)
@@ -812,18 +794,6 @@ EXTERNAL SOURCES:
     :podspec: "../../../node_modules/react-native/third-party-podspecs/glog.podspec"
   hermes-engine:
     :podspec: "../../../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
-  Permission-BluetoothPeripheral:
-    :path: "../../../node_modules/react-native-permissions/ios/BluetoothPeripheral"
-  Permission-Camera:
-    :path: "../../../node_modules/react-native-permissions/ios/Camera"
-  Permission-FaceID:
-    :path: "../../../node_modules/react-native-permissions/ios/FaceID"
-  Permission-LocationAccuracy:
-    :path: "../../../node_modules/react-native-permissions/ios/LocationAccuracy"
-  Permission-LocationAlways:
-    :path: "../../../node_modules/react-native-permissions/ios/LocationAlways"
-  Permission-LocationWhenInUse:
-    :path: "../../../node_modules/react-native-permissions/ios/LocationWhenInUse"
   RCT-Folly:
     :podspec: "../../../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
   RCTRequired:
@@ -992,12 +962,6 @@ SPEC CHECKSUMS:
   MMKVCore: d26e4d3edd5cb8588c2569222cbd8be4231374e9
   MultiplatformBleAdapter: 5a6a897b006764392f9cef785e4360f54fb9477d
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  Permission-BluetoothPeripheral: 2b88a131074edafd8a46a5cda4ba610ec986d2fb
-  Permission-Camera: 7ec9ee99704766ff9b90198183387a7f5d82b0c1
-  Permission-FaceID: 2e7d5070c6df9315c6ed8de8fb22fed69a762b0d
-  Permission-LocationAccuracy: a38ddb5c5d0b8e656f3c86e4a500f9bb88bc099d
-  Permission-LocationAlways: 8fd5518716c3045f9c4edf77b901126098d79b60
-  Permission-LocationWhenInUse: 24d97eeb25d8ff9f2232e070f792eeb1360ccaf0
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
   RCTRequired: e9df143e880d0e879e7a498dc06923d728809c79
@@ -1053,7 +1017,7 @@ SPEC CHECKSUMS:
   RNGestureHandler: dec4645026e7401a0899f2846d864403478ff6a5
   RNKeychain: f75b8c8b2f17d3b2aa1f25b4a0ac5b83d947ff8f
   RNLocalize: dbea38dcb344bf80ff18a1757b1becf11f70cae4
-  RNPermissions: f1b49dd05fa9b83993cd05a9ee115247944d8f1a
+  RNPermissions: bd4e8932db57d658a7fd0395bc0ea8a344e28405
   RNReanimated: d6b4b867b6d1ee0798f5fb372708fa4bb8d66029
   RNScreens: 50ffe2fa2342eabb2d0afbe19f7c1af286bc7fb3
   RNSentry: f9e637773502a61c7b455c4ce65bc7008ce22a6e
@@ -1069,6 +1033,6 @@ SPEC CHECKSUMS:
   Yoga: e71803b4c1fff832ccf9b92541e00f9b873119b9
   ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5
 
-PODFILE CHECKSUM: 2529b590cf7f56c0e2eec06abf8cc4f21620b92d
+PODFILE CHECKSUM: 1558354ff834d5745d243d7f917d3b95f424404a
 
 COCOAPODS: 1.15.2

apps/wallet-mobile/ios/yoroi.xcodeproj/project.pbxproj

@@ -24,6 +24,8 @@
 		57DDD8F82C7040D68F99A505 /* OFL.txt in Resources */ = {isa = PBXBuildFile; fileRef = 49514077C0DA44DB8D83777A /* OFL.txt */; };
 		649CE2EDC81749B097D05F56 /* Rubik-ExtraBoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FBD00939BBA949C5920F11AA /* Rubik-ExtraBoldItalic.ttf */; };
 		70CA15E187024A1FB5FF271D /* Rubik-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DB3A2C3F18EB451488B7075E /* Rubik-SemiBold.ttf */; };
+		714F32E52D0310E10067CB1E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 714F32E42D0310E10067CB1E /* GoogleService-Info.plist */; };
+		714F32E62D0310E10067CB1E /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 714F32E42D0310E10067CB1E /* GoogleService-Info.plist */; };
 		7A6D76B5F5534EFAABA1F008 /* Pods_yoroi_yoroiTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 66BB5B4D336D9454EEC67A32 /* Pods_yoroi_yoroiTests.framework */; };
 		98A03C120CA349D88BE10884 /* Rubik-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7024FF43523D439BB47462E7 /* Rubik-ExtraBold.ttf */; };
 		A608B7143FA94C7CAA81F276 /* Rubik-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 454771C13D0F4F38BD2C9F99 /* Rubik-Italic.ttf */; };
@@ -97,6 +99,7 @@
 		5B7EB9410499542E8C5724F5 /* Pods-yoroi-yoroiTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-yoroi-yoroiTests.debug.xcconfig"; path = "Target Support Files/Pods-yoroi-yoroiTests/Pods-yoroi-yoroiTests.debug.xcconfig"; sourceTree = "<group>"; };
 		66BB5B4D336D9454EEC67A32 /* Pods_yoroi_yoroiTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_yoroi_yoroiTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		7024FF43523D439BB47462E7 /* Rubik-ExtraBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Rubik-ExtraBold.ttf"; path = "../src/assets/fonts/Rubik-ExtraBold.ttf"; sourceTree = "<group>"; };
+		714F32E42D0310E10067CB1E /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		7ED9EB0B0EB851AA3E4522FD /* Pods_yoroi.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_yoroi.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		89C6BE57DB24E9ADA2F236DE /* Pods-yoroi-yoroiTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-yoroi-yoroiTests.release.xcconfig"; path = "Target Support Files/Pods-yoroi-yoroiTests/Pods-yoroi-yoroiTests.release.xcconfig"; sourceTree = "<group>"; };
 		8CBB28ACFDA8D28C80D2C0F0 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-yoroi-yoroiTests/ExpoModulesProvider.swift"; sourceTree = "<group>"; };
@@ -173,6 +176,7 @@
 				13B07FB61A68108700A75B9A /* Info.plist */,
 				BD825DEA29FB507600E19149 /* BootSplash.storyboard */,
 				13B07FB71A68108700A75B9A /* main.m */,
+				714F32E42D0310E10067CB1E /* GoogleService-Info.plist */,
 			);
 			name = yoroi;
 			sourceTree = "<group>";
@@ -430,6 +434,7 @@
 				E374CFEC5BE8441CB6DF984A /* Rubik-Regular.ttf in Resources */,
 				70CA15E187024A1FB5FF271D /* Rubik-SemiBold.ttf in Resources */,
 				18D1E9FF820C4D5AB38A243C /* Rubik-SemiBoldItalic.ttf in Resources */,
+				714F32E52D0310E10067CB1E /* GoogleService-Info.plist in Resources */,
 				210BFBEC638C46A69C4AA18A /* Rubik-VariableFont_wght.ttf in Resources */,
 				57DDD8F82C7040D68F99A505 /* OFL.txt in Resources */,
 			);
@@ -459,6 +464,7 @@
 				BD60BE7C2A34B13000EFF020 /* Rubik-SemiBoldItalic.ttf in Resources */,
 				BD60BE7D2A34B13000EFF020 /* Rubik-VariableFont_wght.ttf in Resources */,
 				BD60BE7E2A34B13000EFF020 /* OFL.txt in Resources */,
+				714F32E62D0310E10067CB1E /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

apps/wallet-mobile/package.json

@@ -188,7 +188,7 @@
     "react-native-notifications": "^5.1.0",
     "react-native-pager-view": "^6.2.0",
     "react-native-paper": "4.12.8",
-    "react-native-permissions": "^3.8.0",
+    "react-native-permissions": "^5.2.1",
     "react-native-qrcode-svg": "6.0.6",
     "react-native-quick-base64": "^2.1.2",
     "react-native-randombytes": "3.6.0",
@@ -319,5 +319,14 @@
     "compilerOptions": {
       "module": "commonjs"
     }
-  }
+  },
+  "reactNativePermissionsIOS": [
+    "Notifications",
+    "Bluetooth",
+    "LocationAccuracy",
+    "LocationWhenInUse",
+    "LocationAlways",
+    "FaceID",
+    "Camera"
+  ]
 }

apps/wallet-mobile/src/features/Notifications/useCases/common/hooks.ts

@@ -3,12 +3,12 @@ import React from 'react'
 import {PermissionsAndroid} from 'react-native'
 import {Notifications} from 'react-native-notifications'
 
+import {logger} from '../../../../kernel/logger/logger'
 import {notificationManager} from './notification-manager'
 import {generateNotificationId, parseNotificationId, sendNotification} from './notifications'
 import {usePrimaryTokenPriceChangedNotification} from './primary-token-price-changed-notification'
 import {useRewardsUpdatedNotifications} from './rewards-updated-notification'
 import {useTransactionReceivedNotifications} from './transaction-received-notification'
-import {logger} from '../../../../kernel/logger/logger'
 
 let initialized = false
 

apps/wallet-mobile/src/features/Scan/useCases/ShowCameraPermissionDeniedScreen/OpenDeviceAppSettingsButton.tsx

@@ -6,5 +6,5 @@ import {useStrings} from '../../common/useStrings'
 
 export const OpenDeviceAppSettingsButton = (props: Omit<ButtonProps, 'title' | 'onPress' | ''>) => {
   const strings = useStrings()
-  return <Button onPress={openSettings} title={strings.openAppSettings} {...props} />
+  return <Button onPress={() => openSettings()} title={strings.openAppSettings} {...props} />
 }

apps/wallet-mobile/src/features/Scan/useCases/ShowCameraPermissionDeniedScreen/ShowCameraPermissionDeniedScreen.tsx

@@ -33,7 +33,7 @@ export const ShowCameraPermissionDeniedScreen = () => {
 
         <Spacer height={16} />
 
-        <Button onPress={openSettings} title={strings.openAppSettings} size="S" />
+        <Button onPress={() => openSettings()} title={strings.openAppSettings} size="S" />
       </Actions>
     </SafeAreaView>
   )

yarn.lock

@@ -20046,13 +20046,10 @@ [email protected]:
     color "^3.1.2"
     react-native-iphone-x-helper "^1.3.1"
 
-react-native-permissions@^3.8.0:
-  version "3.8.4"
-  resolved "https://registry.yarnpkg.com/react-native-permissions/-/react-native-permissions-3.8.4.tgz#20f203f1dd659c28fb770fc26bbbf0126faa797e"
-  integrity sha512-tJq+5eNqu8Y1PpmuSVMjQtW8E7YJbQ0LSbZ1o9KjgF7etgYmBSZeCR138x715vyZUAtwuecV+ybEM9z8dDs76Q==
-  dependencies:
-    picocolors "^1.0.0"
-    pkg-dir "^5.0.0"
+react-native-permissions@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/react-native-permissions/-/react-native-permissions-5.2.1.tgz#b028b7bc60d813588d8d3f2b80f19d1f67ba907f"
+  integrity sha512-F8CaDVi+zYjl2pO4Fwh5n5SCi5s0TvvRzQnczb8nwkzHJTv6HqlO6Sj1ZmqrAeuCN06b5Ysu9BEWhK4qT4ekXg==
 
 [email protected]:
   version "6.0.6"