CW-676 Add Linux scripts to build monero_c for linux platform (#1527)

* Revert "Revert btc address types"

This reverts commit a49e57e3

* Re-add Bitcoin Address types
Fix conflicts with main

* fix: label issues, clear spent utxo

* chore: deps

* fix: build

* fix: missing types

* feat: new electrs API & changes, fixes for last block scanning

* Update Monero

* not sure why it's failing

* Enable Exolix
Improve service updates indicator
New versions

* Add exolix Api token to limits api

* Ignore reporting network issues

* Change default bitcoin node

* Merge main and update linux version

* Update app version [skip ci]

* New versions

* Fix conflicts and update linux version

* minor fix

* feat: Scan Silent Payments homepage toggle

* chore: build configure

* feat: generic fixes, testnet UI improvements, useSSL on bitcoin nodes

* fix: invalid Object in sendData

* feat: improve addresses page & address book displays

* feat: silent payments labeled addresses disclaimer

* fix: missing i18n

* chore: print

* feat: single block scan, rescan by date working for btc mainnet

* feat: new cake features page replace market page, move sp scan toggle, auto switch node pop up alert

* feat: delete silent addresses

* fix: red dot in non ssl nodes

* fix: inconsistent connection states, fix tx history

* fix: tx & balance displays, cpfp sending

* feat: new rust lib

* chore: node path

* fix: check node based on network

* fix: missing txcount from addresses

* style: padding in feature page cards

* fix: restore not getting all wallet addresses by type

* fix: auto switch node broken

* fix: silent payment txs not being restored

* update linux version

* feat: change scanning to subscription model, sync improvements

* fix: scan re-subscription

* fix: default nodes

* fix: improve scanning by date, fix single block scan

* refactor: common function for input tx selection

* various fixes for build issues

* initial monero.dart implementation

* ...

* multiple wallets
new lib
minor fixes

* other fixes from monero.dart and monero_c

* fix: nodes & build

* update build scripts
fix polyseed

* remove unnecessary code

* Add windows app, build scripts and build guide for it.

* Minor fix in generated monero configs

* Merge and fix main

* fix: send all with multiple outs

* add missing monero_c command

* add android build script

* update version

* Merge and fix main

* undo android ndk removal

* Fix modified exception_handler.dart

* Temporarily remove haven

* fix build issues

* fix pr script

* Fixes for build monero.dart (monero_c) for windows.

* monero build script

* wip: ios build script

* refactor: unchanged file

* Added build guides for iOS and macOS. Replaced nproc call on macOS. Added macOS configuration for configure_cake_wallet.sh script.

* Update monero.dart and monero_c versions.

* Add missed windows build scripts

* Update the application configuration for windows build script.

* Update cw_monero pubspec lock file for monero.dart

* Update pr_test_build.yml

* chore: upgrade

* chore: merge changes

* refactor: unchanged files [skip ci]

* Fix conflicts with main

* fix for multiple wallets

* update app version [skip ci]

* Add tron to windows application configuration.

* Add macOS option for description message in configure_cake_wallet.sh

* fix missing encryption utils in hardware wallet functions [skip ci]

* fix conflicts

* Include missed monero dll for windows.

* reformatting [skip ci]

* fix conflicts with main

* Disable haven configuration for iOS as default. Add ability to configure cakewallet for iOS with  for configuration script. Remove cw_shared configuration for cw_monero.

* fix: scan fixes, add date, allow sending while scanning

* add missing nano secrets file [skip ci]

* ios library

* don't pull prebuilds android

* Add auto generation of manifest file for android project even for iOS, macOS, Windows.

* remove tron

* feat: sync fixes, sp settings

* feat: fix resyncing

* store crash fix

* make init async so it won't lag
disable print starts

* fix monero_c build issues

* libstdc++

* merge main and update version

* Fix MacOS saving wallet file issue
Fix Secure Storage issue (somehow)

* update pubspec.lock

* fix build script

* Use dylib as iOS framework. Use custom path for loading of iOS framework for monero.dart. Add script for generate iOS framework for monero wallet.

* fix: date from height logic, status disconnected & chain tip get

* fix: params

* feat: electrum migration if using cake electrum

* fix nodes
update versions

* re-enable tron

* update sp_scanner to work on iOS [skip ci]

* bump monero_c hash

* bump monero_c commit

* bump moneroc version

* bump monero_c commit

* Add ability to build monero wallet lib as universal lib. Update macOS build guide. Change default arch for macOS project to .

* fix: wrong socket for old electrum nodes

* update version

* Fix unchecked wallet type call

* get App Dir correctly in default_settings_migration.dart

* handle previous issue with fetching linux documents directory [skip ci]

* backup fix

* fix NTFS issues

* Add Tron
Update Linux version

* Close the wallet when the wallet gets changed

* fix: double balance

* feat: node domain

* fix: menu name

* bump monero_c commit

* fix: update tip on set scanning

* fix: connection switching back and forth

* feat: check if node is electrs, and supports sp

* chore: fix build

* minor enhancements

* fixes and enhancements

* solve conflicts with main

* Only stop wallet on rename and delete

* fix: status toggle

* minor enhancement

* Monero.com fixes

* bump monero_c commit

* update sp_scanner to include windows and linux

* merge main

* Update macOS build guide. Change brew dependencies for build unbound locally.

* fix: Tron file write, build scripts

* - merge linux with Monero Dart
- Temporarily disable Monero

* fix other issues with linux

* linux ci
fix build script

* Update pr_test_build_linux.yml

install required packages

* add linux desktop dependencies

* don't use apk in linux build releases

* don't copy the file to test-apk

* fix linux runtime issues

* remove libc++_shared.so

* fix issues with linux

* prepare both android and linux (because otherwise it will fail)

* ci script updates

* run apt update

* bump image to ubuntu 22.04
note: remember to put it down later

* bump python version

* remove some dependencies

* remove unused import

* add missing dependencies

* fix dependencies

* some fixes

* remove print [skip ci]

* Add back RunnerBase.entitlements
minor fixes [skip ci]

* fix memory leak / infinite recurrsion when opening xmr wallet

* url_launcher_linux: 3.1.1 # https://github.com/flutter/flutter/issues/153083

* fix conflicts with main

* handle walletKeysFile with encryptionUtils

* update app version [skip ci]

* add wownero [skip ci]

---------

Co-authored-by: OmarHatem <omarh.ismail1@gmail.com>
Co-authored-by: Rafael Saes <git@rafael.saes.dev>
Co-authored-by: M <m@cakewallet.com>
Co-authored-by: Konstantin Ullrich <konstantinullrich12@gmail.com>

lib/bitcoin/cw_bitcoin.dart

@@ -29,8 +29,8 @@ class CWBitcoin extends Bitcoin {
 
   @override
   WalletCredentials createBitcoinNewWalletCredentials(
-          {required String name, WalletInfo? walletInfo}) =>
-      BitcoinNewWalletCredentials(name: name, walletInfo: walletInfo);
+          {required String name, WalletInfo? walletInfo, String? password}) =>
+      BitcoinNewWalletCredentials(name: name, walletInfo: walletInfo, password: password);
 
   @override
   WalletCredentials createBitcoinHardwareWalletCredentials(
@@ -203,13 +203,13 @@ class CWBitcoin extends Bitcoin {
   }
 
   WalletService createBitcoinWalletService(
-      Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource, bool alwaysScan) {
-    return BitcoinWalletService(walletInfoSource, unspentCoinSource, alwaysScan);
+      Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource, bool alwaysScan, bool isDirect) {
+    return BitcoinWalletService(walletInfoSource, unspentCoinSource, alwaysScan, isDirect);
   }
 
   WalletService createLitecoinWalletService(
-      Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource) {
-    return LitecoinWalletService(walletInfoSource, unspentCoinSource);
+      Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource, bool isDirect) {
+    return LitecoinWalletService(walletInfoSource, unspentCoinSource, isDirect);
   }
 
   @override

lib/bitcoin_cash/cw_bitcoin_cash.dart

@@ -6,16 +6,17 @@ class CWBitcoinCash extends BitcoinCash {
 
   @override
   WalletService createBitcoinCashWalletService(
-      Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource) {
-    return BitcoinCashWalletService(walletInfoSource, unspentCoinSource);
+      Box<WalletInfo> walletInfoSource, Box<UnspentCoinsInfo> unspentCoinSource, bool isDirect) {
+    return BitcoinCashWalletService(walletInfoSource, unspentCoinSource, isDirect);
   }
 
   @override
   WalletCredentials createBitcoinCashNewWalletCredentials({
     required String name,
     WalletInfo? walletInfo,
+    String? password,
   }) =>
-      BitcoinCashNewWalletCredentials(name: name, walletInfo: walletInfo);
+      BitcoinCashNewWalletCredentials(name: name, walletInfo: walletInfo, password: password);
 
   @override
   WalletCredentials createBitcoinCashRestoreWalletFromSeedCredentials(

lib/core/backup_service.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 import 'dart:typed_data';
 import 'package:cake_wallet/core/secure_storage.dart';
 import 'package:cake_wallet/themes/theme_list.dart';
+import 'package:cw_core/root_dir.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cw_core/root_dir.dart';
 import 'package:cw_core/wallet_type.dart';
@@ -20,7 +21,6 @@ import 'package:cake_wallet/entities/secret_store_key.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 import 'package:cake_wallet/wallet_types.g.dart';
-
 import 'package:cake_backup/backup.dart' as cake_backup;
 
 class BackupService {

lib/core/wallet_creation_service.dart

@@ -15,7 +15,6 @@ import 'package:cw_core/wallet_type.dart';
 class WalletCreationService {
   WalletCreationService(
       {required WalletType initialType,
-      required this.secureStorage,
       required this.keyService,
       required this.sharedPreferences,
       required this.settingsStore,
@@ -25,7 +24,6 @@ class WalletCreationService {
   }
 
   WalletType type;
-  final SecureStorage secureStorage;
   final SharedPreferences sharedPreferences;
   final SettingsStore settingsStore;
   final KeyService keyService;
@@ -56,12 +54,16 @@ class WalletCreationService {
 
   Future<WalletBase> create(WalletCredentials credentials, {bool? isTestnet}) async {
     checkIfExists(credentials.name);
-    final password = generateWalletPassword();
-    credentials.password = password;
+
+    if (credentials.password == null) {
+      credentials.password = generateWalletPassword();
+      await keyService.saveWalletPassword(
+        password: credentials.password!, walletName: credentials.name);
+    }
+
     if (_hasSeedPhraseLengthOption) {
       credentials.seedPhraseLength = settingsStore.seedPhraseLength.value;
     }
-    await keyService.saveWalletPassword(password: password, walletName: credentials.name);
     final wallet = await _service!.create(credentials, isTestnet: isTestnet);
 
     if (wallet.type == WalletType.monero) {
@@ -94,9 +96,13 @@ class WalletCreationService {
 
   Future<WalletBase> restoreFromKeys(WalletCredentials credentials, {bool? isTestnet}) async {
     checkIfExists(credentials.name);
-    final password = generateWalletPassword();
-    credentials.password = password;
-    await keyService.saveWalletPassword(password: password, walletName: credentials.name);
+
+    if (credentials.password == null) {
+      credentials.password = generateWalletPassword();
+      await keyService.saveWalletPassword(
+        password: credentials.password!, walletName: credentials.name);
+    }
+
     final wallet = await _service!.restoreFromKeys(credentials, isTestnet: isTestnet);
 
     if (wallet.type == WalletType.monero) {
@@ -109,9 +115,13 @@ class WalletCreationService {
 
   Future<WalletBase> restoreFromSeed(WalletCredentials credentials, {bool? isTestnet}) async {
     checkIfExists(credentials.name);
-    final password = generateWalletPassword();
-    credentials.password = password;
-    await keyService.saveWalletPassword(password: password, walletName: credentials.name);
+
+    if (credentials.password == null) {
+      credentials.password = generateWalletPassword();
+      await keyService.saveWalletPassword(
+        password: credentials.password!, walletName: credentials.name);
+    }
+
     final wallet = await _service!.restoreFromSeed(credentials, isTestnet: isTestnet);
 
     if (wallet.type == WalletType.monero) {

lib/core/wallet_loading_service.dart

@@ -20,17 +20,18 @@ class WalletLoadingService {
   final KeyService keyService;
   final WalletService Function(WalletType type) walletServiceFactory;
 
-  Future<void> renameWallet(WalletType type, String name, String newName) async {
+  Future<void> renameWallet(WalletType type, String name, String newName,
+      {String? password}) async {
     final walletService = walletServiceFactory.call(type);
-    final password = await keyService.getWalletPassword(walletName: name);
+    final walletPassword = password ?? (await keyService.getWalletPassword(walletName: name));
 
     // Save the current wallet's password to the new wallet name's key
-    await keyService.saveWalletPassword(walletName: newName, password: password);
+    await keyService.saveWalletPassword(walletName: newName, password: walletPassword);
     // Delete previous wallet name from keyService to keep only new wallet's name
     // otherwise keeps duplicate (old and new names)
     await keyService.deleteWalletPassword(walletName: name);
 
-    await walletService.rename(name, password, newName);
+    await walletService.rename(name, walletPassword, newName);
 
     // set shared preferences flag based on previous wallet name
     if (type == WalletType.monero) {
@@ -41,11 +42,11 @@ class WalletLoadingService {
     }
   }
 
-  Future<WalletBase> load(WalletType type, String name) async {
+  Future<WalletBase> load(WalletType type, String name, {String? password}) async {
     try {
       final walletService = walletServiceFactory.call(type);
-      final password = await keyService.getWalletPassword(walletName: name);
-      final wallet = await walletService.openWallet(name, password);
+      final walletPassword = password ?? (await keyService.getWalletPassword(walletName: name));
+      final wallet = await walletService.openWallet(name, walletPassword);
 
       if (type == WalletType.monero) {
         await updateMoneroWalletPassword(wallet);
@@ -67,8 +68,8 @@ class WalletLoadingService {
       for (var walletInfo in walletInfoSource.values) {
         try {
           final walletService = walletServiceFactory.call(walletInfo.type);
-          final password = await keyService.getWalletPassword(walletName: walletInfo.name);
-          final wallet = await walletService.openWallet(walletInfo.name, password);
+          final walletPassword = password ?? (await keyService.getWalletPassword(walletName: name));
+          final wallet = await walletService.openWallet(walletInfo.name, walletPassword);
 
           if (walletInfo.type == WalletType.monero) {
             await updateMoneroWalletPassword(wallet);

lib/di.dart

@@ -30,6 +30,7 @@ import 'package:cake_wallet/entities/contact.dart';
 import 'package:cake_wallet/entities/contact_record.dart';
 import 'package:cake_wallet/entities/exchange_api_mode.dart';
 import 'package:cake_wallet/entities/parse_address_from_domain.dart';
+import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cake_wallet/entities/qr_view_data.dart';
 import 'package:cake_wallet/entities/template.dart';
 import 'package:cake_wallet/entities/transaction_description.dart';
@@ -113,6 +114,8 @@ import 'package:cake_wallet/src/screens/support_chat/support_chat_page.dart';
 import 'package:cake_wallet/src/screens/support_other_links/support_other_links_page.dart';
 import 'package:cake_wallet/src/screens/wallet/wallet_edit_page.dart';
 import 'package:cake_wallet/src/screens/wallet_connect/wc_connections_listing_view.dart';
+import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.dart';
+import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_page.dart';
 import 'package:cake_wallet/themes/theme_list.dart';
 import 'package:cake_wallet/utils/device_info.dart';
 import 'package:cake_wallet/store/anonpay/anonpay_transactions_store.dart';
@@ -217,6 +220,8 @@ import 'package:cake_wallet/view_model/wallet_list/wallet_list_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_new_vm.dart';
 import 'package:cake_wallet/view_model/wallet_restore_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_seed_view_model.dart';
+import 'package:cake_wallet/view_model/wallet_unlock_loadable_view_model.dart';
+import 'package:cake_wallet/view_model/wallet_unlock_verifiable_view_model.dart';
 import 'package:cake_wallet/wownero/wownero.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/receive_page_option.dart';
@@ -337,7 +342,6 @@ Future<void> setup({
       WalletCreationService(
           initialType: type,
           keyService: getIt.get<KeyService>(),
-          secureStorage: getIt.get<SecureStorage>(),
           sharedPreferences: getIt.get<SharedPreferences>(),
           settingsStore: getIt.get<SettingsStore>(),
           walletInfoSource: _walletInfoSource));
@@ -357,6 +361,65 @@ Future<void> setup({
       getIt.get<AdvancedPrivacySettingsViewModel>(param1: type),
       type: type));
 
+  getIt.registerFactoryParam<WalletUnlockPage, WalletUnlockArguments, bool>((args, closable) {
+    return WalletUnlockPage(
+      getIt.get<WalletUnlockLoadableViewModel>(param1: args),
+      args.callback,
+      args.authPasswordHandler,
+      closable: closable);
+  }, instanceName: 'wallet_unlock_loadable');
+
+  getIt.registerFactory<WalletUnlockPage>(
+    () => getIt.get<WalletUnlockPage>(
+      param1: WalletUnlockArguments(
+        callback: (bool successful, _) {
+          if (successful) {
+            final authStore = getIt.get<AuthenticationStore>();
+            authStore.allowed();
+          }}),
+      param2: false,
+      instanceName: 'wallet_unlock_loadable'),
+    instanceName: 'wallet_password_login');
+
+  getIt.registerFactoryParam<WalletUnlockPage, WalletUnlockArguments, bool>((args, closable) {
+    return WalletUnlockPage(
+      getIt.get<WalletUnlockVerifiableViewModel>(param1: args),
+      args.callback,
+      args.authPasswordHandler,
+      closable: closable);
+  }, instanceName: 'wallet_unlock_verifiable');
+
+  getIt.registerFactoryParam<WalletUnlockLoadableViewModel, WalletUnlockArguments, void>((args, _) {
+    final currentWalletName = getIt
+      .get<SharedPreferences>()
+      .getString(PreferencesKey.currentWalletName) ?? '';
+    final currentWalletTypeRaw =
+      getIt.get<SharedPreferences>()
+        .getInt(PreferencesKey.currentWalletType) ?? 0;
+    final currentWalletType = deserializeFromInt(currentWalletTypeRaw);
+
+    return WalletUnlockLoadableViewModel(
+      getIt.get<AppStore>(),
+      getIt.get<WalletLoadingService>(),
+      walletName: args.walletName ?? currentWalletName,
+      walletType: args.walletType ?? currentWalletType);
+  });
+
+  getIt.registerFactoryParam<WalletUnlockVerifiableViewModel, WalletUnlockArguments, void>((args, _) {
+    final currentWalletName = getIt
+      .get<SharedPreferences>()
+      .getString(PreferencesKey.currentWalletName) ?? '';
+    final currentWalletTypeRaw =
+      getIt.get<SharedPreferences>()
+        .getInt(PreferencesKey.currentWalletType) ?? 0;
+    final currentWalletType = deserializeFromInt(currentWalletTypeRaw);
+
+    return WalletUnlockVerifiableViewModel(
+      getIt.get<AppStore>(),
+      walletName: args.walletName ?? currentWalletName,
+      walletType: args.walletType ?? currentWalletType);
+  });
+
   getIt.registerFactoryParam<WalletRestorationFromQRVM, WalletType, void>((WalletType type, _) {
     return WalletRestorationFromQRVM(getIt.get<AppStore>(),
         getIt.get<WalletCreationService>(param1: type), _walletInfoSource, type);
@@ -907,23 +970,28 @@ Future<void> setup({
           _walletInfoSource,
           _unspentCoinsInfoSource,
           getIt.get<SettingsStore>().silentPaymentsAlwaysScan,
+          SettingsStoreBase.walletPasswordDirectInput,
         );
       case WalletType.litecoin:
-        return bitcoin!.createLitecoinWalletService(_walletInfoSource, _unspentCoinsInfoSource);
+        return bitcoin!.createLitecoinWalletService(_walletInfoSource, _unspentCoinsInfoSource,
+            SettingsStoreBase.walletPasswordDirectInput);
       case WalletType.ethereum:
-        return ethereum!.createEthereumWalletService(_walletInfoSource);
+        return ethereum!.createEthereumWalletService(
+            _walletInfoSource, SettingsStoreBase.walletPasswordDirectInput);
       case WalletType.bitcoinCash:
-        return bitcoinCash!
-            .createBitcoinCashWalletService(_walletInfoSource, _unspentCoinsInfoSource);
+        return bitcoinCash!.createBitcoinCashWalletService(_walletInfoSource,
+            _unspentCoinsInfoSource, SettingsStoreBase.walletPasswordDirectInput);
       case WalletType.nano:
       case WalletType.banano:
-        return nano!.createNanoWalletService(_walletInfoSource);
+        return nano!.createNanoWalletService(_walletInfoSource, SettingsStoreBase.walletPasswordDirectInput);
       case WalletType.polygon:
-        return polygon!.createPolygonWalletService(_walletInfoSource);
+        return polygon!.createPolygonWalletService(
+            _walletInfoSource, SettingsStoreBase.walletPasswordDirectInput);
       case WalletType.solana:
-        return solana!.createSolanaWalletService(_walletInfoSource);
+        return solana!.createSolanaWalletService(
+            _walletInfoSource, SettingsStoreBase.walletPasswordDirectInput);
       case WalletType.tron:
-        return tron!.createTronWalletService(_walletInfoSource);
+        return tron!.createTronWalletService(_walletInfoSource, SettingsStoreBase.walletPasswordDirectInput);
       case WalletType.wownero:
         return wownero!.createWowneroWalletService(_walletInfoSource, _unspentCoinsInfoSource);
       case WalletType.none:

lib/entities/load_current_wallet.dart

@@ -6,7 +6,7 @@ import 'package:cake_wallet/entities/preferences_key.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:cake_wallet/core/wallet_loading_service.dart';
 
-Future<void> loadCurrentWallet() async {
+Future<void> loadCurrentWallet({String? password}) async {
   final appStore = getIt.get<AppStore>();
   final name = getIt
       .get<SharedPreferences>()
@@ -21,7 +21,10 @@ Future<void> loadCurrentWallet() async {
 
   final type = deserializeFromInt(typeRaw);
   final walletLoadingService = getIt.get<WalletLoadingService>();
-  final wallet = await walletLoadingService.load(type, name);
+  final wallet = await walletLoadingService.load(
+    type,
+    name,
+    password: password);
   await appStore.changeCurrentWallet(wallet);
 
   getIt.get<BackgroundTasks>().registerSyncTask();

lib/ethereum/cw_ethereum.dart

@@ -4,15 +4,16 @@ class CWEthereum extends Ethereum {
   @override
   List<String> getEthereumWordList(String language) => EVMChainMnemonics.englishWordlist;
 
-  WalletService createEthereumWalletService(Box<WalletInfo> walletInfoSource) =>
-      EthereumWalletService(walletInfoSource, client: EthereumClient());
+  WalletService createEthereumWalletService(Box<WalletInfo> walletInfoSource, bool isDirect) =>
+      EthereumWalletService(walletInfoSource, isDirect, client: EthereumClient());
 
   @override
   WalletCredentials createEthereumNewWalletCredentials({
     required String name,
     WalletInfo? walletInfo,
+    String? password,
   }) =>
-      EVMChainNewWalletCredentials(name: name, walletInfo: walletInfo);
+      EVMChainNewWalletCredentials(name: name, walletInfo: walletInfo, password: password);
 
   @override
   WalletCredentials createEthereumRestoreWalletFromSeedCredentials({

lib/main.dart

@@ -48,6 +48,7 @@ final rootKey = GlobalKey<RootState>();
 final RouteObserver<PageRoute<dynamic>> routeObserver = RouteObserver<PageRoute<dynamic>>();
 
 Future<void> main() async {
+
   bool isAppRunning = false;
   await runZonedGuarded(() async {
     WidgetsFlutterBinding.ensureInitialized();
@@ -170,7 +171,6 @@ Future<void> initializeAppConfigs() async {
   }
 
   final secureStorage = secureStorageShared;
-
   final transactionDescriptionsBoxKey =
       await getEncryptionKey(secureStorage: secureStorage, forKey: TransactionDescription.boxKey);
   final tradesBoxKey = await getEncryptionKey(secureStorage: secureStorage, forKey: Trade.boxKey);
@@ -247,8 +247,8 @@ Future<void> initialSetup(
     ordersSource: ordersSource,
     anonpayInvoiceInfoSource: anonpayInvoiceInfo,
     unspentCoinsInfoSource: unspentCoinsInfoSource,
-    secureStorage: secureStorage,
     navigatorKey: navigatorKey,
+    secureStorage: secureStorage,
   );
   await bootstrap(navigatorKey);
   monero?.onStartup();

lib/nano/cw_nano.dart

@@ -75,8 +75,8 @@ class CWNano extends Nano {
   }
 
   @override
-  WalletService createNanoWalletService(Box<WalletInfo> walletInfoSource) {
-    return NanoWalletService(walletInfoSource);
+  WalletService createNanoWalletService(Box<WalletInfo> walletInfoSource, bool isDirect) {
+    return NanoWalletService(walletInfoSource, isDirect);
   }
 
   @override

lib/polygon/cw_polygon.dart

@@ -4,15 +4,16 @@ class CWPolygon extends Polygon {
   @override
   List<String> getPolygonWordList(String language) => EVMChainMnemonics.englishWordlist;
 
-  WalletService createPolygonWalletService(Box<WalletInfo> walletInfoSource) =>
-      PolygonWalletService(walletInfoSource, client: PolygonClient());
+  WalletService createPolygonWalletService(Box<WalletInfo> walletInfoSource, bool isDirect) =>
+      PolygonWalletService(walletInfoSource, isDirect, client: PolygonClient());
 
   @override
   WalletCredentials createPolygonNewWalletCredentials({
     required String name,
     WalletInfo? walletInfo,
+    String? password
   }) =>
-      EVMChainNewWalletCredentials(name: name, walletInfo: walletInfo);
+      EVMChainNewWalletCredentials(name: name, walletInfo: walletInfo, password: password);
 
   @override
   WalletCredentials createPolygonRestoreWalletFromSeedCredentials({

lib/reactions/on_authentication_state_change.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/utils/exception_handler.dart';
+import 'package:cake_wallet/store/settings_store.dart';
 import 'package:flutter/widgets.dart';
 import 'package:mobx/mobx.dart';
 import 'package:cake_wallet/entities/load_current_wallet.dart';
@@ -23,7 +24,7 @@ void startAuthenticationStateChange(
   _onAuthenticationStateChange ??= autorun((_) async {
     final state = authenticationStore.state;
 
-    if (state == AuthenticationState.installed) {
+    if (state == AuthenticationState.installed && !SettingsStoreBase.walletPasswordDirectInput) {
       try {
         await loadCurrentWallet();
       } catch (error, stack) {

lib/router.dart

@@ -90,7 +90,11 @@ import 'package:cake_wallet/src/screens/wallet/wallet_edit_page.dart';
 import 'package:cake_wallet/src/screens/wallet_connect/wc_connections_listing_view.dart';
 import 'package:cake_wallet/src/screens/wallet_keys/wallet_keys_page.dart';
 import 'package:cake_wallet/src/screens/wallet_list/wallet_list_page.dart';
+import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_page.dart';
 import 'package:cake_wallet/src/screens/welcome/create_welcome_page.dart';
+import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.dart';
+import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/utils/payment_request.dart';
 import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
@@ -125,6 +129,14 @@ Route<dynamic> createRoute(RouteSettings settings) {
       return MaterialPageRoute<void>(builder: (_) => createWelcomePage());
 
     case Routes.newWalletFromWelcome:
+      if (SettingsStoreBase.walletPasswordDirectInput) {
+        if (availableWalletTypes.length == 1) {
+          return createRoute(RouteSettings(name: Routes.newWallet, arguments: availableWalletTypes.first));
+        } else {
+          return createRoute(RouteSettings(name: Routes.newWalletType));
+        }
+      }
+
       return CupertinoPageRoute<void>(
           builder: (_) =>
               getIt.get<SetupPinCodePage>(param1: (PinCodeState<PinCodeWidget> context, dynamic _) {
@@ -176,6 +188,10 @@ Route<dynamic> createRoute(RouteSettings settings) {
               param2: [false, false]));
 
     case Routes.restoreOptions:
+      if (SettingsStoreBase.walletPasswordDirectInput) {
+        return createRoute(RouteSettings(name: Routes.restoreWalletType));
+      }
+
       final isNewInstall = settings.arguments as bool;
       return CupertinoPageRoute<void>(
           fullscreenDialog: true,
@@ -328,8 +344,16 @@ Route<dynamic> createRoute(RouteSettings settings) {
     case Routes.auth:
       return MaterialPageRoute<void>(
           fullscreenDialog: true,
-          builder: (_) => getIt.get<AuthPage>(
-              param1: settings.arguments as OnAuthenticationFinished, param2: true));
+          builder: (_)
+            => SettingsStoreBase.walletPasswordDirectInput
+                ? getIt.get<WalletUnlockPage>(
+                    param1: WalletUnlockArguments(
+                      callback: settings.arguments as OnAuthenticationFinished),
+                      instanceName: 'wallet_unlock_verifiable',
+                    param2: true)
+                : getIt.get<AuthPage>(
+                    param1: settings.arguments as OnAuthenticationFinished,
+                    param2: true));
 
     case Routes.totpAuthCodePage:
       final args = settings.arguments as TotpAuthArgumentsModel;
@@ -340,24 +364,32 @@ Route<dynamic> createRoute(RouteSettings settings) {
         ),
       );
 
-    case Routes.login:
-      return CupertinoPageRoute<void>(
-          builder: (context) => WillPopScope(
-                child: getIt.get<AuthPage>(instanceName: 'login'),
-                onWillPop: () async =>
-                    // FIX-ME: Additional check does it works correctly
-                    (await SystemChannels.platform.invokeMethod<bool>('SystemNavigator.pop') ??
-                        false),
-              ),
-          fullscreenDialog: true);
+    case Routes.walletUnlockLoadable:
+      return MaterialPageRoute<void>(
+          fullscreenDialog: true,
+          builder: (_)
+            => getIt.get<WalletUnlockPage>(
+              param1: settings.arguments as WalletUnlockArguments,
+                instanceName: 'wallet_unlock_loadable',
+              param2: true));
 
     case Routes.unlock:
       return MaterialPageRoute<void>(
           fullscreenDialog: true,
-          builder: (_) => WillPopScope(
-              child: getIt.get<AuthPage>(
-                  param1: settings.arguments as OnAuthenticationFinished, param2: false),
-              onWillPop: () async => false));
+          builder: (_)
+            => SettingsStoreBase.walletPasswordDirectInput
+                ? WillPopScope(
+                    child: getIt.get<WalletUnlockPage>(
+                      param1: WalletUnlockArguments(
+                        callback: settings.arguments as OnAuthenticationFinished),
+                      param2: false,
+                      instanceName: 'wallet_unlock_verifiable'),
+                    onWillPop: () async => false)
+                : WillPopScope(
+                    child: getIt.get<AuthPage>(
+                      param1: settings.arguments as OnAuthenticationFinished,
+                      param2: false),
+                  onWillPop: () async => false));
 
     case Routes.silentPaymentsSettings:
       return CupertinoPageRoute<void>(
@@ -397,6 +429,17 @@ Route<dynamic> createRoute(RouteSettings settings) {
           builder: (_) => getIt.get<NodeCreateOrEditPage>(
               param1: args?['editingNode'] as Node?, param2: args?['isSelected'] as bool?));
 
+    case Routes.login:
+      return CupertinoPageRoute<void>(
+          builder: (context) => WillPopScope(
+              child: SettingsStoreBase.walletPasswordDirectInput
+                ? getIt.get<WalletUnlockPage>(instanceName: 'wallet_password_login')
+                : getIt.get<AuthPage>(instanceName: 'login'),
+              onWillPop: () async =>
+              // FIX-ME: Additional check does it works correctly
+                  (await SystemChannels.platform.invokeMethod<bool>('SystemNavigator.pop') ?? false)),
+          fullscreenDialog: true);
+
     case Routes.newPowNode:
       final args = settings.arguments as Map<String, dynamic>?;
       return CupertinoPageRoute<void>(
@@ -486,7 +529,9 @@ Route<dynamic> createRoute(RouteSettings settings) {
           fullscreenDialog: true, builder: (_) => getIt.get<RestoreFromBackupPage>());
 
     case Routes.support:
-      return CupertinoPageRoute<void>(builder: (_) => getIt.get<SupportPage>());
+      return CupertinoPageRoute<void>(
+          fullscreenDialog: true,
+          builder: (_) => getIt.get<SupportPage>());
 
     case Routes.supportLiveChat:
       return CupertinoPageRoute<void>(builder: (_) => getIt.get<SupportChatPage>());

lib/routes.dart

@@ -82,6 +82,8 @@ class Routes {
   static const otherSettingsPage = '/other_settings_page';
   static const advancedPrivacySettings = '/advanced_privacy_settings';
   static const sweepingWalletPage = '/sweeping_wallet_page';
+  static const walletPasswordUnlock = '/wallet_password_unlock';
+  static const walletUnlockLoadable = '/wallet_unlock_loadable';
   static const anonPayInvoicePage = '/anon_pay_invoice_page';
   static const anonPayReceivePage = '/anon_pay_receive_page';
   static const anonPayDetailsPage = '/anon_pay_details_page';

lib/solana/cw_solana.dart

@@ -4,15 +4,16 @@ class CWSolana extends Solana {
   @override
   List<String> getSolanaWordList(String language) => SolanaMnemonics.englishWordlist;
 
-  WalletService createSolanaWalletService(Box<WalletInfo> walletInfoSource) =>
-      SolanaWalletService(walletInfoSource);
+  WalletService createSolanaWalletService(Box<WalletInfo> walletInfoSource, bool isDirect) =>
+      SolanaWalletService(walletInfoSource, isDirect);
 
   @override
   WalletCredentials createSolanaNewWalletCredentials({
     required String name,
     WalletInfo? walletInfo,
+    String? password,
   }) =>
-      SolanaNewWalletCredentials(name: name, walletInfo: walletInfo);
+      SolanaNewWalletCredentials(name: name, walletInfo: walletInfo, password: password);
 
   @override
   WalletCredentials createSolanaRestoreWalletFromSeedCredentials({

lib/src/screens/auth/auth_page.dart

@@ -12,6 +12,12 @@ import 'package:cake_wallet/core/execution_state.dart';
 
 typedef OnAuthenticationFinished = void Function(bool, AuthPageState);
 
+abstract class AuthPageState<T extends StatefulWidget> extends State<T> {
+  void changeProcessText(String text);
+  void hideProgressText();
+  Future<void> close({String? route, dynamic arguments});
+}
+
 class AuthPage extends StatefulWidget {
   AuthPage(this.authViewModel,
       {required this.onAuthenticationFinished,
@@ -22,10 +28,10 @@ class AuthPage extends StatefulWidget {
   final bool closable;
 
   @override
-  AuthPageState createState() => AuthPageState();
+  AuthPageState createState() => AuthPagePinCodeStateImpl();
 }
 
-class AuthPageState extends State<AuthPage> {
+class AuthPagePinCodeStateImpl extends AuthPageState<AuthPage> {
   final _key = GlobalKey<ScaffoldState>();
   final _pinCodeKey = GlobalKey<PinCodeState>();
   final _backArrowImageDarkTheme =
@@ -55,8 +61,6 @@ class AuthPageState extends State<AuthPage> {
       }
 
       if (state is FailureState) {
-        print('X');
-        print(state.error);
         WidgetsBinding.instance.addPostFrameCallback((_) async {
           _pinCodeKey.currentState?.clear();
           dismissFlushBar(_authBar);
@@ -95,17 +99,20 @@ class AuthPageState extends State<AuthPage> {
     super.dispose();
   }
 
+  @override
   void changeProcessText(String text) {
     dismissFlushBar(_authBar);
     _progressBar = createBar<void>(text, duration: null)
       ..show(_key.currentContext!);
   }
 
+  @override
   void hideProgressText() {
     dismissFlushBar(_progressBar);
     _progressBar = null;
   }
 
+  @override
   Future<void> close({String? route, dynamic arguments}) async {
     if (_key.currentContext == null) {
       throw Exception('Key context is null. Should be not happened');

lib/src/screens/dashboard/desktop_widgets/desktop_action_button.dart

@@ -2,6 +2,9 @@ import 'package:auto_size_text/auto_size_text.dart';
 import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
 import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
 import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
+import 'package:cake_wallet/themes/extensions/balance_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
+import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
 import 'package:flutter/material.dart';
 
 class DesktopActionButton extends StatelessWidget {
@@ -24,45 +27,48 @@ class DesktopActionButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Padding(
-      padding: const EdgeInsets.fromLTRB(8, 0, 8, 8),
-      child: GestureDetector(
-        onTap: onTap,
-        child: Container(
-          padding: EdgeInsets.symmetric(vertical: 25),
-          width: double.infinity,
-          decoration: BoxDecoration(
-            borderRadius: BorderRadius.circular(15.0),
-            color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
-          ),
-          child: Center(
-            child: Row(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                Image.asset(
-                  image,
-                  height: 30,
-                  width: 30,
-                  color: isEnabled
-                      ? Theme.of(context).extension<DashboardPageTheme>()!.textColor
-                      : Theme.of(context).extension<BalancePageTheme>()!.labelTextColor,
-                ),
-                const SizedBox(width: 10),
-                AutoSizeText(
-                  title,
-                  style: TextStyle(
-                    fontSize: 24,
-                    fontFamily: 'Lato',
-                    fontWeight: FontWeight.bold,
+    return MouseRegion(
+      cursor: SystemMouseCursors.click,
+      child: Padding(
+        padding: const EdgeInsets.fromLTRB(8, 0, 8, 8),
+        child: GestureDetector(
+          onTap: onTap,
+          child: Container(
+            padding: EdgeInsets.symmetric(vertical: 25),
+            width: double.infinity,
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(15.0),
+              color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
+            ),
+            child: Center(
+              child: Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Image.asset(
+                    image,
+                    height: 30,
+                    width: 30,
                     color: isEnabled
                         ? Theme.of(context).extension<DashboardPageTheme>()!.textColor
-                        : null,
-                    height: 1,
+                        : Theme.of(context).extension<BalancePageTheme>()!.labelTextColor,
                   ),
-                  maxLines: 1,
-                  textAlign: TextAlign.center,
-                )
-              ],
+                  const SizedBox(width: 10),
+                  AutoSizeText(
+                    title,
+                    style: TextStyle(
+                      fontSize: 24,
+                      fontFamily: 'Lato',
+                      fontWeight: FontWeight.bold,
+                      color: isEnabled
+                          ? Theme.of(context).extension<DashboardPageTheme>()!.textColor
+                          : null,
+                      height: 1,
+                    ),
+                    maxLines: 1,
+                    textAlign: TextAlign.center,
+                  )
+                ],
+              ),
             ),
           ),
         ),

lib/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart

@@ -4,9 +4,12 @@ import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/entities/desktop_dropdown_item.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/src/screens/auth/auth_page.dart';
 import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/dropdown_item_widget.dart';
+import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
 import 'package:cake_wallet/themes/extensions/menu_theme.dart';
+import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
@@ -176,12 +179,25 @@ class _DesktopWalletSelectionDropDownState extends State<DesktopWalletSelectionD
   }
 
   Future<void> _loadWallet(WalletListItem wallet) async {
-    widget._authService.authenticateAction(
-      context,
-      onAuthSuccess: (isAuthenticatedSuccessfully) async {
-        if (!isAuthenticatedSuccessfully) {
-          return;
-        }
+    if (SettingsStoreBase.walletPasswordDirectInput) {
+      Navigator.of(context).pushNamed(
+          Routes.walletUnlockLoadable,
+          arguments: WalletUnlockArguments(
+              callback: (bool isAuthenticatedSuccessfully, AuthPageState auth) async {
+                if (isAuthenticatedSuccessfully) {
+                  auth.close();
+                  setState(() {});
+                }
+              }, walletName: wallet.name,
+              walletType: wallet.type));
+      return;
+    }
+
+    widget._authService.authenticateAction(context,
+        onAuthSuccess: (isAuthenticatedSuccessfully) async {
+      if (!isAuthenticatedSuccessfully) {
+        return;
+      }
 
         try {
           if (context.mounted) {

lib/src/screens/new_wallet/new_wallet_page.dart

@@ -68,14 +68,19 @@ class _WalletNameFormState extends State<WalletNameForm> {
   _WalletNameFormState(this._walletNewVM)
       : _formKey = GlobalKey<FormState>(),
         _languageSelectorKey = GlobalKey<SeedLanguageSelectorState>(),
-        _controller = TextEditingController();
+        _nameController = TextEditingController(),
+        _passwordController = _walletNewVM.hasWalletPassword ? TextEditingController() : null,
+        _repeatedPasswordController =
+            _walletNewVM.hasWalletPassword ? TextEditingController() : null;
 
   static const aspectRatioImage = 1.22;
 
   final GlobalKey<FormState> _formKey;
   final GlobalKey<SeedLanguageSelectorState> _languageSelectorKey;
   final WalletNewVM _walletNewVM;
-  final TextEditingController _controller;
+  final TextEditingController _nameController;
+  final TextEditingController? _passwordController;
+  final TextEditingController? _repeatedPasswordController;
   ReactionDisposer? _stateReaction;
 
   @override
@@ -130,12 +135,11 @@ class _WalletNameFormState extends State<WalletNameForm> {
                     padding: EdgeInsets.only(top: 24),
                     child: Form(
                       key: _formKey,
-                      child: Stack(
-                        alignment: Alignment.centerRight,
+                      child: Column(
                         children: [
                           TextFormField(
                             onChanged: (value) => _walletNewVM.name = value,
-                            controller: _controller,
+                            controller: _nameController,
                             textAlign: TextAlign.center,
                             style: TextStyle(
                                 fontSize: 20.0,
@@ -169,10 +173,10 @@ class _WalletNameFormState extends State<WalletNameForm> {
                                     FocusManager.instance.primaryFocus?.unfocus();
 
                                     setState(() {
-                                      _controller.text = rName;
+                                      _nameController.text = rName;
                                       _walletNewVM.name = rName;
-                                      _controller.selection = TextSelection.fromPosition(
-                                          TextPosition(offset: _controller.text.length));
+                                      _nameController.selection = TextSelection.fromPosition(
+                                          TextPosition(offset: _nameController.text.length));
                                     });
                                   },
                                   icon: Container(
@@ -195,6 +199,80 @@ class _WalletNameFormState extends State<WalletNameForm> {
                             ),
                             validator: WalletNameValidator(),
                           ),
+                          if (_walletNewVM.hasWalletPassword) ...[
+                            TextFormField(
+                              onChanged: (value) => _walletNewVM.walletPassword = value,
+                              controller: _passwordController,
+                              textAlign: TextAlign.center,
+                              obscureText: true,
+                              style: TextStyle(
+                                fontSize: 20.0,
+                                fontWeight: FontWeight.w600,
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                              ),
+                              decoration: InputDecoration(
+                                hintStyle: TextStyle(
+                                  fontSize: 18.0,
+                                  fontWeight: FontWeight.w500,
+                                  color:
+                                      Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
+                                ),
+                                hintText: S.of(context).password,
+                                focusedBorder: UnderlineInputBorder(
+                                  borderSide: BorderSide(
+                                    color: Theme.of(context)
+                                        .extension<NewWalletTheme>()!
+                                        .underlineColor,
+                                    width: 1.0,
+                                  ),
+                                ),
+                                enabledBorder: UnderlineInputBorder(
+                                  borderSide: BorderSide(
+                                    color: Theme.of(context)
+                                        .extension<NewWalletTheme>()!
+                                        .underlineColor,
+                                    width: 1.0,
+                                  ),
+                                ),
+                              ),
+                            ),
+                            TextFormField(
+                              onChanged: (value) => _walletNewVM.repeatedWalletPassword = value,
+                              controller: _repeatedPasswordController,
+                              textAlign: TextAlign.center,
+                              obscureText: true,
+                              style: TextStyle(
+                                fontSize: 20.0,
+                                fontWeight: FontWeight.w600,
+                                color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                              ),
+                              decoration: InputDecoration(
+                                hintStyle: TextStyle(
+                                  fontSize: 18.0,
+                                  fontWeight: FontWeight.w500,
+                                  color:
+                                      Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
+                                ),
+                                hintText: S.of(context).repeat_wallet_password,
+                                focusedBorder: UnderlineInputBorder(
+                                  borderSide: BorderSide(
+                                    color: Theme.of(context)
+                                        .extension<NewWalletTheme>()!
+                                        .underlineColor,
+                                    width: 1.0,
+                                  ),
+                                ),
+                                enabledBorder: UnderlineInputBorder(
+                                  borderSide: BorderSide(
+                                    color: Theme.of(context)
+                                        .extension<NewWalletTheme>()!
+                                        .underlineColor,
+                                    width: 1.0,
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ],
                         ],
                       ),
                     ),

lib/src/screens/restore/wallet_restore_from_keys_form.dart

@@ -16,6 +16,9 @@ class WalletRestoreFromKeysFrom extends StatefulWidget {
     required this.onPrivateKeyChange,
     required this.displayPrivateKeyField,
     required this.onHeightOrDateEntered,
+    required this.displayWalletPassword,
+    required this.onRepeatedPasswordChange,
+    this.onPasswordChange,
     Key? key,
   }) : super(key: key);
 
@@ -23,13 +26,17 @@ class WalletRestoreFromKeysFrom extends StatefulWidget {
   final WalletRestoreViewModel walletRestoreViewModel;
   final void Function(String)? onPrivateKeyChange;
   final bool displayPrivateKeyField;
+  final bool displayWalletPassword;
+  final void Function(String)? onPasswordChange;
+  final void Function(String)? onRepeatedPasswordChange;
 
   @override
-  WalletRestoreFromKeysFromState createState() => WalletRestoreFromKeysFromState();
+  WalletRestoreFromKeysFromState createState() =>
+      WalletRestoreFromKeysFromState(displayWalletPassword: displayWalletPassword);
 }
 
 class WalletRestoreFromKeysFromState extends State<WalletRestoreFromKeysFrom> {
-  WalletRestoreFromKeysFromState()
+  WalletRestoreFromKeysFromState({required bool displayWalletPassword})
       : formKey = GlobalKey<FormState>(),
         blockchainHeightKey = GlobalKey<BlockchainHeightState>(),
         nameController = TextEditingController(),
@@ -37,7 +44,9 @@ class WalletRestoreFromKeysFromState extends State<WalletRestoreFromKeysFrom> {
         viewKeyController = TextEditingController(),
         spendKeyController = TextEditingController(),
         privateKeyController = TextEditingController(),
-        nameTextEditingController = TextEditingController();
+        nameTextEditingController = TextEditingController(),
+        passwordTextEditingController = displayWalletPassword ? TextEditingController() : null,
+        repeatedPasswordTextEditingController = displayWalletPassword ? TextEditingController() : null;
 
   final GlobalKey<FormState> formKey;
   final GlobalKey<BlockchainHeightState> blockchainHeightKey;
@@ -47,9 +56,22 @@ class WalletRestoreFromKeysFromState extends State<WalletRestoreFromKeysFrom> {
   final TextEditingController spendKeyController;
   final TextEditingController nameTextEditingController;
   final TextEditingController privateKeyController;
+  final TextEditingController? passwordTextEditingController;
+  final TextEditingController? repeatedPasswordTextEditingController;
+  void Function()? passwordListener;
+  void Function()? repeatedPasswordListener;
 
   @override
   void initState() {
+    if (passwordTextEditingController != null) {
+      passwordListener = () => widget.onPasswordChange?.call(passwordTextEditingController!.text);
+      passwordTextEditingController?.addListener(passwordListener!);
+    }
+
+    if (repeatedPasswordTextEditingController != null) {
+      repeatedPasswordListener = () => widget.onRepeatedPasswordChange?.call(repeatedPasswordTextEditingController!.text);
+      repeatedPasswordTextEditingController?.addListener(repeatedPasswordListener!);
+    }
     super.initState();
 
     privateKeyController.addListener(() {
@@ -67,6 +89,14 @@ class WalletRestoreFromKeysFromState extends State<WalletRestoreFromKeysFrom> {
     viewKeyController.dispose();
     privateKeyController.dispose();
     spendKeyController.dispose();
+    passwordTextEditingController?.dispose();
+    if (passwordListener != null) {
+      passwordTextEditingController?.removeListener(passwordListener!);
+    }
+
+    if (repeatedPasswordListener != null) {
+      repeatedPasswordTextEditingController?.removeListener(repeatedPasswordListener!);
+    }
     super.dispose();
   }
 
@@ -114,6 +144,19 @@ class WalletRestoreFromKeysFromState extends State<WalletRestoreFromKeysFrom> {
                 ),
               ],
             ),
+            if (widget.displayWalletPassword)
+              ...[Container(
+                  padding: EdgeInsets.only(top: 20.0),
+                  child: BaseTextFormField(
+                    controller: passwordTextEditingController,
+                    hintText: S.of(context).password,
+                    obscureText: true)),
+                Container(
+                  padding: EdgeInsets.only(top: 20.0),
+                  child: BaseTextFormField(
+                    controller: repeatedPasswordTextEditingController,
+                    hintText: S.of(context).repeat_wallet_password,
+                    obscureText: true))],
             Container(height: 20),
             _restoreFromKeysFormFields(),
           ],

lib/src/screens/restore/wallet_restore_from_seed_form.dart

@@ -22,34 +22,43 @@ class WalletRestoreFromSeedForm extends StatefulWidget {
       required this.displayBlockHeightSelector,
       required this.displayPassphrase,
       required this.type,
+      required this.displayWalletPassword,
       required this.seedTypeViewModel,
       this.blockHeightFocusNode,
       this.onHeightOrDateEntered,
       this.onSeedChange,
-      this.onLanguageChange})
+      this.onLanguageChange,
+      this.onPasswordChange,
+      this.onRepeatedPasswordChange})
       : super(key: key);
 
   final WalletType type;
   final bool displayLanguageSelector;
   final bool displayBlockHeightSelector;
+  final bool displayWalletPassword;
   final bool displayPassphrase;
   final SeedTypeViewModel seedTypeViewModel;
   final FocusNode? blockHeightFocusNode;
   final Function(bool)? onHeightOrDateEntered;
   final void Function(String)? onSeedChange;
   final void Function(String)? onLanguageChange;
+  final void Function(String)? onPasswordChange;
+  final void Function(String)? onRepeatedPasswordChange;
 
   @override
-  WalletRestoreFromSeedFormState createState() => WalletRestoreFromSeedFormState('English');
+  WalletRestoreFromSeedFormState createState() =>
+      WalletRestoreFromSeedFormState('English', displayWalletPassword: displayWalletPassword);
 }
 
 class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
-  WalletRestoreFromSeedFormState(this.language)
+  WalletRestoreFromSeedFormState(this.language, {required bool displayWalletPassword})
       : seedWidgetStateKey = GlobalKey<SeedWidgetState>(),
         blockchainHeightKey = GlobalKey<BlockchainHeightState>(),
         formKey = GlobalKey<FormState>(),
         languageController = TextEditingController(),
         nameTextEditingController = TextEditingController(),
+        passwordTextEditingController = displayWalletPassword ? TextEditingController() : null,
+        repeatedPasswordTextEditingController = displayWalletPassword ? TextEditingController() : null,
         passphraseController = TextEditingController(),
         seedTypeController = TextEditingController();
 
@@ -57,16 +66,30 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
   final GlobalKey<BlockchainHeightState> blockchainHeightKey;
   final TextEditingController languageController;
   final TextEditingController nameTextEditingController;
+  final TextEditingController? passwordTextEditingController;
+  final TextEditingController? repeatedPasswordTextEditingController;
   final TextEditingController seedTypeController;
   final TextEditingController passphraseController;
   final GlobalKey<FormState> formKey;
   late ReactionDisposer moneroSeedTypeReaction;
   String language;
+  void Function()? passwordListener;
+  void Function()? repeatedPasswordListener;
 
   @override
   void initState() {
     _setSeedType(widget.seedTypeViewModel.moneroSeedType);
     _setLanguageLabel(language);
+
+    if (passwordTextEditingController != null) {
+      passwordListener = () => widget.onPasswordChange?.call(passwordTextEditingController!.text);
+      passwordTextEditingController?.addListener(passwordListener!);
+    }
+
+    if (repeatedPasswordTextEditingController != null) {
+      repeatedPasswordListener = () => widget.onRepeatedPasswordChange?.call(repeatedPasswordTextEditingController!.text);
+      repeatedPasswordTextEditingController?.addListener(repeatedPasswordListener!);
+    }
     moneroSeedTypeReaction =
         reaction((_) => widget.seedTypeViewModel.moneroSeedType, (SeedType item) {
       _setSeedType(item);
@@ -78,8 +101,16 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
 
   @override
   void dispose() {
-    super.dispose();
     moneroSeedTypeReaction();
+
+    if (passwordListener != null) {
+      passwordTextEditingController?.removeListener(passwordListener!);
+    }
+
+    if (repeatedPasswordListener != null) {
+      repeatedPasswordTextEditingController?.removeListener(repeatedPasswordListener!);
+    }
+    super.dispose();
   }
 
   void onSeedChange(String seed) {
@@ -177,6 +208,16 @@ class WalletRestoreFromSeedFormState extends State<WalletRestoreFromSeedForm> {
                 ),
               ),
             ),
+          if (widget.displayWalletPassword)
+            ...[BaseTextFormField(
+                controller: passwordTextEditingController,
+                hintText: S.of(context).password,
+                obscureText: true),
+              BaseTextFormField(
+                  controller: repeatedPasswordTextEditingController,
+                  hintText: S.of(context).repeat_wallet_password,
+                  obscureText: true)],
+          if (widget.displayLanguageSelector)
           if (!seedTypeController.value.text.contains("14") && widget.displayLanguageSelector)
             GestureDetector(
               onTap: () async {

lib/src/screens/restore/wallet_restore_page.dart

@@ -53,7 +53,10 @@ class WalletRestorePage extends BasePage {
               onLanguageChange: (String language) {
                 final isPolyseed = language.startsWith("POLYSEED_");
                 _validateOnChange(isPolyseed: isPolyseed);
-              }));
+              },
+              displayWalletPassword: walletRestoreViewModel.hasWalletPassword,
+              onPasswordChange: (String password) => walletRestoreViewModel.walletPassword = password,
+              onRepeatedPasswordChange: (String repeatedPassword) => walletRestoreViewModel.repeatedWalletPassword = repeatedPassword));
           break;
         case WalletRestoreMode.keys:
           _pages.add(WalletRestoreFromKeysFrom(
@@ -66,6 +69,9 @@ class WalletRestorePage extends BasePage {
                 }
               },
               displayPrivateKeyField: walletRestoreViewModel.hasRestoreFromPrivateKey,
+              displayWalletPassword: walletRestoreViewModel.hasWalletPassword,
+              onPasswordChange: (String password) => walletRestoreViewModel.walletPassword = password,
+              onRepeatedPasswordChange: (String repeatedPassword) => walletRestoreViewModel.repeatedWalletPassword = repeatedPassword,
               onHeightOrDateEntered: (value) => walletRestoreViewModel.isButtonEnabled = value));
           break;
         default:
@@ -127,6 +133,8 @@ class WalletRestorePage extends BasePage {
 
     reaction((_) => walletRestoreViewModel.mode, (WalletRestoreMode mode) {
       walletRestoreViewModel.isButtonEnabled = false;
+      walletRestoreViewModel.walletPassword = null;
+      walletRestoreViewModel.repeatedWalletPassword = null;
 
       walletRestoreFromSeedFormKey
           .currentState!.blockchainHeightKey.currentState!.restoreHeightController.text = '';

lib/src/screens/root/root.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:io';
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/core/totp_request_details.dart';
 import 'package:cake_wallet/utils/device_info.dart';

lib/src/screens/settings/security_backup_page.dart

@@ -10,6 +10,7 @@ import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arro
 import 'package:cake_wallet/src/screens/settings/widgets/settings_picker_cell.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
 import 'package:cake_wallet/utils/device_info.dart';
+import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/view_model/settings/security_settings_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -41,15 +42,16 @@ class SecurityBackupPage extends BasePage {
                     _securitySettingsViewModel.shouldRequireTOTP2FAForAllSecurityAndBackupSettings,
               ),
             ),
-          SettingsCellWithArrow(
-            title: S.current.create_backup,
-            handler: (_) => _authService.authenticateAction(
-              context,
-              route: Routes.backup,
-              conditionToDetermineIfToUse2FA: _securitySettingsViewModel
-                  .shouldRequireTOTP2FAForAllSecurityAndBackupSettings,
+          if (!SettingsStoreBase.walletPasswordDirectInput)
+            SettingsCellWithArrow(
+              title: S.current.create_backup,
+              handler: (_) => _authService.authenticateAction(
+                context,
+                route: Routes.backup,
+                conditionToDetermineIfToUse2FA: _securitySettingsViewModel
+                    .shouldRequireTOTP2FAForAllSecurityAndBackupSettings,
+              ),
             ),
-          ),
           SettingsCellWithArrow(
             title: S.current.settings_change_pin,
             handler: (_) => _authService.authenticateAction(
@@ -119,6 +121,5 @@ class SecurityBackupPage extends BasePage {
         ],
       ),
     );
-    
   }
 }

lib/src/screens/wallet/wallet_edit_page.dart

@@ -4,6 +4,12 @@ import 'package:cake_wallet/core/wallet_name_validator.dart';
 import 'package:cake_wallet/palette.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
 import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
+import 'package:cake_wallet/routes.dart';
+import 'package:cake_wallet/src/screens/auth/auth_page.dart';
+import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.dart';
+import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
+import 'package:cake_wallet/src/widgets/alert_with_two_actions.dart';
+import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/wallet_list/wallet_edit_view_model.dart';
@@ -94,9 +100,38 @@ class WalletEditPage extends BasePage {
                                 );
                               } else {
                                 try {
-                                  await walletEditViewModel.changeName(editingWallet);
-                                  Navigator.of(context).pop();
-                                  walletEditViewModel.resetState();
+                                  bool confirmed = false;
+
+                                  if (SettingsStoreBase
+                                      .walletPasswordDirectInput) {
+                                    await Navigator.of(context).pushNamed(
+                                        Routes.walletUnlockLoadable,
+                                        arguments: WalletUnlockArguments(
+                                            authPasswordHandler:
+                                                (String password) async {
+                                              await walletEditViewModel
+                                                  .changeName(editingWallet,
+                                                  password: password);
+                                            },
+                                            callback: (bool
+                                            isAuthenticatedSuccessfully,
+                                                AuthPageState auth) async {
+                                              if (isAuthenticatedSuccessfully) {
+                                                auth.close();
+                                                confirmed = true;
+                                              }
+                                            },
+                                            walletName: editingWallet.name,
+                                            walletType: editingWallet.type));
+                                  } else {
+                                    await walletEditViewModel.changeName(editingWallet);
+                                    confirmed = true;
+                                  }
+
+                                  if (confirmed) {
+                                    Navigator.of(context).pop();
+                                    walletEditViewModel.resetState();
+                                  }
                                 } catch (e) {}
                               }
                             }
@@ -120,11 +155,11 @@ class WalletEditPage extends BasePage {
 
   Future<void> _removeWallet(BuildContext context) async {
     authService.authenticateAction(context, onAuthSuccess: (isAuthenticatedSuccessfully) async {
-      if (!isAuthenticatedSuccessfully) {
-        return;
-      }
+        if (!isAuthenticatedSuccessfully) {
+          return;
+        }
 
-      _onSuccessfulAuth(context);
+        _onSuccessfulAuth(context);
       },
       conditionToDetermineIfToUse2FA: false,
     );

lib/src/screens/wallet_list/wallet_list_page.dart

@@ -1,7 +1,10 @@
 import 'package:cake_wallet/entities/wallet_list_order_types.dart';
 import 'package:cake_wallet/src/screens/dashboard/widgets/filter_list_widget.dart';
 import 'package:cake_wallet/src/screens/wallet_list/filtered_list.dart';
+import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.dart';
+import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/src/screens/auth/auth_page.dart';
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/themes/extensions/filter_theme.dart';
 import 'package:cake_wallet/themes/extensions/receive_page_theme.dart';
@@ -336,6 +339,20 @@ class WalletListBodyState extends State<WalletListBody> {
   }
 
   Future<void> _loadWallet(WalletListItem wallet) async {
+    if (SettingsStoreBase.walletPasswordDirectInput) {
+      Navigator.of(context).pushNamed(
+          Routes.walletUnlockLoadable,
+          arguments: WalletUnlockArguments(
+              callback: (bool isAuthenticatedSuccessfully, AuthPageState auth) async {
+                if (isAuthenticatedSuccessfully) {
+                  auth.close();
+                  setState(() {});
+                }
+              }, walletName: wallet.name,
+              walletType: wallet.type));
+      return;
+    }
+
     await widget.authService.authenticateAction(
       context,
       onAuthSuccess: (isAuthenticatedSuccessfully) async {

lib/src/screens/wallet_unlock/wallet_unlock_arguments.dart

@@ -0,0 +1,17 @@
+import 'package:cake_wallet/src/screens/auth/auth_page.dart';
+import 'package:cw_core/wallet_type.dart';
+
+typedef AuthPasswordHandler = Future<void> Function(String);
+
+class WalletUnlockArguments {
+  WalletUnlockArguments(
+      {required this.callback,
+      this.walletName,
+      this.walletType,
+      this.authPasswordHandler});
+
+  final OnAuthenticationFinished callback;
+  final AuthPasswordHandler? authPasswordHandler;
+  final String? walletName;
+  final WalletType? walletType;
+}

lib/src/screens/wallet_unlock/wallet_unlock_page.dart

@@ -0,0 +1,238 @@
+import 'package:another_flushbar/flushbar.dart';
+import 'package:cake_wallet/core/execution_state.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/src/screens/auth/auth_page.dart';
+import 'package:cake_wallet/src/screens/wallet_unlock/wallet_unlock_arguments.dart';
+import 'package:cake_wallet/src/widgets/primary_button.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
+import 'package:cake_wallet/themes/extensions/new_wallet_theme.dart';
+import 'package:cake_wallet/utils/responsive_layout_util.dart';
+import 'package:cake_wallet/utils/show_bar.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:cake_wallet/view_model/wallet_unlock_view_model.dart';
+import 'package:flutter_mobx/flutter_mobx.dart';
+import 'package:mobx/mobx.dart';
+
+class WalletUnlockPage extends StatefulWidget {
+  WalletUnlockPage(
+      this.walletUnlockViewModel, this.onAuthenticationFinished, this.authPasswordHandler,
+      {required this.closable});
+
+  final WalletUnlockViewModel walletUnlockViewModel;
+  final OnAuthenticationFinished onAuthenticationFinished;
+  final AuthPasswordHandler? authPasswordHandler;
+  final bool closable;
+
+  @override
+  State<StatefulWidget> createState() => WalletUnlockPageState();
+}
+
+class WalletUnlockPageState extends AuthPageState<WalletUnlockPage> {
+  WalletUnlockPageState() : _passwordController = TextEditingController();
+
+  final TextEditingController _passwordController;
+  final _key = GlobalKey<ScaffoldState>();
+  final _backArrowImageDarkTheme = Image.asset('assets/images/close_button.png');
+  ReactionDisposer? _reaction;
+  Flushbar<void>? _authBar;
+  Flushbar<void>? _progressBar;
+  void Function()? _passwordControllerListener;
+
+  @override
+  void initState() {
+    _reaction ??= reaction((_) => widget.walletUnlockViewModel.state, (ExecutionState state) {
+      if (state is ExecutedSuccessfullyState) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          widget.onAuthenticationFinished(true, this);
+        });
+        setState(() {});
+      }
+
+      if (state is IsExecutingState) {
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          // null duration to make it indefinite until its disposed
+          _authBar = createBar<void>(S.of(context).authentication, duration: null)..show(context);
+        });
+      }
+
+      if (state is FailureState) {
+        WidgetsBinding.instance.addPostFrameCallback((_) async {
+          dismissFlushBar(_authBar);
+          showBar<void>(context, S.of(context).failed_authentication(state.error));
+
+          widget.onAuthenticationFinished(false, this);
+        });
+      }
+    });
+
+    _passwordControllerListener =
+        () => widget.walletUnlockViewModel.setPassword(_passwordController.text);
+
+    if (_passwordControllerListener != null) {
+      _passwordController.addListener(_passwordControllerListener!);
+    }
+
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _reaction?.reaction.dispose();
+
+    if (_passwordControllerListener != null) {
+      _passwordController.removeListener(_passwordControllerListener!);
+    }
+
+    super.dispose();
+  }
+
+  @override
+  void changeProcessText(String text) {
+    dismissFlushBar(_authBar);
+    _progressBar = createBar<void>(text, duration: null)..show(_key.currentContext!);
+  }
+
+  @override
+  void hideProgressText() {
+    dismissFlushBar(_progressBar);
+    _progressBar = null;
+  }
+
+  void dismissFlushBar(Flushbar<dynamic>? bar) {
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      await bar?.dismiss();
+    });
+  }
+
+  @override
+  Future<void> close({String? route, arguments}) async {
+    if (_key.currentContext == null) {
+      throw Exception('Key context is null. Should be not happened');
+    }
+
+    /// not the best scenario, but WidgetsBinding is not behaving correctly on Android
+    await Future<void>.delayed(Duration(milliseconds: 50));
+    await _authBar?.dismiss();
+    await Future<void>.delayed(Duration(milliseconds: 50));
+    await _progressBar?.dismiss();
+    await Future<void>.delayed(Duration(milliseconds: 50));
+    if (route != null) {
+      Navigator.of(_key.currentContext!).pushReplacementNamed(route, arguments: arguments);
+    } else {
+      Navigator.of(_key.currentContext!).pop();
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      key: _key,
+      appBar: CupertinoNavigationBar(
+          leading: widget.closable
+              ? Container(
+                  padding: EdgeInsets.only(top: 10),
+                  child: SizedBox(
+                    height: 37,
+                    width: 37,
+                    child: InkWell(
+                      onTap: () => Navigator.of(context).pop(),
+                      child: _backArrowImageDarkTheme,
+                    ),
+                  ))
+              : Container(),
+          backgroundColor: Theme.of(context).colorScheme.background,
+          border: null),
+      resizeToAvoidBottomInset: false,
+      body: Center(
+        child: ConstrainedBox(
+          constraints: BoxConstraints(
+            maxWidth: ResponsiveLayoutUtilBase.kDesktopMaxWidthConstraint,
+          ),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Expanded(
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    Text(
+                      widget.walletUnlockViewModel.walletName,
+                      textAlign: TextAlign.center,
+                      style: TextStyle(
+                        fontSize: 24,
+                        fontWeight: FontWeight.w500,
+                        color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                      ),
+                    ),
+                    SizedBox(height: 24),
+                    Form(
+                      child: TextFormField(
+                        onChanged: (value) => null,
+                        controller: _passwordController,
+                        textAlign: TextAlign.center,
+                        obscureText: true,
+                        style: TextStyle(
+                          fontSize: 20.0,
+                          fontWeight: FontWeight.w600,
+                          color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
+                        ),
+                        decoration: InputDecoration(
+                          hintStyle: TextStyle(
+                            fontSize: 18.0,
+                            fontWeight: FontWeight.w500,
+                            color: Theme.of(context).extension<NewWalletTheme>()!.hintTextColor,
+                          ),
+                          hintText: S.of(context).enter_wallet_password,
+                          focusedBorder: UnderlineInputBorder(
+                            borderSide: BorderSide(
+                              color: Theme.of(context).extension<NewWalletTheme>()!.underlineColor,
+                              width: 1.0,
+                            ),
+                          ),
+                          enabledBorder: UnderlineInputBorder(
+                            borderSide: BorderSide(
+                              color: Theme.of(context).extension<NewWalletTheme>()!.underlineColor,
+                              width: 1.0,
+                            ),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              Padding(
+                padding: EdgeInsets.only(bottom: 24),
+                child: Observer(
+                  builder: (_) => LoadingPrimaryButton(
+                      onPressed: () async {
+                        if (widget.authPasswordHandler != null) {
+                          try {
+                            await widget
+                                .authPasswordHandler!(widget.walletUnlockViewModel.password);
+                            widget.walletUnlockViewModel.success();
+                          } catch (e) {
+                            widget.walletUnlockViewModel.failure(e);
+                          }
+                          return;
+                        }
+
+                        widget.walletUnlockViewModel.unlock();
+                      },
+                      text: S.of(context).unlock,
+                      color: Colors.green,
+                      textColor: Colors.white,
+                      isLoading: widget.walletUnlockViewModel.state is IsExecutingState,
+                      isDisabled: widget.walletUnlockViewModel.state is IsExecutingState),
+                ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/src/widgets/address_text_field.dart

@@ -1,5 +1,5 @@
-import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/device_info.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/material.dart';
@@ -19,7 +19,10 @@ class AddressTextField extends StatelessWidget {
       {required this.controller,
       this.isActive = true,
       this.placeholder,
-      this.options = const [AddressTextFieldOption.qrCode, AddressTextFieldOption.addressBook],
+      this.options = const [
+        AddressTextFieldOption.qrCode,
+        AddressTextFieldOption.addressBook
+      ],
       this.onURIScanned,
       this.focusNode,
       this.isBorderExist = true,

lib/store/settings_store.dart

@@ -553,6 +553,7 @@ abstract class SettingsStoreBase with Store {
   static const defaultActionsMode = 11;
   static const defaultPinCodeTimeOutDuration = PinCodeRequiredDuration.tenminutes;
   static const defaultAutoGenerateSubaddressStatus = AutoGenerateSubaddressStatus.initialized;
+  static final walletPasswordDirectInput = Platform.isLinux;
   static const defaultSeedPhraseLength = SeedPhraseLength.twelveWords;
   static const defaultMoneroSeedType = SeedType.defaultSeedType;
 

lib/tron/cw_tron.dart

@@ -4,15 +4,17 @@ class CWTron extends Tron {
   @override
   List<String> getTronWordList(String language) => EVMChainMnemonics.englishWordlist;
 
-  WalletService createTronWalletService(Box<WalletInfo> walletInfoSource) =>
-      TronWalletService(walletInfoSource, client: TronClient());
+  @override
+  WalletService createTronWalletService(Box<WalletInfo> walletInfoSource, bool isDirect) =>
+      TronWalletService(walletInfoSource, client: TronClient(), isDirect: isDirect);
 
   @override
   WalletCredentials createTronNewWalletCredentials({
     required String name,
     WalletInfo? walletInfo,
+    String? password,
   }) =>
-      TronNewWalletCredentials(name: name, walletInfo: walletInfo);
+      TronNewWalletCredentials(name: name, walletInfo: walletInfo, password: password);
 
   @override
   WalletCredentials createTronRestoreWalletFromSeedCredentials({

lib/utils/package_info.dart

@@ -1,5 +1,5 @@
 import 'dart:io';
-import 'package:package_info/package_info.dart' as __package_info__;
+import 'package:package_info_plus/package_info_plus.dart' as __package_info__;
 
 abstract class _EnvKeys {
     static const kWinAppName = 'CW_WIN_APP_NAME';

lib/view_model/wallet_creation_vm.dart

@@ -1,5 +1,7 @@
 import 'package:cake_wallet/bitcoin/bitcoin.dart';
 import 'package:cake_wallet/core/wallet_creation_service.dart';
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/entities/background_tasks.dart';
 import 'package:cake_wallet/view_model/restore/restore_wallet.dart';
@@ -37,6 +39,14 @@ abstract class WalletCreationVMBase with Store {
   @observable
   ExecutionState state;
 
+  @observable
+  String? walletPassword;
+
+  @observable
+  String? repeatedWalletPassword;
+
+  bool get hasWalletPassword => SettingsStoreBase.walletPasswordDirectInput;
+
   WalletType type;
   final bool isRecovery;
   final WalletCreationService walletCreationService;
@@ -59,6 +69,14 @@ abstract class WalletCreationVMBase with Store {
         name = await generateName();
       }
 
+      if (hasWalletPassword && (walletPassword?.isEmpty ?? true)) {
+        throw Exception(S.current.wallet_password_is_empty);
+      }
+
+      if (hasWalletPassword && walletPassword != repeatedWalletPassword) {
+        throw Exception(S.current.repeated_password_is_incorrect);
+      }
+
       walletCreationService.checkIfExists(name);
       final dirPath = await pathForWalletDir(name: name, type: type);
       final path = await pathForWallet(name: name, type: type);

lib/view_model/wallet_list/wallet_edit_view_model.dart

@@ -32,10 +32,11 @@ abstract class WalletEditViewModelBase with Store {
   final WalletLoadingService _walletLoadingService;
 
   @action
-  Future<void> changeName(WalletListItem walletItem) async {
+  Future<void> changeName(WalletListItem walletItem, {String? password}) async {
     state = WalletEditRenamePending();
     await _walletLoadingService.renameWallet(
-        walletItem.type, walletItem.name, newName);
+        walletItem.type, walletItem.name, newName,
+        password: password);
     _walletListViewModel.updateList();
   }
 

lib/view_model/wallet_new_vm.dart

@@ -66,25 +66,25 @@ abstract class WalletNewVMBase extends WalletCreationVM with Store {
     switch (type) {
       case WalletType.monero:
         return monero!.createMoneroNewWalletCredentials(
-            name: name, language: options!.first as String, isPolyseed: options.last as bool);
+            name: name, language: options!.first as String, password: walletPassword, isPolyseed: options.last as bool);
       case WalletType.bitcoin:
-        return bitcoin!.createBitcoinNewWalletCredentials(name: name);
+        return bitcoin!.createBitcoinNewWalletCredentials(name: name, password: walletPassword);
       case WalletType.litecoin:
-        return bitcoin!.createBitcoinNewWalletCredentials(name: name);
+        return bitcoin!.createBitcoinNewWalletCredentials(name: name, password: walletPassword);
       case WalletType.haven:
-        return haven!
-            .createHavenNewWalletCredentials(name: name, language: options!.first as String);
+        return haven!.createHavenNewWalletCredentials(
+            name: name, language: options!.first as String, password: walletPassword);
       case WalletType.ethereum:
-        return ethereum!.createEthereumNewWalletCredentials(name: name);
+        return ethereum!.createEthereumNewWalletCredentials(name: name, password: walletPassword);
       case WalletType.bitcoinCash:
-        return bitcoinCash!.createBitcoinCashNewWalletCredentials(name: name);
+        return bitcoinCash!.createBitcoinCashNewWalletCredentials(name: name, password: walletPassword);
       case WalletType.nano:
       case WalletType.banano:
         return nano!.createNanoNewWalletCredentials(name: name);
       case WalletType.polygon:
-        return polygon!.createPolygonNewWalletCredentials(name: name);
+        return polygon!.createPolygonNewWalletCredentials(name: name, password: walletPassword);
       case WalletType.solana:
-        return solana!.createSolanaNewWalletCredentials(name: name);
+        return solana!.createSolanaNewWalletCredentials(name: name, password: walletPassword);
       case WalletType.tron:
         return tron!.createTronNewWalletCredentials(name: name);
       case WalletType.wownero:

lib/view_model/wallet_restore_view_model.dart

@@ -86,7 +86,7 @@ abstract class WalletRestoreViewModelBase extends WalletCreationVM with Store {
 
   @override
   WalletCredentials getCredentials(dynamic options) {
-    final password = generateWalletPassword();
+    final password = walletPassword ?? generateWalletPassword();
     String? passphrase = options['passphrase'] as String?;
     final height = options['height'] as int? ?? 0;
     name = options['name'] as String;

lib/view_model/wallet_unlock_loadable_view_model.dart

@@ -0,0 +1,63 @@
+import 'package:mobx/mobx.dart';
+import 'package:cake_wallet/core/execution_state.dart';
+import 'package:cake_wallet/core/wallet_loading_service.dart';
+import 'package:cake_wallet/store/app_store.dart';
+import 'package:cw_core/wallet_type.dart';
+import 'package:cake_wallet/view_model/wallet_unlock_view_model.dart';
+
+part 'wallet_unlock_loadable_view_model.g.dart';
+
+class WalletUnlockLoadableViewModel = WalletUnlockLoadableViewModelBase
+    with _$WalletUnlockLoadableViewModel;
+
+abstract class WalletUnlockLoadableViewModelBase extends WalletUnlockViewModel with Store {
+  WalletUnlockLoadableViewModelBase(this._appStore, this._walletLoadingService,
+      {required this.walletName, required this.walletType})
+      : password = '',
+        state = InitialExecutionState();
+
+  final String walletName;
+
+  final WalletType walletType;
+
+  @override
+  @observable
+  String password;
+
+  @override
+  @observable
+  ExecutionState state;
+
+  final WalletLoadingService _walletLoadingService;
+
+  final AppStore _appStore;
+
+  @override
+  @action
+  void setPassword(String password) => this.password = password;
+
+  @override
+  @action
+  Future<void> unlock() async {
+    try {
+      state = InitialExecutionState();
+      final wallet = await _walletLoadingService.load(walletType, walletName, password: password);
+      _appStore.changeCurrentWallet(wallet);
+      success();
+    } catch (e) {
+      failure(e.toString());
+    }
+  }
+
+  @override
+  @action
+  void success() {
+    state = ExecutedSuccessfullyState();
+  }
+
+  @override
+  @action
+  void failure(e) {
+    state = FailureState(e.toString());
+  }
+}

lib/view_model/wallet_unlock_verifiable_view_model.dart

@@ -0,0 +1,60 @@
+import 'package:cake_wallet/generated/i18n.dart';
+import 'package:cake_wallet/store/app_store.dart';
+import 'package:mobx/mobx.dart';
+import 'package:cw_core/wallet_type.dart';
+import 'package:cake_wallet/core/execution_state.dart';
+import 'package:cake_wallet/view_model/wallet_unlock_view_model.dart';
+
+part 'wallet_unlock_verifiable_view_model.g.dart';
+
+class WalletUnlockVerifiableViewModel = WalletUnlockVerifiableViewModelBase
+    with _$WalletUnlockVerifiableViewModel;
+
+abstract class WalletUnlockVerifiableViewModelBase extends WalletUnlockViewModel with Store {
+  WalletUnlockVerifiableViewModelBase(this.appStore,
+      {required this.walletName, required this.walletType})
+      : password = '',
+        state = InitialExecutionState();
+
+  final String walletName;
+
+  final WalletType walletType;
+
+  final AppStore appStore;
+
+  @override
+  @observable
+  String password;
+
+  @override
+  @observable
+  ExecutionState state;
+
+  @override
+  @action
+  void setPassword(String password) => this.password = password;
+
+  @override
+  @action
+  Future<void> unlock() async {
+    try {
+      state = appStore.wallet!.password == password
+          ? ExecutedSuccessfullyState()
+          : FailureState(S.current.invalid_password);
+    } catch (e) {
+      failure('${S.current.invalid_password}\n${e.toString()}');
+    }
+  }
+
+  @override
+  @action
+  void success() {
+    state = ExecutedSuccessfullyState();
+  }
+
+  @override
+  @action
+  void failure(e) {
+    state = FailureState(e.toString());
+  }
+}

lib/view_model/wallet_unlock_view_model.dart

@@ -0,0 +1,11 @@
+import 'package:cake_wallet/core/execution_state.dart';
+
+abstract class WalletUnlockViewModel {
+  String get walletName;
+  String get password;
+  void setPassword(String password);
+  ExecutionState get state;
+  Future<void> unlock();
+  void success();
+  void failure(dynamic e);
+}