Merge branch 'main' of https://github.com/cake-tech/cake_wallet into linux/password-direct-input

Conflicts: assets/text/Monerocom_Release_Notes.txt assets/text/Release_Notes.txt ios/Podfile.lock lib/utils/exception_handler.dart scripts/android/app_env.sh scripts/ios/app_env.sh scripts/macos/app_env.sh
2024-12-22 19:49:22 +00:00 · 2023-07-14 23:33:35 +03:00 · 2023-07-14 23:33:35 +03:00 · 9164d05fee
commit 9164d05fee
parent 8a7ef39f19 e34ba6cfbc
7 changed files with 55 additions and 55 deletions
--- a/assets/text/Monerocom_Release_Notes.txt
+++ b/assets/text/Monerocom_Release_Notes.txt
@ -1,6 +1,6 @@
-Opt-in to Cake 2FA for security. More info: https://guides.cakewallet.com/docs/advanced-features/authentication/#cake-2fa
-Auto generate restore height for Monero restore QR codes
-Hausa and Yoruba languages
-Additional privacy settings
-Update Monero to 0.18.2.2
-Refactoring and bug fixes
+Improved edit/delete for nodes and wallets
+Wallets can now be renamed
+Accessibility improvements
+Improve Monero wallet rescan
+Additional exchange assets: SHIB, AAVE, ARB, BAT, COMP, CRO, ENS, FTM, FRAX, GUSD, GTC, GRT, LDO, NEXO, CAKE, PEPE, STORJ, TUSD, WBTC, WETH, ZRX, DYDX, STETH
+Cake Pay is temporarily removed, see https://cakelabs.com/news/cake-pay-mobile-to-shut-down/
--- a/assets/text/Release_Notes.txt
+++ b/assets/text/Release_Notes.txt
@ -1,6 +1,7 @@
-Opt-in to Cake 2FA for security. More info: https://guides.cakewallet.com/docs/advanced-features/authentication/#cake-2fa
-Auto generate restore height for Monero restore QR codes
-Hausa and Yoruba languages
-Additional privacy settings
-Update Monero to 0.18.2.2
-Refactoring and bug fixes
+Improved edit/delete for nodes and wallets
+Wallets can now be renamed
+Accessibility improvements
+Bitcoin transaction bug fixes
+Improve Monero wallet rescan
+Additional exchange assets: SHIB, AAVE, ARB, BAT, COMP, CRO, ENS, FTM, FRAX, GUSD, GTC, GRT, LDO, NEXO, CAKE, PEPE, STORJ, TUSD, WBTC, WETH, ZRX, DYDX, STETH
+Cake Pay is temporarily removed, see https://cakelabs.com/news/cake-pay-mobile-to-shut-down/
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@ -4,10 +4,10 @@ PODS:
    - MTBBarcodeScanner
    - SwiftProtobuf
  - BigInt (5.2.0)
-  - connectivity (0.0.1):
+  - connectivity_plus (0.0.1):
    - Flutter
-    - Reachability
-  - CryptoSwift (1.6.0)
+    - ReachabilitySwift
+  - CryptoSwift (1.7.1)
  - cw_haven (0.0.1):
    - cw_haven/Boost (= 0.0.1)
    - cw_haven/Haven (= 0.0.1)
@ -126,20 +126,20 @@ PODS:
  - path_provider_foundation (0.0.1):
    - Flutter
    - FlutterMacOS
-  - permission_handler_apple (9.0.4):
+  - permission_handler_apple (9.1.1):
    - Flutter
  - platform_device_id (0.0.1):
    - Flutter
-  - Reachability (3.2)
-  - SDWebImage (5.15.5):
-    - SDWebImage/Core (= 5.15.5)
-  - SDWebImage/Core (5.15.5)
+  - ReachabilitySwift (5.0.0)
+  - SDWebImage (5.16.0):
+    - SDWebImage/Core (= 5.16.0)
+  - 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
@ -153,7 +153,7 @@ PODS:

 DEPENDENCIES:
  - barcode_scan2 (from `.symlinks/plugins/barcode_scan2/ios`)
-  - connectivity (from `.symlinks/plugins/connectivity/ios`)
+  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
  - CryptoSwift
  - cw_haven (from `.symlinks/plugins/cw_haven/ios`)
  - cw_monero (from `.symlinks/plugins/cw_monero/ios`)
@ -188,7 +188,7 @@ SPEC REPOS:
    - DKPhotoGallery
    - MTBBarcodeScanner
    - OrderedSet
-    - Reachability
+    - ReachabilitySwift
    - SDWebImage
    - SwiftProtobuf
    - SwiftyGif
@ -197,8 +197,8 @@ SPEC REPOS:
 EXTERNAL SOURCES:
  barcode_scan2:
    :path: ".symlinks/plugins/barcode_scan2/ios"
-  connectivity:
-    :path: ".symlinks/plugins/connectivity/ios"
+  connectivity_plus:
+    :path: ".symlinks/plugins/connectivity_plus/ios"
  cw_haven:
    :path: ".symlinks/plugins/cw_haven/ios"
  cw_monero:
@ -249,8 +249,8 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  barcode_scan2: 0af2bb63c81b4565aab6cd78278e4c0fa136dbb0
  BigInt: f668a80089607f521586bbe29513d708491ef2f7
-  connectivity: c4130b2985d4ef6fd26f9702e886bd5260681467
-  CryptoSwift: 562f8eceb40e80796fffc668b0cad9313284cfa6
+  connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
+  CryptoSwift: d3d18dc357932f7e6d580689e065cf1f176007c1
  cw_haven: b3e54e1fbe7b8e6fda57a93206bc38f8e89b898a
  cw_monero: 4cf3b96f2da8e95e2ef7d6703dd4d2c509127b7d
  cw_shared_external: 2972d872b8917603478117c9957dfca611845a92
@ -271,19 +271,19 @@ SPEC CHECKSUMS:
  OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
  package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
  path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
-  permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
+  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
  platform_device_id: 81b3e2993881f87d0c82ef151dc274df4869aef5
-  Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96
-  SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe
+  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
+  SDWebImage: 2aea163b50bfcb569a2726b6a754c54a4506fcf6
  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
-  shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
-  SwiftProtobuf: afced68785854575756db965e9da52bbf3dc45e7
+  shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
+  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
+COCOAPODS: 1.12.1
--- a/lib/utils/exception_handler.dart
+++ b/lib/utils/exception_handler.dart
@ -131,17 +131,16 @@ class ExceptionHandler {
      _ignoredErrors.any((element) => error.contains(element));

  static const List<String> _ignoredErrors = const [
-    "errno = 9", // SocketException: Bad file descriptor
-    "errno = 28", // OS Error: No space left on device
-    "errno = 32", // SocketException: Write failed (OS Error: Broken pipe)
-    "errno = 49", // SocketException: Can't assign requested address
-    "errno = 54", // SocketException: Connection reset by peer
-    "errno = 57", // SocketException: Read failed (OS Error: Socket is not connected)
-    "errno = 60", // SocketException: Operation timed out
-    "errno = 65", // SocketException: No route to host
-    "errno = 103", // SocketException: Software caused connection abort
-    "errno = 104", // SocketException: Connection reset by peer
-    "errno = 110", // SocketException: Connection timed out
+    "Bad file descriptor",
+    "No space left on device",
+    "Write failed (OS Error: Broken pipe",
+    "Can't assign requested address",
+    "Read failed (OS Error: Socket is not connected",
+    "Operation timed out",
+    "No route to host",
+    "Software caused connection abort",
+    "Connection reset by peer",
+    "Connection timed out",
    "Connection reset by peer",
    "Connection closed before full header was received",
    "Connection terminated during handshake",
--- a/scripts/android/app_env.sh
+++ b/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_BUILD_NUMBER=50
+MONERO_COM_VERSION="1.4.0"
+MONERO_COM_BUILD_NUMBER=52
 MONERO_COM_BUNDLE_ID="com.monero.app"
 MONERO_COM_PACKAGE="com.monero.app"

 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.6.6"
-CAKEWALLET_BUILD_NUMBER=160
+CAKEWALLET_VERSION="4.7.0"
+CAKEWALLET_BUILD_NUMBER=162
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"

--- a/scripts/ios/app_env.sh
+++ b/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_BUILD_NUMBER=48
+MONERO_COM_VERSION="1.4.0"
+MONERO_COM_BUILD_NUMBER=50
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"

 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.6.6"
-CAKEWALLET_BUILD_NUMBER=155
+CAKEWALLET_VERSION="4.7.0"
+CAKEWALLET_BUILD_NUMBER=165
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"

 HAVEN_NAME="Haven"
--- a/scripts/macos/app_env.sh
+++ b/scripts/macos/app_env.sh
@ -15,8 +15,8 @@ if [ -n "$1" ]; then
 fi

 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="1.0.5"
-CAKEWALLET_BUILD_NUMBER=24
+CAKEWALLET_VERSION="1.0.7"
+CAKEWALLET_BUILD_NUMBER=26
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"

 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then