Merge branch 'feature/pre_beta' into develop

Kukai Mobile.xcodeproj/project.pbxproj

@@ -76,6 +76,8 @@
 		C01AE5DC28A26C44008F93E8 /* AddLiquidityConfirmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C01AE5DB28A26C44008F93E8 /* AddLiquidityConfirmViewController.swift */; };
 		C01AE5DE28A26C59008F93E8 /* RemoveLiquidityConfirmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C01AE5DD28A26C59008F93E8 /* RemoveLiquidityConfirmViewController.swift */; };
 		C01D227227F5E2DD00D3AF4B /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C01D227127F5E2DD00D3AF4B /* CloudKit.framework */; };
+		C01E10E82BF61143004A8244 /* SideMenuHeadingCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C01E10E72BF61143004A8244 /* SideMenuHeadingCell.swift */; };
+		C01E10EA2BF6185C004A8244 /* MigrationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C01E10E92BF6185C004A8244 /* MigrationService.swift */; };
 		C022DA462B69433400F61CD1 /* SendBatchDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C022DA452B69433400F61CD1 /* SendBatchDetailsViewController.swift */; };
 		C0239B9A2886B92500E0C973 /* Defi.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C0239B992886B92500E0C973 /* Defi.storyboard */; };
 		C0239B9C2886BAC500E0C973 /* DefiViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0239B9B2886BAC500E0C973 /* DefiViewController.swift */; };
@@ -488,6 +490,8 @@
 		C01AE5DB28A26C44008F93E8 /* AddLiquidityConfirmViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddLiquidityConfirmViewController.swift; sourceTree = "<group>"; };
 		C01AE5DD28A26C59008F93E8 /* RemoveLiquidityConfirmViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoveLiquidityConfirmViewController.swift; sourceTree = "<group>"; };
 		C01D227127F5E2DD00D3AF4B /* CloudKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CloudKit.framework; path = System/Library/Frameworks/CloudKit.framework; sourceTree = SDKROOT; };
+		C01E10E72BF61143004A8244 /* SideMenuHeadingCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SideMenuHeadingCell.swift; sourceTree = "<group>"; };
+		C01E10E92BF6185C004A8244 /* MigrationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MigrationService.swift; sourceTree = "<group>"; };
 		C022DA452B69433400F61CD1 /* SendBatchDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendBatchDetailsViewController.swift; sourceTree = "<group>"; };
 		C0239B992886B92500E0C973 /* Defi.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Defi.storyboard; sourceTree = "<group>"; };
 		C0239B9B2886BAC500E0C973 /* DefiViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DefiViewController.swift; sourceTree = "<group>"; };
@@ -881,6 +885,7 @@
 				C00C39902A28AA5900C431EB /* LookupService.swift */,
 				C083E6532A6EB03300B3BEBE /* DiscoverService.swift */,
 				C04E0EB52ADE92CA001BF56F /* AppUpdateService.swift */,
+				C01E10E92BF6185C004A8244 /* MigrationService.swift */,
 			);
 			path = Services;
 			sourceTree = "<group>";
@@ -1513,6 +1518,7 @@
 				C0FE411B2A5306FA0022EB6D /* ConnectedAppCell.swift */,
 				C0172A092A98EE4D00163179 /* TitleSubtitleImageContainerCell.swift */,
 				C07538142AAB65CA0041550F /* SideMenuAboutCell.swift */,
+				C01E10E72BF61143004A8244 /* SideMenuHeadingCell.swift */,
 			);
 			path = Cells;
 			sourceTree = "<group>";
@@ -1912,6 +1918,7 @@
 				C02D7CB027BEB34F006A8E39 /* CurrencyViewModel.swift in Sources */,
 				C0EF1BC92892DCE000AA5DD4 /* LiquidityTokenDetailsViewModel.swift in Sources */,
 				C0DAF38829F13F6C006F05A9 /* GhostnetWarningCell.swift in Sources */,
+				C01E10E82BF61143004A8244 /* SideMenuHeadingCell.swift in Sources */,
 				C00AD57929DB5BCD0030C8CC /* AutoScrollView.swift in Sources */,
 				C008B9BA2965D2CA00B17D96 /* CollectibleDetailAVCell.swift in Sources */,
 				C044E12F2AAF4BAA0085652F /* SideMenuSettingsViewController.swift in Sources */,
@@ -2068,6 +2075,7 @@
 				C08E62EC29DB185F004D8DF0 /* CreateWithSocialViewController.swift in Sources */,
 				C00AE0072887017400184DF7 /* SwapTokenCell.swift in Sources */,
 				C0411B4E29DEC2A500778E1E /* TextFieldSuggestionAccessoryViewCell.swift in Sources */,
+				C01E10EA2BF6185C004A8244 /* MigrationService.swift in Sources */,
 				C0D6C04329DDB93800D890ED /* ImportWalletViewController.swift in Sources */,
 				C0F5A8DE29ED85580061DBBD /* EditWalletViewController.swift in Sources */,
 				C0FE432E2AD6D44400312940 /* CustomAVPlayerViewController.swift in Sources */,

Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -69,16 +69,16 @@
       "location" : "https://github.com/kukai-wallet/kukai-core-swift",
       "state" : {
         "branch" : "develop",
-        "revision" : "08e2baf10ea197af930dc7a430da3745efef7e11"
+        "revision" : "3f3702ebaf7c3ed07cc1dd89bdc5b4f5450241fc"
       }
     },
     {
       "identity" : "kukai-crypto-swift",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/kukai-wallet/kukai-crypto-swift",
       "state" : {
-        "revision" : "8afd803c7fa1fe6716b47f66f77b4fa9ceb94aea",
-        "version" : "1.0.20"
+        "revision" : "203b66175e233ecd2abb7ddb062a49b0301b5616",
+        "version" : "1.0.22"
       }
     },
     {

Kukai Mobile/Localization/en.lproj/Localizable.strings

@@ -50,7 +50,8 @@
 "error-beacon-not-supported"="Beacon QRCodes are not supported, only Wallet Connect. Please make sure you are using the kukai option. If you are, please contact the dApp support team and ask them to update their beacon version";
 "error-collectible-media-generic"="Unable to play media at this time, please try again later";
 "error-onramp-generic"="Unable to access this provider at this time, please try again later";
-"error-fetching-domains"="Encountered an error checking for tezos domains.";
+"error-fetching-domains"="Encountered an error checking for tezos domains";
+"error-unsupported-wallet-type"="This type of wallet doesn't support this feature";
 
 "error-funds-body-wc2"="Balance for address %@, is %@ and the required balance to pay for this transaction is %@";
 "error-unknwon-wc2"="Unable to respond to Wallet Connect";
@@ -60,5 +61,5 @@
 "error-wc2-unrecoverable"="An unknown error occured with the connection. This operation can't continue. Please check the other application and try agian";
 "error-wc2-cant-continue"="Unable to continue with this request due to system error";
 "error-wc2-cant-open-more-modals"="An incoming wallet connect request was automatically rejected, as you are in the middle of an activity. Please return to one of the main tabs and try again.";
-"error-wc2-switch-no-pairing"="Unbale to locate details about this connection. PLease try again";
+"error-wc2-switch-no-pairing"="Unbale to locate details about this connection. Please try again";
 "error-wc2-reconnect"="Failed to reconnect to WalletConnect 3 times in a row, retrying. Please check your internet connection";