Merge branch 'main' of https://github.com/cake-tech/cake_wallet into CW-78-Ethereum

assets/text/Monerocom_Release_Notes.txt

@@ -1,6 +1,3 @@
-Opt-in to Cake 2FA for security. More info: https://guides.cakewallet.com/docs/advanced-features/authentication/#cake-2fa
+Enable iPad/Tablet separate layout from mobile UI
-Auto generate restore height for Monero restore QR codes
+SideShift update and fixes
-Hausa and Yoruba languages
+Bug Fixes
-Additional privacy settings
-Update Monero to 0.18.2.2
-Refactoring and bug fixes

assets/text/Release_Notes.txt

@@ -1,6 +1,4 @@
-Opt-in to Cake 2FA for security. More info: https://guides.cakewallet.com/docs/advanced-features/authentication/#cake-2fa
+Enable iPad/Tablet separate layout from mobile UI
-Auto generate restore height for Monero restore QR codes
+SideShift update and fixes
-Hausa and Yoruba languages
+Add MoonPay sell
-Additional privacy settings
+Bug Fixes
-Update Monero to 0.18.2.2
-Refactoring and bug fixes

cw_bitcoin/lib/electrum_transaction_history.dart

@@ -35,7 +35,7 @@ abstract class ElectrumTransactionHistoryBase
 
   @override
   void addMany(Map<String, ElectrumTransactionInfo> transactions) =>
-      transactions.forEach((_, tx) => _updateOrInsert(tx));
+      transactions.forEach((_, tx) => _update(tx));
 
   @override
   Future<void> save() async {
@@ -74,7 +74,7 @@ abstract class ElectrumTransactionHistoryBase
 
         if (val is Map<String, dynamic>) {
           final tx = ElectrumTransactionInfo.fromJson(val, walletInfo.type);
-          _updateOrInsert(tx);
+          _update(tx);
         }
       });
 
@@ -84,18 +84,6 @@ abstract class ElectrumTransactionHistoryBase
     }
   }
 
-  void _updateOrInsert(ElectrumTransactionInfo transaction) {
+  void _update(ElectrumTransactionInfo transaction) =>
-
-    if (transactions[transaction.id] == null) {
       transactions[transaction.id] = transaction;
-    } else {
-      final originalTx = transactions[transaction.id];
-      originalTx?.confirmations = transaction.confirmations;
-      originalTx?.amount = transaction.amount;
-      originalTx?.height = transaction.height;
-      originalTx?.date ??= transaction.date;
-      originalTx?.isPending = transaction.isPending;
-      originalTx?.direction = transaction.direction;
-    }
-  }
 }

cw_bitcoin/lib/electrum_wallet.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:math';
-import 'dart:typed_data';
 import 'package:cw_core/unspent_coins_info.dart';
 import 'package:hive/hive.dart';
 import 'package:cw_bitcoin/electrum_wallet_addresses.dart';
@@ -14,7 +13,6 @@ import 'package:cw_core/pathForWallet.dart';
 import 'package:cw_bitcoin/address_to_output_script.dart';
 import 'package:cw_bitcoin/bitcoin_address_record.dart';
 import 'package:cw_bitcoin/electrum_balance.dart';
-import 'package:cw_bitcoin/bitcoin_mnemonic.dart';
 import 'package:cw_bitcoin/bitcoin_transaction_credentials.dart';
 import 'package:cw_bitcoin/electrum_transaction_history.dart';
 import 'package:cw_bitcoin/bitcoin_transaction_no_inputs_exception.dart';
@@ -120,6 +118,8 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
   Map<String, BehaviorSubject<Object>?> _scripthashesUpdateSubject;
   bool _isTransactionUpdating;
 
+  void Function(FlutterErrorDetails)? _onError;
+
   Future<void> init() async {
     await walletAddresses.init();
     await transactionHistory.init();
@@ -641,8 +641,13 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
           await updateUnspent();
           await updateBalance();
           await updateTransactions();
-        } catch (e) {
+        } catch (e, s) {
           print(e.toString());
+          _onError?.call(FlutterErrorDetails(
+            exception: e,
+            stack: s,
+            library: this.runtimeType.toString(),
+          ));
         }
       });
     });
@@ -708,4 +713,7 @@ abstract class ElectrumWalletBase extends WalletBase<ElectrumBalance,
 
     return addresses[random.nextInt(addresses.length)].address;
   }
+
+  @override
+  void setExceptionHandler(void Function(FlutterErrorDetails) onError) => _onError = onError;
 }

cw_core/lib/wallet_base.dart

@@ -73,4 +73,6 @@ abstract class WalletBase<
   Future<void> changePassword(String password);
 
   Future<void>? updateBalance();
+
+  void setExceptionHandler(void Function(FlutterErrorDetails) onError) => null;
 }

ios/Podfile

@@ -44,6 +44,7 @@ post_install do |installer|
     flutter_additional_ios_build_settings(target)
     
     target.build_configurations.each do |config|
+      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
       config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
             '$(inherited)',
 

ios/Podfile.lock

@@ -7,7 +7,7 @@ PODS:
   - connectivity_plus (0.0.1):
     - Flutter
     - ReachabilitySwift
-  - CryptoSwift (1.6.0)
+  - CryptoSwift (1.7.1)
   - cw_haven (0.0.1):
     - cw_haven/Boost (= 0.0.1)
     - cw_haven/Haven (= 0.0.1)
@@ -131,15 +131,15 @@ PODS:
   - platform_device_id (0.0.1):
     - Flutter
   - ReachabilitySwift (5.0.0)
-  - SDWebImage (5.15.5):
+  - SDWebImage (5.16.0):
-    - SDWebImage/Core (= 5.15.5)
+    - SDWebImage/Core (= 5.16.0)
-  - SDWebImage/Core (5.15.5)
+  - SDWebImage/Core (5.16.0)
   - share_plus (0.0.1):
     - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - SwiftProtobuf (1.21.0)
+  - SwiftProtobuf (1.22.0)
   - SwiftyGif (5.4.4)
   - uni_links (0.0.1):
     - Flutter
@@ -250,7 +250,7 @@ SPEC CHECKSUMS:
   barcode_scan2: 0af2bb63c81b4565aab6cd78278e4c0fa136dbb0
   BigInt: f668a80089607f521586bbe29513d708491ef2f7
   connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
-  CryptoSwift: 562f8eceb40e80796fffc668b0cad9313284cfa6
+  CryptoSwift: d3d18dc357932f7e6d580689e065cf1f176007c1
   cw_haven: b3e54e1fbe7b8e6fda57a93206bc38f8e89b898a
   cw_monero: 4cf3b96f2da8e95e2ef7d6703dd4d2c509127b7d
   cw_shared_external: 2972d872b8917603478117c9957dfca611845a92
@@ -274,16 +274,16 @@ SPEC CHECKSUMS:
   permission_handler_apple: 8f116445eff3c0e7c65ad60f5fef5490aa94b4e4
   platform_device_id: 81b3e2993881f87d0c82ef151dc274df4869aef5
   ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
-  SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe
+  SDWebImage: 2aea163b50bfcb569a2726b6a754c54a4506fcf6
   share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
   shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
-  SwiftProtobuf: afced68785854575756db965e9da52bbf3dc45e7
+  SwiftProtobuf: 40bd808372cb8706108f22d28f8ab4a6b9bc6989
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
   uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
   UnstoppableDomainsResolution: c3c67f4d0a5e2437cb00d4bd50c2e00d6e743841
   url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
   wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
 
-PODFILE CHECKSUM: ae71bdf0eb731a1ffc399c122f6aa4dea0cb5f6f
+PODFILE CHECKSUM: 09df1114e7c360f55770d35a79356bf5446e0100
 
 COCOAPODS: 1.11.3

ios/Runner.xcodeproj/project.pbxproj

@@ -10,8 +10,8 @@
 		0C44A71A2518EF8000B570ED /* decrypt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C44A7192518EF8000B570ED /* decrypt.swift */; };
 		0C9D68C9264854B60011B691 /* secRandom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C9D68C8264854B60011B691 /* secRandom.swift */; };
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
-		20ED0868E1BD7E12278C0CB3 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B26E3F56D69167FBB1DC160A /* Pods_Runner.framework */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
+		4DFD1BB54A3A50573E19A583 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C663361C56EBB242598F609 /* Pods_Runner.framework */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
 		97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
@@ -23,13 +23,13 @@
 		0C44A7192518EF8000B570ED /* decrypt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = decrypt.swift; sourceTree = "<group>"; };
 		0C9986A3251A932F00D566FD /* CryptoSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CryptoSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		0C9D68C8264854B60011B691 /* secRandom.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = secRandom.swift; sourceTree = "<group>"; };
+		11F9FC13F9EE2A705B213FA9 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
-		20F67A1B2C2FCB2A3BB048C1 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
+		1F083F2041D1F553F2AF8B62 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
-		501EA9286675DC8636978EA4 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		3C663361C56EBB242598F609 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		5AFFEBFC279AD49C00F906A4 /* wakeLock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = wakeLock.swift; sourceTree = "<group>"; };
-		61CAA8652B54F23356F7592A /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
@@ -40,7 +40,7 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		B26E3F56D69167FBB1DC160A /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		AD0937B0140D5A4C24E73BEA /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -48,7 +48,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				20ED0868E1BD7E12278C0CB3 /* Pods_Runner.framework in Frameworks */,
+				4DFD1BB54A3A50573E19A583 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -59,7 +59,7 @@
 			isa = PBXGroup;
 			children = (
 				0C9986A3251A932F00D566FD /* CryptoSwift.framework */,
-				B26E3F56D69167FBB1DC160A /* Pods_Runner.framework */,
+				3C663361C56EBB242598F609 /* Pods_Runner.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -77,9 +77,9 @@
 		84389F1A05D5860790D82820 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				20F67A1B2C2FCB2A3BB048C1 /* Pods-Runner.debug.xcconfig */,
+				11F9FC13F9EE2A705B213FA9 /* Pods-Runner.debug.xcconfig */,
-				501EA9286675DC8636978EA4 /* Pods-Runner.release.xcconfig */,
+				1F083F2041D1F553F2AF8B62 /* Pods-Runner.release.xcconfig */,
-				61CAA8652B54F23356F7592A /* Pods-Runner.profile.xcconfig */,
+				AD0937B0140D5A4C24E73BEA /* Pods-Runner.profile.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -138,13 +138,13 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
-				0843B0813AFBAF53935AD24E /* [CP] Check Pods Manifest.lock */,
+				B91154210ADCED81FBF06A85 /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
-				DD8DB3179CA4E511F9954A6F /* [CP] Embed Pods Frameworks */,
+				32D0076A9969C0C38D68AF62 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -203,26 +203,21 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		0843B0813AFBAF53935AD24E /* [CP] Check Pods Manifest.lock */ = {
+		32D0076A9969C0C38D68AF62 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
+			name = "[CP] Embed Pods Frameworks";
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
-			);
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
@@ -255,21 +250,26 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build\n";
 		};
-		DD8DB3179CA4E511F9954A6F /* [CP] Embed Pods Frameworks */ = {
+		B91154210ADCED81FBF06A85 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			name = "[CP] Embed Pods Frameworks";
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

lib/di.dart

@@ -1,7 +1,6 @@
 import 'package:cake_wallet/anonpay/anonpay_api.dart';
 import 'package:cake_wallet/anonpay/anonpay_info_base.dart';
 import 'package:cake_wallet/anonpay/anonpay_invoice_info.dart';
-import 'package:cake_wallet/buy/moonpay/moonpay_buy_provider.dart';
 import 'package:cake_wallet/buy/onramper/onramper_buy_provider.dart';
 import 'package:cake_wallet/buy/payfura/payfura_buy_provider.dart';
 import 'package:cake_wallet/core/yat_service.dart';
@@ -15,7 +14,6 @@ import 'package:cake_wallet/ionia/ionia_tip.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/anonpay_details/anonpay_details_page.dart';
 import 'package:cake_wallet/src/screens/buy/webview_page.dart';
-import 'package:cake_wallet/src/screens/buy/payfura_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_dashboard_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_sidebar_wrapper.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart';
@@ -690,8 +688,6 @@ Future setup({
         wallet: getIt.get<AppStore>().wallet!,
       ));
 
-  getIt.registerFactory(() => PayFuraPage(getIt.get<PayfuraBuyProvider>()));
-
   getIt.registerFactory(() => ExchangeViewModel(
         getIt.get<AppStore>().wallet!,
         _tradesSource,

lib/entities/main_actions.dart

@@ -1,12 +1,10 @@
 import 'package:cake_wallet/buy/moonpay/moonpay_buy_provider.dart';
 import 'package:cake_wallet/buy/onramper/onramper_buy_provider.dart';
-import 'package:cake_wallet/buy/payfura/payfura_buy_provider.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/utils/device_info.dart';
-import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:cw_core/wallet_type.dart';
@@ -60,13 +58,10 @@ class MainActions {
           break;
         case WalletType.monero:
           if (viewModel.isEnabledBuyAction) {
-            if (DeviceInfo.instance.isMobile) {
+            // final uri = getIt.get<PayfuraBuyProvider>().requestUrl();
-              Navigator.of(context).pushNamed(Routes.payfuraPage);
+            final uri = Uri.parse("https://monero.com/trade");
-            } else {
-              final uri = getIt.get<PayfuraBuyProvider>().requestUrl();
             await launchUrl(uri);
           }
-          }
           break;
         default:
           await showPopUp<void>(

lib/exchange/changenow/changenow_exchange_provider.dart

@@ -192,11 +192,11 @@ class ChangeNowExchangeProvider extends ExchangeProvider {
     final expectedSendAmount = responseJSON['expectedAmountFrom'].toString();
     final status = responseJSON['status'] as String;
     final state = TradeState.deserialize(raw: status);
-    final extraId = responseJSON['payinExtraId'] as String;
+    final extraId = responseJSON['payinExtraId'] as String?;
-    final outputTransaction = responseJSON['payoutHash'] as String;
+    final outputTransaction = responseJSON['payoutHash'] as String?;
-    final expiredAtRaw = responseJSON['validUntil'] as String;
+    final expiredAtRaw = responseJSON['validUntil'] as String?;
     final payoutAddress = responseJSON['payoutAddress'] as String;
-    final expiredAt = DateTime.tryParse(expiredAtRaw)?.toLocal();
+    final expiredAt = DateTime.tryParse(expiredAtRaw ?? '')?.toLocal();
 
     return Trade(
         id: id,

lib/router.dart

@@ -9,7 +9,6 @@ import 'package:cake_wallet/src/screens/backup/backup_page.dart';
 import 'package:cake_wallet/src/screens/backup/edit_backup_password_page.dart';
 import 'package:cake_wallet/src/screens/buy/buy_webview_page.dart';
 import 'package:cake_wallet/src/screens/buy/webview_page.dart';
-import 'package:cake_wallet/src/screens/buy/payfura_page.dart';
 import 'package:cake_wallet/src/screens/buy/pre_order_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/home_settings_page.dart';
 import 'package:cake_wallet/src/screens/restore/sweeping_wallet_page.dart';
@@ -527,9 +526,6 @@ Route<dynamic> createRoute(RouteSettings settings) {
           param1: title,
           param2: url));
 
-    case Routes.payfuraPage:
-      return CupertinoPageRoute<void>(builder: (_) => getIt.get<PayFuraPage>());
-
     case Routes.advancedPrivacySettings:
       final type = settings.arguments as WalletType;
 

lib/routes.dart

@@ -81,7 +81,6 @@ class Routes {
   static const anonPayInvoicePage = '/anon_pay_invoice_page';
   static const anonPayReceivePage = '/anon_pay_receive_page';
   static const anonPayDetailsPage = '/anon_pay_details_page';
-  static const payfuraPage = '/pay_fura_page';
   static const desktop_actions = '/desktop_actions';
   static const transactionsPage = '/transactions_page';
   static const setup_2faPage = '/setup_2fa_page';

lib/src/screens/buy/payfura_page.dart

@@ -1,58 +0,0 @@
-import 'package:cake_wallet/buy/payfura/payfura_buy_provider.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_inappwebview/flutter_inappwebview.dart';
-import 'package:permission_handler/permission_handler.dart';
-
-class PayFuraPage extends BasePage {
-  PayFuraPage(this._PayfuraBuyProvider);
-
-  final PayfuraBuyProvider _PayfuraBuyProvider;
-
-  @override
-  String get title => S.current.buy;
-
-  @override
-  Widget body(BuildContext context) {
-    return PayFuraPageBody(_PayfuraBuyProvider);
-  }
-}
-
-class PayFuraPageBody extends StatefulWidget {
-  PayFuraPageBody(this._PayfuraBuyProvider);
-
-  final PayfuraBuyProvider _PayfuraBuyProvider;
-
-  Uri get uri => _PayfuraBuyProvider.requestUrl();
-
-  @override
-  PayFuraPageBodyState createState() => PayFuraPageBodyState();
-}
-
-class PayFuraPageBodyState extends State<PayFuraPageBody> {
-  PayFuraPageBodyState();
-
-  @override
-  Widget build(BuildContext context) {
-    return InAppWebView(
-      initialOptions: InAppWebViewGroupOptions(
-        crossPlatform: InAppWebViewOptions(transparentBackground: true),
-      ),
-      initialUrlRequest: URLRequest(url: widget.uri),
-      androidOnPermissionRequest: (_, __, resources) async {
-        bool permissionGranted = await Permission.camera.status == PermissionStatus.granted;
-        if (!permissionGranted) {
-          permissionGranted = await Permission.camera.request().isGranted;
-        }
-
-        return PermissionRequestResponse(
-          resources: resources,
-          action: permissionGranted
-              ? PermissionRequestResponseAction.GRANT
-              : PermissionRequestResponseAction.DENY,
-        );
-      },
-    );
-  }
-}

lib/src/screens/exchange/exchange_page.dart

@@ -599,8 +599,8 @@ class ExchangePage extends BasePage {
               alertContent: S.of(context).low_fee_alert,
               leftButtonText: S.of(context).ignor,
               rightButtonText: S.of(context).use_suggested,
-              actionLeftButton: () => Navigator.of(context).pop(false),
+              actionLeftButton: () => Navigator.of(dialogContext).pop(false),
-              actionRightButton: () => Navigator.of(context).pop(true));
+              actionRightButton: () => Navigator.of(dialogContext).pop(true));
         }) ?? false;
     if (confirmed) {
       exchangeViewModel.setDefaultTransactionPriority();

lib/src/screens/wallet_list/wallet_list_page.dart

@@ -150,26 +150,12 @@ class WalletListBodyState extends State<WalletListBody> {
 
                     return wallet.isCurrent
                         ? row
-                        : Row(children: [
+                        : Slidable(
-                            Expanded(child: row),
+                            key: Key('${wallet.key}'),
-                            GestureDetector(
+                            startActionPane: _actionPane(wallet),
-                              onTap: () => _removeWallet(wallet),
+                            endActionPane: _actionPane(wallet),
-                              child: Container(
+                            child: row,
-                                height: 40,
+                          );
-                                width: 44,
-                                padding: EdgeInsets.only(right: 20),
-                                child: Center(
-                                  child: Image.asset('assets/images/trash.png',
-                                      height: 16,
-                                      width: 16,
-                                      color: Theme.of(context)
-                                          .primaryTextTheme
-                                          .titleLarge!
-                                          .color),
-                                ),
-                              ),
-                            )
-                          ]);
                   }),
             ),
           ),
@@ -294,4 +280,18 @@ class WalletListBodyState extends State<WalletListBody> {
       _progressBar = null;
     });
   }
+
+  ActionPane _actionPane(WalletListItem wallet) => ActionPane(
+    motion: const ScrollMotion(),
+    extentRatio: 0.3,
+    children: [
+      SlidableAction(
+        onPressed: (_) => _removeWallet(wallet),
+        backgroundColor: Colors.red,
+        foregroundColor: Colors.white,
+        icon: CupertinoIcons.delete,
+        label: S.of(context).delete,
+      ),
+    ],
+  );
 }

lib/store/app_store.dart

@@ -1,3 +1,4 @@
+import 'package:cake_wallet/utils/exception_handler.dart';
 import 'package:cw_core/transaction_info.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cw_core/balance.dart';
@@ -38,5 +39,6 @@ abstract class AppStoreBase with Store {
           wallet) {
     this.wallet?.close();
     this.wallet = wallet;
+    this.wallet!.setExceptionHandler(ExceptionHandler.onError);
   }
 }

lib/utils/responsive_layout_util.dart

@@ -12,10 +12,10 @@ class ResponsiveLayoutUtil {
   static final instance = ResponsiveLayoutUtil._();
 
   bool get isMobile =>
-      WidgetsBinding.instance.platformDispatcher.views.first.physicalSize.width < _kMobileThreshold;
+      MediaQueryData.fromWindow(WidgetsBinding.instance.window).size.width < _kMobileThreshold;
 
   bool get isIpad {
-    final width = WidgetsBinding.instance.platformDispatcher.views.first.physicalSize.width;
+    final width = MediaQueryData.fromWindow(WidgetsBinding.instance.window).size.width;
     return width >= _kMobileThreshold && !(width > _kIpadMaxWidth);
   }
 

lib/view_model/trade_details_view_model.dart

@@ -21,6 +21,7 @@ import 'package:cake_wallet/src/screens/trade_details/track_trade_list_item.dart
 import 'package:cake_wallet/src/screens/trade_details/trade_details_list_card.dart';
 import 'package:cake_wallet/src/screens/trade_details/trade_details_status_item.dart';
 import 'package:url_launcher/url_launcher.dart';
+import 'package:collection/collection.dart';
 
 part 'trade_details_view_model.g.dart';
 
@@ -32,7 +33,8 @@ abstract class TradeDetailsViewModelBase with Store {
     required this.trades,
     required this.settingsStore,
   })  : items = ObservableList<StandartListItem>(),
-        trade = tradeForDetails {
+        trade = trades.values.firstWhereOrNull((element) => element.id == tradeForDetails.id) ??
+            tradeForDetails {
     switch (trade.provider) {
       case ExchangeProviderDescription.xmrto:
         _provider = XMRTOExchangeProvider();
@@ -54,8 +56,6 @@ abstract class TradeDetailsViewModelBase with Store {
         break;
     }
 
-    items = ObservableList<StandartListItem>();
-
     _updateItems();
 
     _updateTrade();
@@ -85,6 +85,12 @@ abstract class TradeDetailsViewModelBase with Store {
       if (updatedTrade.createdAt == null && trade.createdAt != null) {
         updatedTrade.createdAt = trade.createdAt;
       }
+      Trade? foundElement = trades.values.firstWhereOrNull((element) => element.id == trade.id);
+      if (foundElement != null) {
+        final editedTrade = trades.get(foundElement.key);
+        editedTrade?.stateRaw = updatedTrade.stateRaw;
+        editedTrade?.save();
+      }
 
       trade = updatedTrade;
 
@@ -154,8 +160,9 @@ abstract class TradeDetailsViewModelBase with Store {
   }
 
   void _launchUrl(String url) {
+    final uri = Uri.parse(url);
     try {
-      launch(url);
+      launchUrl(uri);
     } catch (e) {}
   }
 }

macos/Podfile

@@ -36,5 +36,9 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_macos_build_settings(target)
+
+    target.build_configurations.each do |config|
+      config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '12.0'
+    end
   end
 end

macos/Podfile.lock

@@ -1,7 +1,7 @@
 PODS:
-  - connectivity_macos (0.0.1):
+  - connectivity_plus_macos (0.0.1):
     - FlutterMacOS
-    - Reachability
+    - ReachabilitySwift
   - cw_monero (0.0.1):
     - cw_monero/Boost (= 0.0.1)
     - cw_monero/Monero (= 0.0.1)
@@ -37,7 +37,7 @@ PODS:
     - FlutterMacOS
   - platform_device_id_macos (0.0.1):
     - FlutterMacOS
-  - Reachability (3.2)
+  - ReachabilitySwift (5.0.0)
   - share_plus_macos (0.0.1):
     - FlutterMacOS
   - shared_preferences_foundation (0.0.1):
@@ -49,7 +49,7 @@ PODS:
     - FlutterMacOS
 
 DEPENDENCIES:
-  - connectivity_macos (from `Flutter/ephemeral/.symlinks/plugins/connectivity_macos/macos`)
+  - connectivity_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus_macos/macos`)
   - cw_monero (from `Flutter/ephemeral/.symlinks/plugins/cw_monero/macos`)
   - device_info_plus (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus/macos`)
   - devicelocale (from `Flutter/ephemeral/.symlinks/plugins/devicelocale/macos`)
@@ -67,11 +67,11 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
-    - Reachability
+    - ReachabilitySwift
 
 EXTERNAL SOURCES:
-  connectivity_macos:
+  connectivity_plus_macos:
-    :path: Flutter/ephemeral/.symlinks/plugins/connectivity_macos/macos
+    :path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus_macos/macos
   cw_monero:
     :path: Flutter/ephemeral/.symlinks/plugins/cw_monero/macos
   device_info_plus:
@@ -102,7 +102,7 @@ EXTERNAL SOURCES:
     :path: Flutter/ephemeral/.symlinks/plugins/wakelock_macos/macos
 
 SPEC CHECKSUMS:
-  connectivity_macos: 5dae6ee11d320fac7c05f0d08bd08fc32b5514d9
+  connectivity_plus_macos: f6e86fd000e971d361e54b5afcadc8c8fa773308
   cw_monero: ec03de55a19c4a2b174ea687e0f4202edc716fa4
   device_info_plus: 5401765fde0b8d062a2f8eb65510fb17e77cf07f
   devicelocale: 9f0f36ac651cabae2c33f32dcff4f32b61c38225
@@ -113,12 +113,12 @@ SPEC CHECKSUMS:
   path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
   platform_device_id: 3e414428f45df149bbbfb623e2c0ca27c545b763
   platform_device_id_macos: f763bb55f088be804d61b96eb4710b8ab6598e94
-  Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
+  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
   share_plus_macos: 853ee48e7dce06b633998ca0735d482dd671ade4
   shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
   url_launcher_macos: 5335912b679c073563f29d89d33d10d459f95451
   wakelock_macos: bc3f2a9bd8d2e6c89fee1e1822e7ddac3bd004a9
 
-PODFILE CHECKSUM: 505596d150d38022472859d890f709281982e016
+PODFILE CHECKSUM: 5107934592df7813b33d744aebc8ddc6b5a5445f
 
 COCOAPODS: 1.11.3

macos/Runner.xcodeproj/project.pbxproj

@@ -75,7 +75,6 @@
 		9646C67C7114830A5ACFF5DF /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
 		9F565D5729954F53009A75FB /* secRandom.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = secRandom.swift; path = CakeWallet/secRandom.swift; sourceTree = "<group>"; };
-		9F565D5829954F53009A75FB /* decrypt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = decrypt.swift; path = CakeWallet/decrypt.swift; sourceTree = "<group>"; };
 		B38D1DBC56DBD386923BC063 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -105,7 +104,6 @@
 		33CC10E42044A3C60003C045 = {
 			isa = PBXGroup;
 			children = (
-				9F565D5829954F53009A75FB /* decrypt.swift */,
 				9F565D5729954F53009A75FB /* secRandom.swift */,
 				33FAB671232836740065AC1E /* Runner */,
 				33CEB47122A05771004F2AC0 /* Flutter */,

scripts/android/app_env.sh

@@ -14,14 +14,14 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
 APP_ANDROID_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.3.7"
+MONERO_COM_VERSION="1.3.8"
-MONERO_COM_BUILD_NUMBER=50
+MONERO_COM_BUILD_NUMBER=51
 MONERO_COM_BUNDLE_ID="com.monero.app"
 MONERO_COM_PACKAGE="com.monero.app"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.6.6"
+CAKEWALLET_VERSION="4.6.7"
-CAKEWALLET_BUILD_NUMBER=160
+CAKEWALLET_BUILD_NUMBER=161
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 

scripts/ios/app_env.sh

@@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
 APP_IOS_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.3.7"
+MONERO_COM_VERSION="1.3.8"
-MONERO_COM_BUILD_NUMBER=48
+MONERO_COM_BUILD_NUMBER=49
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.6.6"
+CAKEWALLET_VERSION="4.6.7"
-CAKEWALLET_BUILD_NUMBER=155
+CAKEWALLET_BUILD_NUMBER=159
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 HAVEN_NAME="Haven"

scripts/macos/app_env.sh

@@ -15,8 +15,8 @@ if [ -n "$1" ]; then
 fi
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.0.5"
+CAKEWALLET_VERSION="1.0.6"
-CAKEWALLET_BUILD_NUMBER=24
+CAKEWALLET_BUILD_NUMBER=25
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then