Merge pull request #3403 from safe-global/GH-2464/ipad-ledger

Gh 2464/ipad ledger
safe-global · Apr 22, 2024 · 9caeaeb · 9caeaeb
2 parents ae132b1 + bb844ac
commit 9caeaeb
Show file tree

Hide file tree

Showing 30 changed files with 282 additions and 116 deletions.
diff --git a/Multisig.xcodeproj/project.pbxproj b/Multisig.xcodeproj/project.pbxproj
@@ -179,7 +179,6 @@
 		0497B2AA29A63BE8007109ED /* WalletConnectManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0497B2A929A63BE8007109ED /* WalletConnectManager.swift */; };
 		0497B2AD29A641C9007109ED /* WalletConnect in Frameworks */ = {isa = PBXBuildFile; productRef = 0497B2AC29A641C9007109ED /* WalletConnect */; };
 		0497B2AF29A641C9007109ED /* WalletConnectAuth in Frameworks */ = {isa = PBXBuildFile; productRef = 0497B2AE29A641C9007109ED /* WalletConnectAuth */; };
-		0497B2B129A641C9007109ED /* WalletConnectChat in Frameworks */ = {isa = PBXBuildFile; productRef = 0497B2B029A641C9007109ED /* WalletConnectChat */; };
 		0497B2B529A641C9007109ED /* WalletConnectNetworking in Frameworks */ = {isa = PBXBuildFile; productRef = 0497B2B429A641C9007109ED /* WalletConnectNetworking */; };
 		0497B2B729A641C9007109ED /* WalletConnectPairing in Frameworks */ = {isa = PBXBuildFile; productRef = 0497B2B629A641C9007109ED /* WalletConnectPairing */; };
 		0497B2B929A641C9007109ED /* WalletConnectPush in Frameworks */ = {isa = PBXBuildFile; productRef = 0497B2B829A641C9007109ED /* WalletConnectPush */; };
@@ -198,7 +197,6 @@
 		049BE2032912C3B00004B84D /* WalletConnectKeyFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049BE2022912C3B00004B84D /* WalletConnectKeyFlow.swift */; };
 		049BE205291588540004B84D /* LedgerKeyFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049BE204291588540004B84D /* LedgerKeyFlow.swift */; };
 		049EB0FF25AF713700F66CEA /* TimeZone+Offset.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049EB0FE25AF713700F66CEA /* TimeZone+Offset.swift */; };
-		04AECBB72A744B21008D5A35 /* MoonpaySDK in Frameworks */ = {isa = PBXBuildFile; productRef = 04AECBB62A744B21008D5A35 /* MoonpaySDK */; };
 		04AECBBA2A76B990008D5A35 /* SelectTopUpAddressViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AECBB82A76B990008D5A35 /* SelectTopUpAddressViewController.swift */; };
 		04AECBBE2A7867DB008D5A35 /* MoonpayService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AECBBD2A7867DB008D5A35 /* MoonpayService.swift */; };
 		04AECBC22A78F6C0008D5A35 /* CurrenciesRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AECBC12A78F6C0008D5A35 /* CurrenciesRequest.swift */; };
@@ -874,7 +872,6 @@
 		6A39DC9427C64254006BCAE7 /* SafeDeploymentFinishedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6A39DC9227C64254006BCAE7 /* SafeDeploymentFinishedViewController.xib */; };
 		6A4BC4D6288DD921002B6DDA /* EnterCustomAddressViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A4BC4D4288DD921002B6DDA /* EnterCustomAddressViewController.swift */; };
 		6A4BC4D7288DD921002B6DDA /* EnterCustomAddressViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6A4BC4D5288DD921002B6DDA /* EnterCustomAddressViewController.xib */; };
-		6A5976372A67EB8900D3385B /* Ramper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A5976362A67EB8900D3385B /* Ramper.swift */; };
 		6A68612F28816B18009FB8DF /* BackupFlowTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A68612E28816B18009FB8DF /* BackupFlowTests.swift */; };
 		6A6A10592889496100B852D5 /* ClaimGetStartedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6A6A10572889496100B852D5 /* ClaimGetStartedViewController.swift */; };
 		6A6A105A2889496100B852D5 /* ClaimGetStartedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 6A6A10582889496100B852D5 /* ClaimGetStartedViewController.xib */; };
@@ -1023,6 +1020,7 @@
 		B0D61FFF1935AA2484BD940A /* WebConnectionRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0D617C60F3081A3A923005D /* WebConnectionRepository.swift */; };
 		B300E8CB2AF3A7A90073A908 /* SafeNoncesRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B300E8CA2AF3A7A90073A908 /* SafeNoncesRequest.swift */; };
 		B32620492A961E690003A2F0 /* AddSafeFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = B32620482A961E690003A2F0 /* AddSafeFlow.swift */; };
+		B34229722BD2B78300B57830 /* MoonPaySdk in Frameworks */ = {isa = PBXBuildFile; productRef = B34229712BD2B78300B57830 /* MoonPaySdk */; };
 		B343BEB32A77DDA1006BF46B /* DMSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0491067C28F99246005A4A99 /* DMSans-Bold.ttf */; };
 		B35BFD0F2A937DC000A9FB15 /* NavigationRouterTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B35BFD0E2A937DC000A9FB15 /* NavigationRouterTests.swift */; };
 		B367AED02B0CB69200F06B86 /* TransactionValidationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B367AECE2B0CB59700F06B86 /* TransactionValidationTests.swift */; };
@@ -2109,6 +2107,7 @@
 		B38075762B0CFD3A00C62BCF /* TransactionValidationTestCase_AllSignatureTypes_v1_0_0.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = TransactionValidationTestCase_AllSignatureTypes_v1_0_0.json; sourceTree = "<group>"; };
 		B3B6044E2A850F5E007BDAC0 /* UIAlertControllerStyle+Multiplatform.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIAlertControllerStyle+Multiplatform.swift"; sourceTree = "<group>"; };
 		B3C4D2D82AAF596D0026A8BC /* UIViewController+Navigation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Navigation.swift"; sourceTree = "<group>"; };
+		B3FA40E82BD66665008BC688 /* ConfirmationRequestPushNotificationPayload.apns */ = {isa = PBXFileReference; lastKnownFileType = text; path = ConfirmationRequestPushNotificationPayload.apns; sourceTree = "<group>"; };
 		D80B5A022769CEAD00D6E024 /* Tooltip.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tooltip.swift; sourceTree = "<group>"; };
 		D80B5A042769CF1B00D6E024 /* TooltipSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TooltipSource.swift; sourceTree = "<group>"; };
 		D80B5A062769D05D00D6E024 /* BaseCustomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseCustomView.swift; sourceTree = "<group>"; };
@@ -2147,13 +2146,11 @@
 				55D3FF90260B2B21008ABD2B /* TrustKit in Frameworks */,
 				55D3FE8C260A0F88008ABD2B /* SwiftCryptoTokenFormatter in Frameworks */,
 				0497B2AD29A641C9007109ED /* WalletConnect in Frameworks */,
-				04AECBB72A744B21008D5A35 /* MoonpaySDK in Frameworks */,
 				04C22B302A36807500F58A15 /* SafeWeb3 in Frameworks */,
 				04C22B2D2A367FF800F58A15 /* CustomAuth in Frameworks */,
 				5591CEEE260C725C0067DFDF /* BlockiesSwift in Frameworks */,
 				0A13BD7729756CE700322C66 /* URRegistry in Frameworks */,
 				0A7FBE2528BE684100B5FFCF /* WhatsNewKit in Frameworks */,
-				0497B2B129A641C9007109ED /* WalletConnectChat in Frameworks */,
 				0A3DAD9426270F4D00743E38 /* unistring.xcframework in Frameworks */,
 				043350AF2808628E003725E2 /* Lottie in Frameworks */,
 				0A3E980B2806FAD300E90EEC /* Algorithms in Frameworks */,
@@ -2164,6 +2161,7 @@
 				55888DFF260C4F6200940347 /* SwiftAccessPolicy in Frameworks */,
 				B3710B3D2AD584BE002E503B /* SecureConfig in Frameworks */,
 				0463F5C326296924009C04FA /* FirebaseCrashlytics in Frameworks */,
+				B34229722BD2B78300B57830 /* MoonPaySdk in Frameworks */,
 				0497B2BD29A641C9007109ED /* WalletConnectVerify in Frameworks */,
 				04C22B322A36807500F58A15 /* Web3ContractABI in Frameworks */,
 				0A29B5622666808A0060F06A /* FirebaseAnalyticsWithoutAdIdSupport in Frameworks */,
@@ -3702,6 +3700,7 @@
 				0AF2736A24DC57C6007E4012 /* NotificationPayload.swift */,
 				0A616B9826AEFD1D00FCEDB9 /* MultisigNotification+ContentProvider.swift */,
 				0AF2731524DAABDC007E4012 /* NotificationService.swift */,
+				B3FA40E82BD66665008BC688 /* ConfirmationRequestPushNotificationPayload.apns */,
 				0AF2737624DD46EB007E4012 /* Configuration */,
 			);
 			path = NotificationServiceExtension;
@@ -4807,7 +4806,6 @@
 				0497B2A729A63A3E007109ED /* Starscream */,
 				0497B2AC29A641C9007109ED /* WalletConnect */,
 				0497B2AE29A641C9007109ED /* WalletConnectAuth */,
-				0497B2B029A641C9007109ED /* WalletConnectChat */,
 				0497B2B429A641C9007109ED /* WalletConnectNetworking */,
 				0497B2B629A641C9007109ED /* WalletConnectPairing */,
 				0497B2B829A641C9007109ED /* WalletConnectPush */,
@@ -4818,8 +4816,8 @@
 				04C22B2F2A36807500F58A15 /* SafeWeb3 */,
 				04C22B312A36807500F58A15 /* Web3ContractABI */,
 				04C22B332A36807500F58A15 /* Web3PromiseKit */,
-				04AECBB62A744B21008D5A35 /* MoonpaySDK */,
 				B3710B3C2AD584BE002E503B /* SecureConfig */,
+				B34229712BD2B78300B57830 /* MoonPaySdk */,
 			);
 			productName = Multisig;
 			productReference = 0A93DD532445CC8A00688050 /* Multisig_PROD.app */;
@@ -5788,7 +5786,6 @@
 				0A5B157C280863DF003AD853 /* EnterPasscodeViewController.swift in Sources */,
 				D8A6B12D2779D01900438460 /* AdvancedParametersViewController.swift in Sources */,
 				0A864D282835563D00AE1B36 /* UIFlow.swift in Sources */,
-				6A5976372A67EB8900D3385B /* Ramper.swift in Sources */,
 				04576A0227C8F26100881206 /* CDEthTransaction.swift in Sources */,
 				04FA9CD12A45F7170027F315 /* CreateSafeFlow.swift in Sources */,
 				938D327028C8808D00198B7E /* NavigatingDAOViewController.swift in Sources */,
@@ -7408,8 +7405,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/WalletConnect/WalletConnectSwiftV2";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.9.9;
+				kind = exactVersion;
+				version = 1.9.9;
 			};
 		};
 		04AECBB52A744B21008D5A35 /* XCRemoteSwiftPackageReference "mobile-sdk-ios" */ = {
@@ -7586,11 +7583,6 @@
 			package = 0497B2AB29A641C9007109ED /* XCRemoteSwiftPackageReference "WalletConnectSwiftV2" */;
 			productName = WalletConnectAuth;
 		};
-		0497B2B029A641C9007109ED /* WalletConnectChat */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 0497B2AB29A641C9007109ED /* XCRemoteSwiftPackageReference "WalletConnectSwiftV2" */;
-			productName = WalletConnectChat;
-		};
 		0497B2B429A641C9007109ED /* WalletConnectNetworking */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 0497B2AB29A641C9007109ED /* XCRemoteSwiftPackageReference "WalletConnectSwiftV2" */;
@@ -7621,11 +7613,6 @@
 			package = 0497B2AB29A641C9007109ED /* XCRemoteSwiftPackageReference "WalletConnectSwiftV2" */;
 			productName = Web3Wallet;
 		};
-		04AECBB62A744B21008D5A35 /* MoonpaySDK */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 04AECBB52A744B21008D5A35 /* XCRemoteSwiftPackageReference "mobile-sdk-ios" */;
-			productName = MoonpaySDK;
-		};
 		04C22B2C2A367FF800F58A15 /* CustomAuth */ = {
 			isa = XCSwiftPackageProductDependency;
 			package = 04C22B2B2A367FF800F58A15 /* XCRemoteSwiftPackageReference "customauth-swift-sdk" */;
@@ -7730,6 +7717,11 @@
 			package = 93EE3F732760F49700111F17 /* XCRemoteSwiftPackageReference "intercom-ios" */;
 			productName = Intercom;
 		};
+		B34229712BD2B78300B57830 /* MoonPaySdk */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 04AECBB52A744B21008D5A35 /* XCRemoteSwiftPackageReference "mobile-sdk-ios" */;
+			productName = MoonPaySdk;
+		};
 		B3710B3C2AD584BE002E503B /* SecureConfig */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = SecureConfig;

diff --git a/Multisig.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Multisig.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -6,17 +6,17 @@
         "repositoryURL": "https://github.com/google/abseil-cpp-binary.git",
         "state": {
           "branch": null,
-          "revision": "bfc0b6f81adc06ce5121eb23f628473638d67c5c",
-          "version": "1.2022062300.0"
+          "revision": "748c7837511d0e6a507737353af268484e1745e2",
+          "version": "1.2024011601.1"
         }
       },
       {
         "package": "AppCheck",
         "repositoryURL": "https://github.com/google/app-check.git",
         "state": {
           "branch": null,
-          "revision": "5746b2d35c91c50581590ed97abe4c06b5037274",
-          "version": "10.18.0"
+          "revision": "7d2688de038d5484866d835acb47b379722d610e",
+          "version": "10.19.0"
         }
       },
       {
@@ -78,8 +78,8 @@
         "repositoryURL": "https://github.com/firebase/firebase-ios-sdk.git",
         "state": {
           "branch": null,
-          "revision": "d9bcd141c3e4ad48a9500e6faeebb073f43cbcbd",
-          "version": "10.19.0"
+          "revision": "42eae77a0af79e9c3f41df04a23c76f05cfdda77",
+          "version": "10.24.0"
         }
       },
       {
@@ -96,53 +96,53 @@
         "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git",
         "state": {
           "branch": null,
-          "revision": "6b332152355c372ace9966d8ee76ed191f97025e",
-          "version": "10.17.0"
+          "revision": "51ba746a9d51a4bd0774b68499b0c73ef6e8570d",
+          "version": "10.24.0"
         }
       },
       {
         "package": "GoogleDataTransport",
         "repositoryURL": "https://github.com/google/GoogleDataTransport.git",
         "state": {
           "branch": null,
-          "revision": "a732a4b47f59e4f725a2ea10f0c77e93a7131117",
-          "version": "9.3.0"
+          "revision": "a637d318ae7ae246b02d7305121275bc75ed5565",
+          "version": "9.4.0"
         }
       },
       {
         "package": "GoogleUtilities",
         "repositoryURL": "https://github.com/google/GoogleUtilities.git",
         "state": {
           "branch": null,
-          "revision": "bc27fad73504f3d4af235de451f02ee22586ebd3",
-          "version": "7.12.1"
+          "revision": "26c898aed8bed13b8a63057ee26500abbbcb8d55",
+          "version": "7.13.1"
         }
       },
       {
         "package": "gRPC",
         "repositoryURL": "https://github.com/google/grpc-binary.git",
         "state": {
           "branch": null,
-          "revision": "a673bc2937fbe886dd1f99c401b01b6d977a9c98",
-          "version": "1.49.1"
+          "revision": "e9fad491d0673bdda7063a0341fb6b47a30c5359",
+          "version": "1.62.2"
         }
       },
       {
         "package": "GTMSessionFetcher",
         "repositoryURL": "https://github.com/google/gtm-session-fetcher.git",
         "state": {
           "branch": null,
-          "revision": "d415594121c9e8a4f9d79cecee0965cf35e74dbd",
-          "version": "3.1.1"
+          "revision": "0382ca27f22fb3494cf657d8dc356dc282cd1193",
+          "version": "3.4.1"
         }
       },
       {
         "package": "Intercom",
         "repositoryURL": "https://github.com/intercom/intercom-ios.git",
         "state": {
           "branch": null,
-          "revision": "fcc1ad96bdc2e2dfe079852715bd265504432cdd",
-          "version": "16.2.3"
+          "revision": "0cb0804355d7d238dcd44d26343a29f523f27561",
+          "version": "16.6.2"
         }
       },
       {
@@ -168,17 +168,17 @@
         "repositoryURL": "https://github.com/onevcat/Kingfisher.git",
         "state": {
           "branch": null,
-          "revision": "c75584ac759cbb16b204d0a7de3ebf53ea6b304d",
-          "version": "7.9.0"
+          "revision": "5b92f029fab2cce44386d28588098b5be0824ef5",
+          "version": "7.11.0"
         }
       },
       {
         "package": "leveldb",
         "repositoryURL": "https://github.com/firebase/leveldb.git",
         "state": {
           "branch": null,
-          "revision": "0706abcc6b0bd9cedfbb015ba840e4a780b5159b",
-          "version": "1.22.2"
+          "revision": "a0bc79961d7be727d258d33d5a6b2f1023270ba1",
+          "version": "1.22.5"
         }
       },
       {
@@ -191,11 +191,11 @@
         }
       },
       {
-        "package": "MoonpaySDK",
+        "package": "MoonPaySdk",
         "repositoryURL": "https://github.com/moonpay/mobile-sdk-ios.git",
         "state": {
           "branch": "main",
-          "revision": "81006eed0a8e5d16f01574dbbc9cc082fb240de6",
+          "revision": "e069c5cfa9e7065a1c6f2a98f5c196b1de79cd43",
           "version": null
         }
       },
@@ -204,8 +204,8 @@
         "repositoryURL": "https://github.com/firebase/nanopb.git",
         "state": {
           "branch": null,
-          "revision": "819d0a2173aff699fb8c364b6fb906f7cdb1a692",
-          "version": "2.30909.0"
+          "revision": "b7e1104502eca3a213b46303391ca4d3bc8ddec1",
+          "version": "2.30910.0"
         }
       },
       {
@@ -222,8 +222,8 @@
         "repositoryURL": "https://github.com/google/promises.git",
         "state": {
           "branch": null,
-          "revision": "e70e889c0196c76d22759eb50d6a0270ca9f1d9e",
-          "version": "2.3.1"
+          "revision": "540318ecedd63d883069ae7f1ed811a2df00b6ac",
+          "version": "2.4.0"
         }
       },
       {
@@ -267,8 +267,8 @@
         "repositoryURL": "https://github.com/Juanpe/SkeletonView.git",
         "state": {
           "branch": null,
-          "revision": "739a4f5d78731bebc48811c75fa9e1f4c4cef23e",
-          "version": "1.30.4"
+          "revision": "2f5274827d310e32c09325dd3e0007120940988e",
+          "version": "1.31.0"
         }
       },
       {
@@ -285,8 +285,8 @@
         "repositoryURL": "https://github.com/apple/swift-algorithms.git",
         "state": {
           "branch": null,
-          "revision": "b14b7f4c528c942f121c8b860b9410b2bf57825e",
-          "version": "1.0.0"
+          "revision": "f6919dfc309e7f1b56224378b11e28bab5bccc42",
+          "version": "1.2.0"
         }
       },
       {
@@ -303,8 +303,8 @@
         "repositoryURL": "https://github.com/apple/swift-protobuf.git",
         "state": {
           "branch": null,
-          "revision": "ce20dc083ee485524b802669890291c0d8090170",
-          "version": "1.22.1"
+          "revision": "9f0c76544701845ad98716f3f6a774a892152bcb",
+          "version": "1.26.0"
         }
       },
       {
@@ -321,8 +321,17 @@
         "repositoryURL": "https://github.com/pointfreeco/swift-snapshot-testing.git",
         "state": {
           "branch": null,
-          "revision": "dc46eeb3928a75390651fac6c1ef7f93ad59a73b",
-          "version": "1.11.1"
+          "revision": "625ccca8570773dd84a34ee51a81aa2bc5a4f97a",
+          "version": "1.16.0"
+        }
+      },
+      {
+        "package": "swift-syntax",
+        "repositoryURL": "https://github.com/apple/swift-syntax",
+        "state": {
+          "branch": null,
+          "revision": "fa8f95c2d536d6620cc2f504ebe8a6167c9fc2dd",
+          "version": "510.0.1"
         }
       },
       {

diff --git a/Multisig/App/AppDelegate.swift b/Multisig/App/AppDelegate.swift
@@ -68,7 +68,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
         SecurityCenter.setUp()
         WalletConnectManager.shared.config()
-        App.shared.ramper.config()
+
         return true
     }
 

diff --git a/Multisig/Cross-layer/App.swift b/Multisig/Cross-layer/App.swift
@@ -68,7 +68,6 @@ class App {
         url: App.configuration.walletConnect.registryURL,
         logger: LogService.shared)
 
-    lazy var ramper = Ramper.shared
 
     // MARK: - Cross-layer
 

diff --git a/Multisig/Data/Services/Utils/GSError.swift b/Multisig/Data/Services/Utils/GSError.swift
@@ -484,6 +484,15 @@ enum GSError {
         let code = 9931
         let loggable = false
     }
+
+    struct WC2GenericError: DetailedLocalizedError {
+        let description: String
+        let reason: String
+        let howToFix: String
+        let domain = clientErrorDomain
+        let code = 9932
+        let loggable = false
+    }
 
 	// MARK: Address Book