@samitouri / QOSAMI-cakewallet / commits / ff5fbd794

v4.21.0 Release Candidate (#1795)

* new versions * minor fix of cache key * fix cache hit * - potential improvement for sync status - update with latest main * disable thorchain by default [skip ci] * update monero_c commit hash * minor fixes update versions * remove monero ledger * increase macos build number [skip ci]

Omar Hatem committed Nov 16, 2024 at 16:23 UTC ff5fbd794649619085568e6ff572227a83fff23e
24 files changed +92 -160
assets/text/Monerocom_Release_Notes.txt
+2 -2
@@ -1,3 +1,3 @@
1 -Monero enhancements
2 -Introducing StealthEx and LetxExchange
1 +Add airgapped Monero wallet support (best used with our new offline app Cupcake)
2 +New Buy & Sell flow
3 Bug fixes
\ No newline at end of file
assets/text/Release_Notes.txt
+4 -6
@@ -1,7 +1,5 @@
1 -Added Litecoin MWEB
2 -Added wallet groups
3 -Silent Payment enhancements for speed & reliability
4 -Monero enhancements
5 -Introducing StealthEx and LetxExchange
6 -Additional ERC20 tokens scam detection
1 +Add Litecoin Ledger support
2 +Add airgapped Monero wallet support (best used with our new offline app Cupcake)
3 +MWEB fixes and enhancements
4 +New Buy & Sell flow
5 Bug fixes
\ No newline at end of file
cw_bitcoin/lib/electrum_wallet.dart
+6 -3
@@ -574,6 +574,8 @@ abstract class ElectrumWalletBase
574 Future<void> connectToNode({required Node node}) async {
575 this.node = node;
576
577 + if (syncStatus is ConnectingSyncStatus) return;
578 +
579 try {
580 syncStatus = ConnectingSyncStatus();
581
@@ -2216,13 +2218,14 @@ abstract class ElectrumWalletBase
2218 if (syncStatus is NotConnectedSyncStatus ||
2219 syncStatus is LostConnectionSyncStatus ||
2220 syncStatus is ConnectingSyncStatus) {
2219 - syncStatus = AttemptingSyncStatus();
2220 - startSync();
2221 + syncStatus = ConnectedSyncStatus();
2222 }
2223
2224 break;
2225 case ConnectionStatus.disconnected:
2225 - if (syncStatus is! NotConnectedSyncStatus) {
2226 + if (syncStatus is! NotConnectedSyncStatus &&
2227 + syncStatus is! ConnectingSyncStatus &&
2228 + syncStatus is! SyncronizingSyncStatus) {
2229 syncStatus = NotConnectedSyncStatus();
2230 }
2231 break;
cw_bitcoin/pubspec.lock
+2 -2
@@ -87,8 +87,8 @@ packages:
87 dependency: "direct overridden"
88 description:
89 path: "."
90 - ref: cake-update-v8
91 - resolved-ref: fc045a11db3d85d806ca67f75e8b916c706745a2
90 + ref: cake-update-v9
91 + resolved-ref: "86969a14e337383e14965f5fb45a72a63e5009bc"
92 url: "https://github.com/cake-tech/bitcoin_base"
93 source: git
94 version: "4.7.0"
cw_core/lib/hardware/device_connection_type.dart
+1 -1
@@ -7,7 +7,7 @@ enum DeviceConnectionType {
7 static List<DeviceConnectionType> supportedConnectionTypes(WalletType walletType,
8 [bool isIOS = false]) {
9 switch (walletType) {
10 - case WalletType.monero:
10 + // case WalletType.monero:
11 case WalletType.bitcoin:
12 case WalletType.litecoin:
13 case WalletType.ethereum:
cw_monero/pubspec.lock
+2 -2
@@ -503,8 +503,8 @@ packages:
503 dependency: "direct main"
504 description:
505 path: "impls/monero.dart"
506 - ref: caaf1e56b1d2a254b332fdf848926fb963af4a3b
507 - resolved-ref: caaf1e56b1d2a254b332fdf848926fb963af4a3b
506 + ref: d72c15f4339791a7bbdf17e9d827b7b56ca144e4
507 + resolved-ref: d72c15f4339791a7bbdf17e9d827b7b56ca144e4
508 url: "https://github.com/mrcyjanek/monero_c"
509 source: git
510 version: "0.0.0"
cw_monero/pubspec.yaml
+1 -1
@@ -25,7 +25,7 @@ dependencies:
25 monero:
26 git:
27 url: https://github.com/mrcyjanek/monero_c
28 - ref: caaf1e56b1d2a254b332fdf848926fb963af4a3b
28 + ref: d72c15f4339791a7bbdf17e9d827b7b56ca144e4
29 # ref: 6eb571ea498ed7b854934785f00fabfd0dadf75b # monero_c hash
30 path: impls/monero.dart
31 mutex: ^3.1.0
cw_wownero/pubspec.lock
+4 -84
@@ -41,14 +41,6 @@ packages:
41 url: "https://pub.dev"
42 source: hosted
43 version: "2.11.0"
44 - bluez:
45 - dependency: transitive
46 - description:
47 - name: bluez
48 - sha256: "203a1924e818a9dd74af2b2c7a8f375ab8e5edf0e486bba8f90a0d8a17ed9fce"
49 - url: "https://pub.dev"
50 - source: hosted
51 - version: "0.8.2"
44 boolean_selector:
45 dependency: transitive
46 description:
@@ -217,14 +209,6 @@ packages:
209 url: "https://pub.dev"
210 source: hosted
211 version: "2.2.4"
220 - dbus:
221 - dependency: transitive
222 - description:
223 - name: dbus
224 - sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac"
225 - url: "https://pub.dev"
226 - source: hosted
227 - version: "0.7.10"
212 encrypt:
213 dependency: "direct main"
214 description:
@@ -283,14 +267,6 @@ packages:
267 description: flutter
268 source: sdk
269 version: "0.0.0"
286 - flutter_web_bluetooth:
287 - dependency: transitive
288 - description:
289 - name: flutter_web_bluetooth
290 - sha256: "52ce64f65d7321c4bf6abfe9dac02fb888731339a5e0ad6de59fb916c20c9f02"
291 - url: "https://pub.dev"
292 - source: hosted
293 - version: "0.2.3"
270 frontend_server_client:
271 dependency: transitive
272 description:
@@ -427,22 +403,6 @@ packages:
403 url: "https://pub.dev"
404 source: hosted
405 version: "2.0.1"
430 - ledger_flutter_plus:
431 - dependency: transitive
432 - description:
433 - name: ledger_flutter_plus
434 - sha256: ea3ed586e1697776dacf42ac979095f1ca3bd143bf007cbe5c78e09cb6943f42
435 - url: "https://pub.dev"
436 - source: hosted
437 - version: "1.2.5"
438 - ledger_usb_plus:
439 - dependency: transitive
440 - description:
441 - name: ledger_usb_plus
442 - sha256: "21cc5d976cf7edb3518bd2a0c4164139cbb0817d2e4f2054707fc4edfdf9ce87"
443 - url: "https://pub.dev"
444 - source: hosted
445 - version: "1.0.4"
406 logging:
407 dependency: transitive
408 description:
@@ -503,8 +463,8 @@ packages:
463 dependency: "direct main"
464 description:
465 path: "impls/monero.dart"
506 - ref: caaf1e56b1d2a254b332fdf848926fb963af4a3b
507 - resolved-ref: caaf1e56b1d2a254b332fdf848926fb963af4a3b
466 + ref: d72c15f4339791a7bbdf17e9d827b7b56ca144e4
467 + resolved-ref: d72c15f4339791a7bbdf17e9d827b7b56ca144e4
468 url: "https://github.com/mrcyjanek/monero_c"
469 source: git
470 version: "0.0.0"
@@ -580,14 +540,6 @@ packages:
540 url: "https://pub.dev"
541 source: hosted
542 version: "2.2.1"
583 - petitparser:
584 - dependency: transitive
585 - description:
586 - name: petitparser
587 - sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
588 - url: "https://pub.dev"
589 - source: hosted
590 - version: "6.0.2"
543 platform:
544 dependency: transitive
545 description:
@@ -644,14 +596,6 @@ packages:
596 url: "https://pub.dev"
597 source: hosted
598 version: "1.2.1"
647 - rxdart:
648 - dependency: transitive
649 - description:
650 - name: rxdart
651 - sha256: "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962"
652 - url: "https://pub.dev"
653 - source: hosted
654 - version: "0.28.0"
599 shelf:
600 dependency: transitive
601 description:
@@ -777,22 +721,6 @@ packages:
721 url: "https://pub.dev"
722 source: hosted
723 version: "1.3.1"
780 - universal_ble:
781 - dependency: transitive
782 - description:
783 - name: universal_ble
784 - sha256: "0dfbd6b64bff3ad61ed7a895c232530d9614e9b01ab261a74433a43267edb7f3"
785 - url: "https://pub.dev"
786 - source: hosted
787 - version: "0.12.0"
788 - universal_platform:
789 - dependency: transitive
790 - description:
791 - name: universal_platform
792 - sha256: "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec"
793 - url: "https://pub.dev"
794 - source: hosted
795 - version: "1.1.0"
724 unorm_dart:
725 dependency: transitive
726 description:
@@ -849,14 +777,6 @@ packages:
777 url: "https://pub.dev"
778 source: hosted
779 version: "1.0.4"
852 - xml:
853 - dependency: transitive
854 - description:
855 - name: xml
856 - sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
857 - url: "https://pub.dev"
858 - source: hosted
859 - version: "6.5.0"
780 yaml:
781 dependency: transitive
782 description:
@@ -866,5 +786,5 @@ packages:
786 source: hosted
787 version: "3.1.1"
788 sdks:
869 - dart: ">=3.3.0 <4.0.0"
870 - flutter: ">=3.19.0"
789 + dart: ">=3.2.0-0 <4.0.0"
790 + flutter: ">=3.7.0"
cw_wownero/pubspec.yaml
+1 -1
@@ -25,7 +25,7 @@ dependencies:
25 monero:
26 git:
27 url: https://github.com/mrcyjanek/monero_c
28 - ref: caaf1e56b1d2a254b332fdf848926fb963af4a3b
28 + ref: d72c15f4339791a7bbdf17e9d827b7b56ca144e4
29 # ref: 6eb571ea498ed7b854934785f00fabfd0dadf75b # monero_c hash
30 path: impls/monero.dart
31 mutex: ^3.1.0
ios/Podfile.lock
+13 -25
@@ -1,8 +1,4 @@
1 PODS:
2 - - barcode_scan2 (0.0.1):
3 - - Flutter
4 - - MTBBarcodeScanner
5 - - SwiftProtobuf
2 - connectivity_plus (0.0.1):
3 - Flutter
4 - ReachabilitySwift
@@ -76,6 +72,8 @@ PODS:
72 - DKPhotoGallery/Resource (0.0.19):
73 - SDWebImage
74 - SwiftyGif
75 + - fast_scanner (5.1.1):
76 + - Flutter
77 - file_picker (0.0.1):
78 - DKImagePickerController/PhotoGallery
79 - Flutter
@@ -100,7 +98,6 @@ PODS:
98 - Flutter
99 - integration_test (0.0.1):
100 - Flutter
103 - - MTBBarcodeScanner (5.0.11)
101 - OrderedSet (5.0.0)
102 - package_info_plus (0.4.5):
103 - Flutter
@@ -109,12 +106,7 @@ PODS:
106 - FlutterMacOS
107 - permission_handler_apple (9.1.1):
108 - Flutter
112 - - Protobuf (3.28.2)
109 - ReachabilitySwift (5.2.3)
114 - - reactive_ble_mobile (0.0.1):
115 - - Flutter
116 - - Protobuf (~> 3.5)
117 - - SwiftProtobuf (~> 1.0)
110 - SDWebImage (5.19.7):
111 - SDWebImage/Core (= 5.19.7)
112 - SDWebImage/Core (5.19.7)
@@ -127,11 +119,13 @@ PODS:
119 - FlutterMacOS
120 - sp_scanner (0.0.1):
121 - Flutter
130 - - SwiftProtobuf (1.27.1)
122 - SwiftyGif (5.4.5)
123 - Toast (4.1.1)
124 - uni_links (0.0.1):
125 - Flutter
126 + - universal_ble (0.0.1):
127 + - Flutter
128 + - FlutterMacOS
129 - url_launcher_ios (0.0.1):
130 - Flutter
131 - wakelock_plus (0.0.1):
@@ -140,7 +134,6 @@ PODS:
134 - Flutter
135
136 DEPENDENCIES:
143 - - barcode_scan2 (from `.symlinks/plugins/barcode_scan2/ios`)
137 - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
138 - CryptoSwift
139 - cw_haven (from `.symlinks/plugins/cw_haven/ios`)
@@ -149,6 +142,7 @@ DEPENDENCIES:
142 - device_display_brightness (from `.symlinks/plugins/device_display_brightness/ios`)
143 - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
144 - devicelocale (from `.symlinks/plugins/devicelocale/ios`)
145 + - fast_scanner (from `.symlinks/plugins/fast_scanner/ios`)
146 - file_picker (from `.symlinks/plugins/file_picker/ios`)
147 - Flutter (from `Flutter`)
148 - flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
@@ -161,12 +155,12 @@ DEPENDENCIES:
155 - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
156 - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
157 - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
164 - - reactive_ble_mobile (from `.symlinks/plugins/reactive_ble_mobile/ios`)
158 - sensitive_clipboard (from `.symlinks/plugins/sensitive_clipboard/ios`)
159 - share_plus (from `.symlinks/plugins/share_plus/ios`)
160 - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
161 - sp_scanner (from `.symlinks/plugins/sp_scanner/ios`)
162 - uni_links (from `.symlinks/plugins/uni_links/ios`)
163 + - universal_ble (from `.symlinks/plugins/universal_ble/darwin`)
164 - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
165 - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
166 - workmanager (from `.symlinks/plugins/workmanager/ios`)
@@ -176,18 +170,13 @@ SPEC REPOS:
170 - CryptoSwift
171 - DKImagePickerController
172 - DKPhotoGallery
179 - - MTBBarcodeScanner
173 - OrderedSet
181 - - Protobuf
174 - ReachabilitySwift
175 - SDWebImage
184 - - SwiftProtobuf
176 - SwiftyGif
177 - Toast
178
179 EXTERNAL SOURCES:
189 - barcode_scan2:
190 - :path: ".symlinks/plugins/barcode_scan2/ios"
180 connectivity_plus:
181 :path: ".symlinks/plugins/connectivity_plus/ios"
182 cw_haven:
@@ -202,6 +191,8 @@ EXTERNAL SOURCES:
191 :path: ".symlinks/plugins/device_info_plus/ios"
192 devicelocale:
193 :path: ".symlinks/plugins/devicelocale/ios"
194 + fast_scanner:
195 + :path: ".symlinks/plugins/fast_scanner/ios"
196 file_picker:
197 :path: ".symlinks/plugins/file_picker/ios"
198 Flutter:
@@ -226,8 +217,6 @@ EXTERNAL SOURCES:
217 :path: ".symlinks/plugins/path_provider_foundation/darwin"
218 permission_handler_apple:
219 :path: ".symlinks/plugins/permission_handler_apple/ios"
229 - reactive_ble_mobile:
230 - :path: ".symlinks/plugins/reactive_ble_mobile/ios"
220 sensitive_clipboard:
221 :path: ".symlinks/plugins/sensitive_clipboard/ios"
222 share_plus:
@@ -238,6 +227,8 @@ EXTERNAL SOURCES:
227 :path: ".symlinks/plugins/sp_scanner/ios"
228 uni_links:
229 :path: ".symlinks/plugins/uni_links/ios"
230 + universal_ble:
231 + :path: ".symlinks/plugins/universal_ble/darwin"
232 url_launcher_ios:
233 :path: ".symlinks/plugins/url_launcher_ios/ios"
234 wakelock_plus:
@@ -246,7 +237,6 @@ EXTERNAL SOURCES:
237 :path: ".symlinks/plugins/workmanager/ios"
238
239 SPEC CHECKSUMS:
249 - barcode_scan2: 0af2bb63c81b4565aab6cd78278e4c0fa136dbb0
240 connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
241 CryptoSwift: c63a805d8bb5e5538e88af4e44bb537776af11ea
242 cw_haven: b3e54e1fbe7b8e6fda57a93206bc38f8e89b898a
@@ -257,6 +247,7 @@ SPEC CHECKSUMS:
247 devicelocale: b22617f40038496deffba44747101255cee005b0
248 DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
249 DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
250 + fast_scanner: 44c00940355a51258cd6c2085734193cd23d95bc
251 file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de
252 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
253 flutter_inappwebview_ios: 97215cf7d4677db55df76782dbd2930c5e1c1ea0
@@ -266,23 +257,20 @@ SPEC CHECKSUMS:
257 fluttertoast: 48c57db1b71b0ce9e6bba9f31c940ff4b001293c
258 in_app_review: 318597b3a06c22bb46dc454d56828c85f444f99d
259 integration_test: 13825b8a9334a850581300559b8839134b124670
269 - MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
260 OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
261 package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
262 path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
263 permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
274 - Protobuf: 28c89b24435762f60244e691544ed80f50d82701
264 ReachabilitySwift: 7f151ff156cea1481a8411701195ac6a984f4979
276 - reactive_ble_mobile: 9ce6723d37ccf701dbffd202d487f23f5de03b4c
265 SDWebImage: 8a6b7b160b4d710e2a22b6900e25301075c34cb3
266 sensitive_clipboard: d4866e5d176581536c27bb1618642ee83adca986
267 share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
268 shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
269 sp_scanner: eaa617fa827396b967116b7f1f43549ca62e9a12
282 - SwiftProtobuf: b109bd17979d7993a84da14b1e1fdd8b0ded934a
270 SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
271 Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
272 uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
273 + universal_ble: cf52a7b3fd2e7c14d6d7262e9fdadb72ab6b88a6
274 url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
275 wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
276 workmanager: 0afdcf5628bbde6924c21af7836fed07b42e30e6
ios/Runner.xcodeproj/project.pbxproj
+18
@@ -230,6 +230,7 @@
230 97C146EC1CF9000F007C117D /* Resources */,
231 3B06AD1E1E4923F5004D2608 /* Thin Binary */,
232 F6F67323547956BC4F7B67F1 /* [CP] Embed Pods Frameworks */,
233 + 777FE2B16F25A3E820834145 /* [CP] Copy Pods Resources */,
234 );
235 buildRules = (
236 );
@@ -343,6 +344,23 @@
344 shellPath = /bin/sh;
345 shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
346 };
347 + 777FE2B16F25A3E820834145 /* [CP] Copy Pods Resources */ = {
348 + isa = PBXShellScriptBuildPhase;
349 + buildActionMask = 2147483647;
350 + files = (
351 + );
352 + inputFileListPaths = (
353 + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
354 + );
355 + name = "[CP] Copy Pods Resources";
356 + outputFileListPaths = (
357 + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
358 + );
359 + runOnlyForDeploymentPostprocessing = 0;
360 + shellPath = /bin/sh;
361 + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
362 + showEnvVarsInLog = 0;
363 + };
364 9740EEB61CF901F6004384FC /* Run Script */ = {
365 isa = PBXShellScriptBuildPhase;
366 alwaysOutOfDate = 1;
lib/buy/meld/meld_buy_provider.dart
-4
@@ -5,14 +5,10 @@ import 'package:cake_wallet/buy/buy_provider.dart';
5 import 'package:cake_wallet/buy/buy_quote.dart';
6 import 'package:cake_wallet/buy/payment_method.dart';
7 import 'package:cake_wallet/entities/fiat_currency.dart';
8 -import 'package:cake_wallet/entities/provider_types.dart';
8 import 'package:cake_wallet/generated/i18n.dart';
10 -import 'package:cake_wallet/routes.dart';
9 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
12 -import 'package:cake_wallet/utils/device_info.dart';
10 import 'package:cake_wallet/utils/show_pop_up.dart';
11 import 'package:cw_core/crypto_currency.dart';
15 -import 'package:cw_core/currency.dart';
12 import 'package:cw_core/wallet_base.dart';
13 import 'package:flutter/material.dart';
14 import 'dart:developer';
lib/entities/default_settings_migration.dart
+5 -3
@@ -252,7 +252,7 @@ Future<void> defaultSettingsMigration(
252 await removeMoneroWorld(sharedPreferences: sharedPreferences, nodes: nodes);
253 break;
254 case 41:
255 - _deselectQuantex(sharedPreferences);
255 + _deselectExchangeProvider(sharedPreferences, "Quantex");
256 await _addSethNode(nodes, sharedPreferences);
257 await updateTronNodesWithNowNodes(sharedPreferences: sharedPreferences, nodes: nodes);
258 break;
@@ -261,6 +261,8 @@ Future<void> defaultSettingsMigration(
261 break;
262 case 43:
263 _updateCakeXmrNode(nodes);
264 + _deselectExchangeProvider(sharedPreferences, "THORChain");
265 + _deselectExchangeProvider(sharedPreferences, "SimpleSwap");
266 break;
267
268 default:
@@ -295,12 +297,12 @@ void updateBtcElectrumNodeToUseSSL(Box<Node> nodes, SharedPreferences sharedPref
297 }
298 }
299
298 -void _deselectQuantex(SharedPreferences sharedPreferences) {
300 +void _deselectExchangeProvider(SharedPreferences sharedPreferences, String providerName) {
301 final Map<String, dynamic> exchangeProvidersSelection =
302 json.decode(sharedPreferences.getString(PreferencesKey.exchangeProvidersSelection) ?? "{}")
303 as Map<String, dynamic>;
304
303 - exchangeProvidersSelection['Quantex'] = false;
305 + exchangeProvidersSelection[providerName] = false;
306
307 sharedPreferences.setString(
308 PreferencesKey.exchangeProvidersSelection,
lib/src/screens/contact/contact_list_page.dart
+10 -8
@@ -240,14 +240,16 @@ class _ContactPageBodyState extends State<ContactPageBody> with SingleTickerProv
240 mainAxisAlignment: MainAxisAlignment.start,
241 children: <Widget>[
242 currencyIcon,
243 - Padding(
244 - padding: EdgeInsets.only(left: 12),
245 - child: Text(
246 - contact.name,
247 - style: TextStyle(
248 - fontSize: 14,
249 - fontWeight: FontWeight.normal,
250 - color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
243 + Expanded(
244 + child: Padding(
245 + padding: EdgeInsets.only(left: 12),
246 + child: Text(
247 + contact.name,
248 + style: TextStyle(
249 + fontSize: 14,
250 + fontWeight: FontWeight.normal,
251 + color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
252 + ),
253 ),
254 ),
255 ),
lib/src/screens/restore/restore_options_page.dart
+3 -2
@@ -56,8 +56,9 @@ class _RestoreOptionsBodyState extends State<_RestoreOptionsBody> {
56 }
57
58 if (isMoneroOnly) {
59 - return DeviceConnectionType.supportedConnectionTypes(WalletType.monero, Platform.isIOS)
60 - .isNotEmpty;
59 + // return DeviceConnectionType.supportedConnectionTypes(WalletType.monero, Platform.isIOS)
60 + // .isNotEmpty;
61 + return false;
62 }
63
64 return true;
linux/flutter/generated_plugins.cmake
+1
@@ -10,6 +10,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
10 )
11
12 list(APPEND FLUTTER_FFI_PLUGIN_LIST
13 + sp_scanner
14 )
15
16 set(PLUGIN_BUNDLED_LIBRARIES)
macos/Flutter/GeneratedPluginRegistrant.swift
+2
@@ -6,6 +6,7 @@ import FlutterMacOS
6 import Foundation
7
8 import connectivity_plus
9 +import cw_mweb
10 import device_info_plus
11 import devicelocale
12 import fast_scanner
@@ -23,6 +24,7 @@ import wakelock_plus
24
25 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
26 ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
27 + CwMwebPlugin.register(with: registry.registrar(forPlugin: "CwMwebPlugin"))
28 DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
29 DevicelocalePlugin.register(with: registry.registrar(forPlugin: "DevicelocalePlugin"))
30 MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin"))
scripts/android/app_env.sh
+4 -4
@@ -15,15 +15,15 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
15 APP_ANDROID_TYPE=$1
16
17 MONERO_COM_NAME="Monero.com"
18 -MONERO_COM_VERSION="1.17.0"
19 -MONERO_COM_BUILD_NUMBER=103
18 +MONERO_COM_VERSION="1.18.0"
19 +MONERO_COM_BUILD_NUMBER=105
20 MONERO_COM_BUNDLE_ID="com.monero.app"
21 MONERO_COM_PACKAGE="com.monero.app"
22 MONERO_COM_SCHEME="monero.com"
23
24 CAKEWALLET_NAME="Cake Wallet"
25 -CAKEWALLET_VERSION="4.20.1"
26 -CAKEWALLET_BUILD_NUMBER=233
25 +CAKEWALLET_VERSION="4.21.0"
26 +CAKEWALLET_BUILD_NUMBER=236
27 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
28 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
29 CAKEWALLET_SCHEME="cakewallet"
scripts/ios/app_env.sh
+4 -4
@@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
13 APP_IOS_TYPE=$1
14
15 MONERO_COM_NAME="Monero.com"
16 -MONERO_COM_VERSION="1.17.0"
17 -MONERO_COM_BUILD_NUMBER=101
16 +MONERO_COM_VERSION="1.18.0"
17 +MONERO_COM_BUILD_NUMBER=103
18 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
19
20 CAKEWALLET_NAME="Cake Wallet"
21 -CAKEWALLET_VERSION="4.20.1"
22 -CAKEWALLET_BUILD_NUMBER=277
21 +CAKEWALLET_VERSION="4.21.0"
22 +CAKEWALLET_BUILD_NUMBER=281
23 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
24
25 HAVEN_NAME="Haven"
scripts/linux/app_env.sh
+2 -2
@@ -14,8 +14,8 @@ if [ -n "$1" ]; then
14 fi
15
16 CAKEWALLET_NAME="Cake Wallet"
17 -CAKEWALLET_VERSION="1.10.1"
18 -CAKEWALLET_BUILD_NUMBER=37
17 +CAKEWALLET_VERSION="1.11.0"
18 +CAKEWALLET_BUILD_NUMBER=38
19
20 if ! [[ " ${TYPES[*]} " =~ " ${APP_LINUX_TYPE} " ]]; then
21 echo "Wrong app type."
scripts/macos/app_env.sh
+4 -4
@@ -16,13 +16,13 @@ if [ -n "$1" ]; then
16 fi
17
18 MONERO_COM_NAME="Monero.com"
19 -MONERO_COM_VERSION="1.7.0"
20 -MONERO_COM_BUILD_NUMBER=34
19 +MONERO_COM_VERSION="1.8.0"
20 +MONERO_COM_BUILD_NUMBER=36
21 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
22
23 CAKEWALLET_NAME="Cake Wallet"
24 -CAKEWALLET_VERSION="1.13.1"
25 -CAKEWALLET_BUILD_NUMBER=93
24 +CAKEWALLET_VERSION="1.14.0"
25 +CAKEWALLET_BUILD_NUMBER=95
26 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
27
28 if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then
scripts/prepare_moneroc.sh
+1 -1
@@ -8,7 +8,7 @@ if [[ ! -d "monero_c" ]];
8 then
9 git clone https://github.com/mrcyjanek/monero_c --branch master
10 cd monero_c
11 - git checkout 1d8e0fb30b53c28756f23676d5a3e1a99a9b3051
11 + git checkout d72c15f4339791a7bbdf17e9d827b7b56ca144e4
12 git reset --hard
13 git submodule update --init --force --recursive
14 ./apply_patches.sh monero
scripts/windows/build_exe_installer.iss
+1 -1
@@ -1,5 +1,5 @@
1 #define MyAppName "Cake Wallet"
2 -#define MyAppVersion "0.1.1"
2 +#define MyAppVersion "0.2.0"
3 #define MyAppPublisher "Cake Labs LLC"
4 #define MyAppURL "https://cakewallet.com/"
5 #define MyAppExeName "CakeWallet.exe"
windows/flutter/generated_plugins.cmake
+1
@@ -13,6 +13,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
13 )
14
15 list(APPEND FLUTTER_FFI_PLUGIN_LIST
16 + sp_scanner
17 )
18
19 set(PLUGIN_BUNDLED_LIBRARIES)