Merge branch 'main' into CW-492-moonpay

lib/core/auth_service.dart

@@ -38,6 +38,9 @@ class AuthService with Store {
   Future<void> setPassword(String password) async {
     final key = generateStoreKeyFor(key: SecretStoreKey.pinCodePassword);
     final encodedPassword = encodedPinCode(pin: password);
+    // secure storage has a weird bug on macOS, where overwriting a key doesn't work, unless
+    // we delete what's there first:
+    await secureStorage.delete(key: key);
     await secureStorage.write(key: key, value: encodedPassword);
   }
 
@@ -106,7 +109,6 @@ class AuthService with Store {
       }
     }
 
-    
     Navigator.of(context).pushNamed(Routes.auth,
         arguments: (bool isAuthenticatedSuccessfully, AuthPageState auth) async {
       if (!isAuthenticatedSuccessfully) {
@@ -140,8 +142,6 @@ class AuthService with Store {
           }
         }
       }
-      
     });
-  
   }
 }

lib/core/backup_service.dart

@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
+import 'package:cake_wallet/themes/theme_list.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/foundation.dart';
@@ -254,7 +255,8 @@ class BackupService {
     final lookupsENS = data[PreferencesKey.lookupsENS] as bool?;
     final syncAll = data[PreferencesKey.syncAllKey] as bool?;
     final syncMode = data[PreferencesKey.syncModeKey] as int?;
-    final autoGenerateSubaddressStatus = data[PreferencesKey.autoGenerateSubaddressStatusKey] as int?;
+    final autoGenerateSubaddressStatus =
+        data[PreferencesKey.autoGenerateSubaddressStatusKey] as int?;
 
     await _sharedPreferences.setString(PreferencesKey.currentWalletName, currentWalletName);
 
@@ -291,9 +293,12 @@ class BackupService {
       await _sharedPreferences.setInt(
           PreferencesKey.currentTransactionPriorityKeyLegacy, currentTransactionPriorityKeyLegacy);
 
-    if (allowBiometricalAuthentication != null && !Platform.isMacOS && !Platform.isLinux)
+    if (Platform.isMacOS || Platform.isLinux) {
+      await _sharedPreferences.setBool(PreferencesKey.allowBiometricalAuthenticationKey, false);
+    } else if (allowBiometricalAuthentication != null) {
       await _sharedPreferences.setBool(
           PreferencesKey.allowBiometricalAuthenticationKey, allowBiometricalAuthentication);
+    }
 
     if (currentBitcoinElectrumSererId != null)
       await _sharedPreferences.setInt(
@@ -309,14 +314,19 @@ class BackupService {
     if (fiatApiMode != null)
       await _sharedPreferences.setInt(PreferencesKey.currentFiatApiModeKey, fiatApiMode);
     if (autoGenerateSubaddressStatus != null)
-      await _sharedPreferences.setInt(PreferencesKey.autoGenerateSubaddressStatusKey,
-          autoGenerateSubaddressStatus);
+      await _sharedPreferences.setInt(
+          PreferencesKey.autoGenerateSubaddressStatusKey, autoGenerateSubaddressStatus);
 
     if (currentPinLength != null)
       await _sharedPreferences.setInt(PreferencesKey.currentPinLength, currentPinLength);
 
-    if (currentTheme != null && DeviceInfo.instance.isMobile)
+    if (currentTheme != null && DeviceInfo.instance.isMobile) {
       await _sharedPreferences.setInt(PreferencesKey.currentTheme, currentTheme);
+    // enforce dark theme on desktop platforms until the design is ready:
+    } else if (DeviceInfo.instance.isDesktop) {
+      await _sharedPreferences.setInt(PreferencesKey.currentTheme, ThemeList.darkTheme.raw);
+    }
+    
 
     if (exchangeStatus != null)
       await _sharedPreferences.setInt(PreferencesKey.exchangeStatusKey, exchangeStatus);
@@ -389,19 +399,17 @@ class BackupService {
       await _sharedPreferences.setBool(PreferencesKey.lookupsYatService, lookupsYatService);
 
     if (lookupsUnstoppableDomains != null)
-      await _sharedPreferences.setBool(PreferencesKey.lookupsUnstoppableDomains, lookupsUnstoppableDomains);
+      await _sharedPreferences.setBool(
+          PreferencesKey.lookupsUnstoppableDomains, lookupsUnstoppableDomains);
 
     if (lookupsOpenAlias != null)
       await _sharedPreferences.setBool(PreferencesKey.lookupsOpenAlias, lookupsOpenAlias);
 
-    if (lookupsENS != null)
-      await _sharedPreferences.setBool(PreferencesKey.lookupsENS, lookupsENS);
+    if (lookupsENS != null) await _sharedPreferences.setBool(PreferencesKey.lookupsENS, lookupsENS);
 
-    if (syncAll != null)
-      await _sharedPreferences.setBool(PreferencesKey.syncAllKey, syncAll);
+    if (syncAll != null) await _sharedPreferences.setBool(PreferencesKey.syncAllKey, syncAll);
 
-    if (syncMode != null)
-      await _sharedPreferences.setInt(PreferencesKey.syncModeKey, syncMode);
+    if (syncMode != null) await _sharedPreferences.setInt(PreferencesKey.syncModeKey, syncMode);
 
     await preferencesFile.delete();
   }
@@ -505,7 +513,8 @@ class BackupService {
           _sharedPreferences.getBool(PreferencesKey.shouldSaveRecipientAddressKey),
       PreferencesKey.disableBuyKey: _sharedPreferences.getBool(PreferencesKey.disableBuyKey),
       PreferencesKey.disableSellKey: _sharedPreferences.getBool(PreferencesKey.disableSellKey),
-      PreferencesKey.defaultBuyProvider: _sharedPreferences.getInt(PreferencesKey.defaultBuyProvider),
+      PreferencesKey.defaultBuyProvider:
+          _sharedPreferences.getInt(PreferencesKey.defaultBuyProvider),
       PreferencesKey.isDarkThemeLegacy:
           _sharedPreferences.getBool(PreferencesKey.isDarkThemeLegacy),
       PreferencesKey.currentPinLength: _sharedPreferences.getInt(PreferencesKey.currentPinLength),
@@ -547,28 +556,20 @@ class BackupService {
           _sharedPreferences.getBool(PreferencesKey.shouldRequireTOTP2FAForCreatingNewWallets),
       PreferencesKey.shouldRequireTOTP2FAForAllSecurityAndBackupSettings: _sharedPreferences
           .getBool(PreferencesKey.shouldRequireTOTP2FAForAllSecurityAndBackupSettings),
-      PreferencesKey.sortBalanceBy:
-          _sharedPreferences.getInt(PreferencesKey.sortBalanceBy),
+      PreferencesKey.sortBalanceBy: _sharedPreferences.getInt(PreferencesKey.sortBalanceBy),
       PreferencesKey.pinNativeTokenAtTop:
           _sharedPreferences.getBool(PreferencesKey.pinNativeTokenAtTop),
-      PreferencesKey.useEtherscan:
-          _sharedPreferences.getBool(PreferencesKey.useEtherscan),
-      PreferencesKey.lookupsTwitter:
-      _sharedPreferences.getBool(PreferencesKey.lookupsTwitter),
-      PreferencesKey.lookupsMastodon:
-      _sharedPreferences.getBool(PreferencesKey.lookupsMastodon),
+      PreferencesKey.useEtherscan: _sharedPreferences.getBool(PreferencesKey.useEtherscan),
+      PreferencesKey.lookupsTwitter: _sharedPreferences.getBool(PreferencesKey.lookupsTwitter),
+      PreferencesKey.lookupsMastodon: _sharedPreferences.getBool(PreferencesKey.lookupsMastodon),
       PreferencesKey.lookupsYatService:
           _sharedPreferences.getBool(PreferencesKey.lookupsYatService),
       PreferencesKey.lookupsUnstoppableDomains:
           _sharedPreferences.getBool(PreferencesKey.lookupsUnstoppableDomains),
-      PreferencesKey.lookupsOpenAlias:
-      _sharedPreferences.getBool(PreferencesKey.lookupsOpenAlias),
-      PreferencesKey.lookupsENS:
-      _sharedPreferences.getBool(PreferencesKey.lookupsENS),
-      PreferencesKey.syncModeKey:
-          _sharedPreferences.getInt(PreferencesKey.syncModeKey),
-      PreferencesKey.syncAllKey:
-          _sharedPreferences.getBool(PreferencesKey.syncAllKey),
+      PreferencesKey.lookupsOpenAlias: _sharedPreferences.getBool(PreferencesKey.lookupsOpenAlias),
+      PreferencesKey.lookupsENS: _sharedPreferences.getBool(PreferencesKey.lookupsENS),
+      PreferencesKey.syncModeKey: _sharedPreferences.getInt(PreferencesKey.syncModeKey),
+      PreferencesKey.syncAllKey: _sharedPreferences.getBool(PreferencesKey.syncAllKey),
       PreferencesKey.autoGenerateSubaddressStatusKey:
           _sharedPreferences.getInt(PreferencesKey.autoGenerateSubaddressStatusKey),
     };

lib/entities/encrypt.dart

@@ -2,18 +2,18 @@ import 'package:encrypt/encrypt.dart';
 // import 'package:password/password.dart';
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 
-String encrypt({required String source, required String key, int keyLength = 16}) {
+String encrypt({required String source, required String key}) {
   final _key = Key.fromUtf8(key);
-  final iv = IV.fromLength(keyLength);
+  final iv = IV.allZerosOfLength(16);
   final encrypter = Encrypter(AES(_key));
   final encrypted = encrypter.encrypt(source, iv: iv);
 
   return encrypted.base64;
 }
 
-String decrypt({required String source, required String key, int keyLength = 16}) {
+String decrypt({required String source, required String key}) {
   final _key = Key.fromUtf8(key);
-  final iv = IV.fromLength(keyLength);
+  final iv = IV.allZerosOfLength(16);
   final encrypter = Encrypter(AES(_key));
   final decrypted = encrypter.decrypt64(source, iv: iv);
 

lib/src/screens/restore/wallet_restore_page.dart

@@ -196,7 +196,9 @@ class WalletRestorePage extends BasePage {
                   ),
                 Padding(
                   padding: EdgeInsets.only(top: 20, bottom: 24, left: 24, right: 24),
-                  child: Observer(
+                  child: Column(
+                    children: [
+                      Observer(
                         builder: (context) {
                           return LoadingPrimaryButton(
                             onPressed: () async {
@@ -214,6 +216,16 @@ class WalletRestorePage extends BasePage {
                           );
                         },
                       ),
+                      const SizedBox(height: 25),
+                      GestureDetector(
+                        onTap: () {
+                          Navigator.of(context)
+                              .pushNamed(Routes.advancedPrivacySettings, arguments: walletRestoreViewModel.type);
+                        },
+                        child: Text(S.of(context).advanced_privacy_settings),
+                      ),
+                    ],
+                  ),
                 )
               ],
             ),

pubspec_base.yaml

@@ -49,7 +49,7 @@ dependencies:
   lottie: ^1.3.0
   animate_do: ^2.1.0
   cupertino_icons: ^1.0.5
-  encrypt: 5.0.1
+  encrypt: 5.0.2
   crypto: ^3.0.2
   # password: ^1.0.0
   basic_utils: ^5.6.1