Merge branch 'dev' of https://github.com/bsn21m/cake_wallet into dev

cw_bitcoin/lib/bitcoin_wallet_addresses.dart

@@ -74,7 +74,7 @@ abstract class BitcoinWalletAddressesBase extends ElectrumWalletAddresses with S
   Future<void> initPayjoin() async {
     try {
       await payjoinManager.initPayjoin();
-      currentPayjoinReceiver = await payjoinManager.getUnusedReceiver(primaryAddress);
+      currentPayjoinReceiver = await payjoinManager.getUnusedReceiver(payjoinCompatibleAddress);
       payjoinEndpoint = (await currentPayjoinReceiver?.pjUri())?.pjEndpoint();
 
       payjoinManager.resumeSessions();
@@ -88,7 +88,7 @@ abstract class BitcoinWalletAddressesBase extends ElectrumWalletAddresses with S
   @action
   Future<void> newPayjoinReceiver() async {
     try {
-      currentPayjoinReceiver = await payjoinManager.getUnusedReceiver(primaryAddress);
+      currentPayjoinReceiver = await payjoinManager.getUnusedReceiver(payjoinCompatibleAddress);
       payjoinEndpoint = (await currentPayjoinReceiver?.pjUri())?.pjEndpoint();
 
       payjoinManager.spawnReceiver(receiver: currentPayjoinReceiver!);

cw_bitcoin/lib/electrum_wallet_addresses.dart

@@ -290,6 +290,16 @@ abstract class ElectrumWalletAddressesBase extends WalletAddresses with Store {
     return getAddress(index: 0, hd: mainHd, addressType: addressPageType);
   }
 
+  String get payjoinCompatibleAddress {
+    final addrType = (addressPageType == SilentPaymentsAddresType.p2sp ||
+            addressPageType == LightningAddressType.p2l)
+        ? SegwitAddresType.p2wpkh
+        : addressPageType;
+
+    final mainHd = mainHdByType[addrType] ?? mainHdByType.values.first;
+    return getAddress(index: 0, hd: mainHd, addressType: addrType);
+  }
+
   Map<String, int> currentReceiveAddressIndexByType;
 
   int get currentReceiveAddressIndex =>

cw_evm/lib/clients/evm_chain_client.dart

@@ -535,6 +535,9 @@ class EVMChainClient {
     } on RangeError catch (_) {
       throw Exception('Invalid token contract for this network.');
     } catch (e) {
+      if (e.toString().contains("hostUnreachable")) {
+        return EVMChainERC20Balance(BigInt.zero);
+      }
       throw Exception('Could not fetch balances: ${e.toString()}');
     }
   }

cw_monero/lib/api/subaddress_list.dart

@@ -65,25 +65,33 @@ int lastWptr = 0;
 int lastTxCount = 0;
 List<TinyTransactionDetails> ttDetails = [];
 
-List<Subaddress> getAllSubaddresses() {
-  txhistory = currentWallet!.history();
-  final txCount = txhistory!.count();
-  if (lastTxCount != txCount && lastWptr != currentWallet!.ffiAddress()) {
-    final List<TinyTransactionDetails> newttDetails = [];
-    lastTxCount = txCount;
-    lastWptr = currentWallet!.ffiAddress();
-    for (var i = 0; i < txCount; i++) {
-      final tx = txhistory!.transaction(i);
-      if (tx.direction() == TransactionInfo_Direction.Out.index) continue;
-      final subaddrs = tx.subaddrIndex().split(",");
-      final account = tx.subaddrAccount();
-      newttDetails.add(TinyTransactionDetails(
-        address: List.generate(subaddrs.length, (index) => getAddress(accountIndex: account, addressIndex: int.tryParse(subaddrs[index])??0)),
-        amount: tx.amount(),
-      ));
+Future<List<Subaddress>> getAllSubaddresses() async {
+  try {
+    await txHistoryMutex.acquire();
+    txhistory = currentWallet!.history();
+    final txCount = txhistory!.count();
+    if (lastTxCount != txCount && lastWptr != currentWallet!.ffiAddress()) {
+      final List<TinyTransactionDetails> newttDetails = [];
+      lastTxCount = txCount;
+      lastWptr = currentWallet!.ffiAddress();
+      for (var i = 0; i < txCount; i++) {
+        final tx = txhistory!.transaction(i);
+        if (tx.direction() == TransactionInfo_Direction.Out.index) continue;
+        final subaddrs = tx.subaddrIndex().split(",");
+        final account = tx.subaddrAccount();
+        newttDetails.add(TinyTransactionDetails(
+          address: List.generate(
+              subaddrs.length,
+              (index) => getAddress(
+                  accountIndex: account, addressIndex: int.tryParse(subaddrs[index]) ?? 0)),
+          amount: tx.amount(),
+        ));
+      }
+      ttDetails.clear();
+      ttDetails.addAll(newttDetails);
     }
-    ttDetails.clear();
-    ttDetails.addAll(newttDetails);
+  } finally {
+    txHistoryMutex.release();
   }
   final size = currentWallet!.numSubaddresses(accountIndex: subaddress!.accountIndex);
   final list = List.generate(size, (index) {

cw_monero/lib/monero_subaddress_list.dart

@@ -2,7 +2,7 @@ import 'package:cw_core/subaddress.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_monero/api/coins_info.dart';
 import 'package:cw_monero/api/subaddress_list.dart' as subaddress_list;
-import 'package:cw_monero/api/wallet.dart';
+
 import 'package:flutter/services.dart';
 import 'package:mobx/mobx.dart';
 
@@ -24,7 +24,7 @@ abstract class MoneroSubaddressListBase with Store {
   bool _isRefreshing;
   bool _isUpdating;
 
-  void update({required int accountIndex}) {
+  Future<void> update({required int accountIndex}) async {
     refreshCoins(accountIndex);
 
     if (_isUpdating) {
@@ -35,7 +35,7 @@ abstract class MoneroSubaddressListBase with Store {
       _isUpdating = true;
       refresh(accountIndex: accountIndex);
       subaddresses.clear();
-      subaddresses.addAll(getAll());
+      subaddresses.addAll(await getAll());
       _isUpdating = false;
     } catch (e) {
       _isUpdating = false;
@@ -43,8 +43,8 @@ abstract class MoneroSubaddressListBase with Store {
     }
   }
 
-  List<Subaddress> getAll() {
-    var subaddresses = subaddress_list.getAllSubaddresses();
+  Future<List<Subaddress>> getAll() async {
+    var subaddresses = await  subaddress_list.getAllSubaddresses();
 
     if (subaddresses.length > 2) {
       final primary = subaddresses.first;
@@ -67,14 +67,14 @@ abstract class MoneroSubaddressListBase with Store {
 
   Future<void> addSubaddress({required int accountIndex, required String label}) async {
     await subaddress_list.addSubaddress(accountIndex: accountIndex, label: label);
-    update(accountIndex: accountIndex);
+    await update(accountIndex: accountIndex);
   }
 
   Future<void> setLabelSubaddress(
       {required int accountIndex, required int addressIndex, required String label}) async {
     await subaddress_list.setLabelForSubaddress(
         accountIndex: accountIndex, addressIndex: addressIndex, label: label);
-    update(accountIndex: accountIndex);
+    await update(accountIndex: accountIndex);
   }
 
   void refresh({required int accountIndex}) {
@@ -122,7 +122,7 @@ abstract class MoneroSubaddressListBase with Store {
 
   Future<List<Subaddress>> _getAllUnusedAddresses(
       {required int accountIndex, required String label}) async {
-    final allAddresses = subaddress_list.getAllSubaddresses();
+    final allAddresses = await subaddress_list.getAllSubaddresses();
     // first because addresses come in reversed order.
     if (allAddresses.isEmpty || _usedAddresses.contains(allAddresses.first.address)) {
       final isAddressUnused = await _newSubaddress(accountIndex: accountIndex, label: label);
@@ -151,12 +151,9 @@ abstract class MoneroSubaddressListBase with Store {
   Future<bool> _newSubaddress({required int accountIndex, required String label}) async {
     await subaddress_list.addSubaddress(accountIndex: accountIndex, label: label);
 
-    return subaddress_list
-        .getAllSubaddresses()
-        .where((s) {
-          final address = s.address;
-          return !_usedAddresses.contains(address);
-        })
-        .isNotEmpty;
+    return (await subaddress_list.getAllSubaddresses()).where((s) {
+      final address = s.address;
+      return !_usedAddresses.contains(address);
+    }).isNotEmpty;
   }
 }

cw_monero/lib/monero_wallet.dart

@@ -3,7 +3,6 @@ import 'dart:ffi';
 import 'dart:io';
 import 'dart:isolate';
 
-import 'package:cw_core/format_fixed.dart';
 import 'package:cw_core/monero_amount_format.dart';
 import 'package:cw_core/pathForWallet.dart';
 import 'package:cw_core/transaction_priority.dart';
@@ -180,7 +179,7 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
     _autoSaveTimer = Timer.periodic(
         Duration(seconds: _autoSaveInterval), (_) async => await save());
     // update transaction details after restore
-    walletAddresses.subaddressList.update(accountIndex: walletAddresses.account?.id??0);
+    await walletAddresses.subaddressList.update(accountIndex: walletAddresses.account?.id??0);
   }
 
   @override
@@ -504,7 +503,7 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
     await walletAddresses.updateUsedSubaddress();
 
     if (isEnabledAutoGenerateSubaddress) {
-      walletAddresses.updateUnusedSubaddress(
+      await walletAddresses.updateUnusedSubaddress(
           accountIndex: walletAddresses.account?.id ?? 0,
           defaultLabel: walletAddresses.account?.label ?? '');
     }
@@ -951,14 +950,14 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
     }
   }
 
-  void _updateSubAddress(bool enableAutoGenerate, {Account? account}) {
+  Future<void> _updateSubAddress(bool enableAutoGenerate, {Account? account}) async {
     if (enableAutoGenerate) {
-      walletAddresses.updateUnusedSubaddress(
+      await walletAddresses.updateUnusedSubaddress(
         accountIndex: account?.id ?? 0,
         defaultLabel: account?.label ?? '',
       );
     } else {
-      walletAddresses.updateSubaddressList(accountIndex: account?.id ?? 0);
+      await walletAddresses.updateSubaddressList(accountIndex: account?.id ?? 0);
     }
   }
 

cw_monero/lib/monero_wallet_addresses.dart

@@ -72,7 +72,7 @@ abstract class MoneroWalletAddressesBase extends WalletAddresses with Store {
   Future<void> init() async {
     accountList.update();
     account = accountList.accounts.isEmpty ? Account(id: 0, label: "Primary address") : accountList.accounts.first;
-    updateSubaddressList(accountIndex: account?.id ?? 0);
+    await updateSubaddressList(accountIndex: account?.id ?? 0);
     await updateAddressesInBox();
   }
 
@@ -84,8 +84,8 @@ abstract class MoneroWalletAddressesBase extends WalletAddresses with Store {
       addressesMap.clear();
       addressInfos.clear();
 
-      accountList.accounts.forEach((account) {
-        _subaddressList.update(accountIndex: account.id);
+      accountList.accounts.forEach((account) async {
+        await _subaddressList.update(accountIndex: account.id);
         _subaddressList.subaddresses.forEach((subaddress) {
           addressesMap[subaddress.address] = subaddress.label;
           addressInfos[account.id] ??= [];
@@ -122,8 +122,8 @@ abstract class MoneroWalletAddressesBase extends WalletAddresses with Store {
     return true;
   }
 
-  void updateSubaddressList({required int accountIndex}) {
-    subaddressList.update(accountIndex: accountIndex);
+  Future<void> updateSubaddressList({required int accountIndex}) async {
+    await subaddressList.update(accountIndex: accountIndex);
     address = subaddressList.subaddresses.isNotEmpty
         ? subaddressList.subaddresses.first.address
         : getAddress();

lib/exchange/provider/swaptrade_exchange_provider.dart

@@ -94,6 +94,9 @@ class SwapTradeExchangeProvider extends ExchangeProvider {
   }) async {
     try {
       if (amount == 0) return 0.0;
+      if (isFixedRateMode && !supportsFixedRate) {
+        return 0.0;
+      }
       if(from == CryptoCurrency.btcln || to == CryptoCurrency.btcln) return 0;
 
       final params = <String, dynamic>{};

lib/monero/cw_monero.dart

@@ -77,9 +77,9 @@ class CWMoneroSubaddressList extends MoneroSubaddressList {
   }
 
   @override
-  void update(Object wallet, {required int accountIndex}) {
+  Future<void> update(Object wallet, {required int accountIndex}) async {
     final moneroWallet = wallet as MoneroWallet;
-    moneroWallet.walletAddresses.subaddressList.update(accountIndex: accountIndex);
+    await moneroWallet.walletAddresses.subaddressList.update(accountIndex: accountIndex);
   }
 
   @override
@@ -89,10 +89,10 @@ class CWMoneroSubaddressList extends MoneroSubaddressList {
   }
 
   @override
-  List<Subaddress> getAll(Object wallet) {
+  Future<List<Subaddress>> getAll(Object wallet) async {
     final moneroWallet = wallet as MoneroWallet;
-    return moneroWallet.walletAddresses.subaddressList
-        .getAll()
+    return (await moneroWallet.walletAddresses.subaddressList
+        .getAll())
         .map((sub) => Subaddress(
           id: sub.id,
           label: sub.label,

lib/new-ui/pages/addresses_page.dart

@@ -14,7 +14,6 @@ import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
 import 'package:cake_wallet/utils/address_formatter.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
-import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_edit_or_create_view_model.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_item.dart';
 import 'package:cake_wallet/view_model/wallet_address_list/wallet_address_list_view_model.dart';
 import 'package:cake_wallet/wownero/wownero.dart';
@@ -22,7 +21,6 @@ import 'package:cw_core/card_design.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
-import 'package:flutter_svg/svg.dart';
 
 import 'package:cake_wallet/utils/list_item.dart';
 import 'package:mobx/mobx.dart';
@@ -146,7 +144,8 @@ class _NewAddressesPageState extends State<NewAddressesPage> {
                           if (item is WalletAddressListItem) {
                             return Observer(
                               builder: (_) => AddressRow(
-                                selected: item.address == widget.addressListViewModel.address.address,
+                                selected:
+                                    item.address == widget.addressListViewModel.address.address,
                                 first: widget.showHidden && index == 0,
                                 last: index == filteredItems.length - 1,
                                 item: item,
@@ -159,6 +158,8 @@ class _NewAddressesPageState extends State<NewAddressesPage> {
                                   updateItems();
                                 },
                                 walletType: widget.addressListViewModel.type,
+                                hasBalance: widget.addressListViewModel.isBalanceAvailable,
+                                hasReceived: widget.addressListViewModel.isReceivedAvailable,
                               ),
                             );
                           }
@@ -304,16 +305,19 @@ class AccountPreviewHeader extends StatelessWidget {
 }
 
 class AddressRow extends StatelessWidget {
-  const AddressRow(
-      {super.key,
-      required this.selected,
-      required this.first,
-      required this.last,
-      required this.item,
-      required this.onSelect,
-      required this.walletType,
-      required this.onLabelChanged,
-      required this.onAddressHidden});
+  const AddressRow({
+    super.key,
+    required this.selected,
+    required this.first,
+    required this.last,
+    required this.item,
+    required this.onSelect,
+    required this.walletType,
+    required this.onLabelChanged,
+    required this.onAddressHidden,
+    required this.hasBalance,
+    required this.hasReceived,
+  });
 
   final bool selected;
   final bool first;
@@ -323,6 +327,8 @@ class AddressRow extends StatelessWidget {
   final VoidCallback onLabelChanged;
   final VoidCallback onAddressHidden;
   final WalletType walletType;
+  final bool hasBalance;
+  final bool hasReceived;
 
   @override
   Widget build(BuildContext context) {
@@ -425,7 +431,7 @@ class AddressRow extends StatelessWidget {
                                   fontSize: 12,
                                   color: Theme.of(context).colorScheme.onSurfaceVariant),
                             ),
-                            Text("${S.of(context).balance}: ${item.balance}",
+                            Text("${hasReceived ? S.of(context).received : S.of(context).balance}: ${item.balance}",
                                 style: TextStyle(
                                     fontSize: 12,
                                     color: Theme.of(context).colorScheme.onSurfaceVariant)),
@@ -434,8 +440,7 @@ class AddressRow extends StatelessWidget {
                       ],
                     ),
                   ),
-                  if (selected) CakeImageWidget(
-                      imageUrl: "assets/new-ui/checkmark.svg")
+                  if (selected) CakeImageWidget(imageUrl: "assets/new-ui/checkmark.svg")
                 ],
               ),
             ),
@@ -474,8 +479,7 @@ class ShowHiddenButton extends StatelessWidget {
                       Text(S.of(context).show_hidden_addresses),
                       RotatedBox(
                           quarterTurns: 1,
-                          child:CakeImageWidget(
-                              imageUrl: "assets/new-ui/dropdown_arrow.svg"))
+                          child: CakeImageWidget(imageUrl: "assets/new-ui/dropdown_arrow.svg"))
                     ],
                   ),
                 ),

lib/new-ui/pages/bridge/bridge_amount_page.dart

@@ -4,7 +4,6 @@ import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/widgets/bottom_sheet/base_bottom_sheet_widget.dart';
 import 'package:cake_wallet/src/widgets/bottom_sheet/info_bottom_sheet_widget.dart';
 import 'package:cake_wallet/utils/request_review_handler.dart';
-import 'package:cake_wallet/new-ui/widgets/keyboard_hide_overlay.dart';
 import 'package:cake_wallet/new-ui/widgets/modern_button.dart';
 import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart';
 import 'package:cake_wallet/view_model/bridge_history_view_model.dart';
@@ -33,7 +32,10 @@ class BridgeAmountPage extends StatefulWidget {
 }
 
 class _BridgeAmountPageState extends State<BridgeAmountPage> {
-  late final TextEditingController _amountController;
+  final TextEditingController _amountController = TextEditingController();
+  final FocusNode _amountFocusNode = FocusNode();
+  bool _amountFocused = false;
+
   BridgeViewModel get bridgeViewModel => widget.bridgeViewModel;
 
   @override
@@ -42,10 +44,11 @@ class _BridgeAmountPageState extends State<BridgeAmountPage> {
     bridgeViewModel.applyInitialBridgeToken(widget.initialToken);
     bridgeViewModel.onBridgeSuccess = _showBridgeSuccessBottomSheet;
 
-    _amountController = TextEditingController();
+    _amountFocusNode.addListener(() => setState(() => _amountFocused = _amountFocusNode.hasFocus));
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
       bridgeViewModel.ensureFiatPriceForSelectedToken();
+      _amountFocusNode.requestFocus();
     });
   }
 
@@ -100,22 +103,23 @@ class _BridgeAmountPageState extends State<BridgeAmountPage> {
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
 
-    return KeyboardHideOverlay(
-      unfocusOnTap: true,
-      child: Container(
-        decoration: BoxDecoration(
-          color: theme.colorScheme.surface,
-          borderRadius: const BorderRadius.vertical(top: Radius.circular(24)),
-        ),
+    return Container(
+      decoration: BoxDecoration(
+        color: theme.colorScheme.surface,
+        borderRadius: const BorderRadius.vertical(top: Radius.circular(24)),
+      ),
+      child: Padding(
+        padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
         child: Column(
           children: [
             ModalTopBar(
-              title: 'Enter Amount',
-              leadingIcon: const Icon(Icons.arrow_back_ios_new, size: 18),
+              title: S.of(context).enter_amount,
+              leadingIcon: Icon(Icons.arrow_back_ios_new),
               onLeadingPressed: () => Navigator.of(context, rootNavigator: true).pop(),
-              trailingIcon: const Icon(Icons.calendar_month, size: 18),
+              trailingIcon: Icon(Icons.history),
               onTrailingPressed: () {
-                Navigator.pushNamed(context, Routes.bridgeHistoryPage, arguments: widget.bridgeHistoryViewModel);
+                Navigator.pushNamed(context, Routes.bridgeHistoryPage,
+                    arguments: widget.bridgeHistoryViewModel);
               },
             ),
             Expanded(
@@ -130,66 +134,63 @@ class _BridgeAmountPageState extends State<BridgeAmountPage> {
                         crossAxisAlignment: CrossAxisAlignment.stretch,
                         children: [
                           const Spacer(flex: 2),
-                          LayoutBuilder(
-                            builder: (context, constraints) {
-                              return Center(
-                                child: Row(
-                                  mainAxisSize: MainAxisSize.min,
-                                  crossAxisAlignment: CrossAxisAlignment.baseline,
-                                  textBaseline: TextBaseline.alphabetic,
-                                  children: [
-                                    ConstrainedBox(
-                                      constraints: BoxConstraints(
-                                        maxWidth: (constraints.maxWidth - 200)
-                                            .clamp(40.0, constraints.maxWidth),
-                                        minWidth: 40,
-                                      ),
-                                      child: TextFormField(
-                                        controller: _amountController,
-                                        maxLines: 1,
-                                        onChanged: bridgeViewModel.setAmount,
-                                        autovalidateMode: AutovalidateMode.always,
-                                        validator: bridgeViewModel.decimalAmountValidator,
-                                        keyboardType: TextInputType.numberWithOptions(
-                                          signed: false,
-                                          decimal: true,
-                                        ),
-                                        inputFormatters: <TextInputFormatter>[
-                                          FilteringTextInputFormatter.allow(
-                                            RegExp(r'^\d*[.,]?\d*$'),
-                                          ),
-                                        ],
-                                        textAlign: TextAlign.center,
-                                        decoration: InputDecoration(
-                                          isDense: true,
-                                          hintText: '0.00',
-                                          hintStyle: theme.textTheme.displayMedium?.copyWith(
-                                            fontWeight: FontWeight.w400,
-                                            color: theme.colorScheme.onSurfaceVariant,
-                                          ),
-                                        ),
-                                        style: theme.textTheme.displayMedium?.copyWith(
-                                          fontWeight: FontWeight.w400,
-                                          fontSize: 45,
-                                          color: theme.colorScheme.onSurface,
-                                        ),
-                                      ),
+                          Center(
+                            child: Row(
+                              mainAxisSize: MainAxisSize.min,
+                              crossAxisAlignment: CrossAxisAlignment.baseline,
+                              textBaseline: TextBaseline.alphabetic,
+                              children: [
+                                IntrinsicWidth(
+                                  child: TextFormField(
+                                    controller: _amountController,
+                                    focusNode: _amountFocusNode,
+                                    maxLines: 1,
+                                    onChanged: bridgeViewModel.setAmount,
+                                    autovalidateMode: AutovalidateMode.always,
+                                    validator: bridgeViewModel.decimalAmountValidator,
+                                    keyboardType: TextInputType.numberWithOptions(
+                                      signed: false,
+                                      decimal: true,
                                     ),
-                                    const SizedBox(width: 8),
-                                    Text(
-                                      bridgeViewModel.selectedToken?.title ?? '',
-                                      maxLines: 1,
-                                      overflow: TextOverflow.ellipsis,
-                                      style: theme.textTheme.displayMedium?.copyWith(
+                                    inputFormatters: <TextInputFormatter>[
+                                      FilteringTextInputFormatter.allow(
+                                        RegExp(r'^\d*[.,]?\d*$'),
+                                      ),
+                                    ],
+                                    decoration: InputDecoration(
+                                      isDense: true,
+                                      isCollapsed: true,
+                                      contentPadding: EdgeInsets.zero,
+                                      fillColor: Colors.transparent,
+                                      hoverColor: Colors.transparent,
+                                      focusedBorder: InputBorder.none,
+                                      enabledBorder: InputBorder.none,
+                                      hintText: _amountFocused || _amountController.text.isNotEmpty ? null : "0.00",
+                                      hintStyle: theme.textTheme.displayMedium?.copyWith(
                                         fontWeight: FontWeight.w400,
-                                        fontSize: 45,
                                         color: theme.colorScheme.onSurfaceVariant,
                                       ),
                                     ),
-                                  ],
+                                    style: theme.textTheme.displayMedium?.copyWith(
+                                      fontWeight: FontWeight.w400,
+                                      fontSize: 45,
+                                      color: theme.colorScheme.onSurface,
+                                    ),
+                                  ),
                                 ),
-                              );
-                            },
+                                const SizedBox(width: 8),
+                                Text(
+                                  bridgeViewModel.selectedToken?.title ?? '',
+                                  maxLines: 1,
+                                  overflow: TextOverflow.ellipsis,
+                                  style: theme.textTheme.displayMedium?.copyWith(
+                                    fontWeight: FontWeight.w400,
+                                    fontSize: 45,
+                                    color: theme.colorScheme.onSurfaceVariant,
+                                  ),
+                                ),
+                              ],
+                            ),
                           ),
                           const SizedBox(height: 12),
                           Center(
@@ -217,78 +218,71 @@ class _BridgeAmountPageState extends State<BridgeAmountPage> {
                           ],
                           const Spacer(flex: 3),
                           Row(
+                            spacing: 8,
                             crossAxisAlignment: CrossAxisAlignment.center,
                             children: [
                               Expanded(
-                                child: RichText(
-                                  maxLines: 2,
-                                  overflow: TextOverflow.ellipsis,
-                                  text: TextSpan(
-                                    children: [
-                                      TextSpan(
-                                        text: 'Available ',
-                                        style: theme.textTheme.bodyLarge?.copyWith(
-                                          color: theme.colorScheme.onSurfaceVariant,
-                                          fontWeight: FontWeight.w400,
-                                          fontSize: 16,
-                                          letterSpacing: -0.08,
-                                        ),
-                                      ),
-                                      TextSpan(
-                                        text: '${bridgeViewModel.tokenBalanceFormatted} '
-                                            '${bridgeViewModel.selectedToken?.title ?? ''}',
-                                        style: theme.textTheme.bodyLarge?.copyWith(
-                                          color: theme.colorScheme.onSurface,
-                                          fontWeight: FontWeight.w400,
-                                          fontSize: 16,
-                                          letterSpacing: -0.08,
-                                        ),
-                                      ),
-                                    ],
+                                  child: Row(
+                                spacing: 8,
+                                children: [
+                                  Text(
+                                    S.of(context).available,
+                                    style: TextStyle(
+                                        fontSize: 16,
+                                        color: Theme.of(context).colorScheme.onSurfaceVariant),
                                   ),
-                                ),
-                              ),
-                              const SizedBox(width: 10),
-                              TextButton(
-                                style: TextButton.styleFrom(
-                                  textStyle: theme.textTheme.bodyMedium?.copyWith(
-                                    fontWeight: FontWeight.w400,
-                                    fontSize: 14,
-                                    letterSpacing: -0.07,
-                                  ),
-                                  foregroundColor: theme.colorScheme.primary,
-                                  backgroundColor: theme.colorScheme.surfaceContainer,
-                                  padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-                                  shape: RoundedRectangleBorder(
-                                    borderRadius: BorderRadius.circular(80),
-                                  ),
-                                ),
-                                onPressed: () {
+                                  Text(
+                                    "${bridgeViewModel.tokenBalanceFormatted} ${bridgeViewModel.selectedToken?.title ?? ""}",
+                                    style: TextStyle(
+                                        fontSize: 16,
+                                        color: Theme.of(context).colorScheme.onSurface),
+                                  )
+                                ],
+                              )),
+                              GestureDetector(
+                                onTap: () {
                                   bridgeViewModel.setMaxAmount();
                                   _amountController.text = bridgeViewModel.amount;
                                   _amountController.selection = TextSelection.collapsed(
                                     offset: _amountController.text.length,
                                   );
                                 },
-                                child: Text(S.of(context).max),
+                                child: Container(
+                                  height: 34,
+                                  decoration: BoxDecoration(
+                                      color: Theme.of(context).colorScheme.surfaceContainer,
+                                      borderRadius: BorderRadius.circular(999999)),
+                                  child: Center(
+                                      child: Padding(
+                                    padding: EdgeInsets.symmetric(horizontal: 16),
+                                    child: Text(
+                                      S.of(context).max,
+                                      style: TextStyle(
+                                          fontSize: 14,
+                                          color: Theme.of(context).colorScheme.primary),
+                                    ),
+                                  )),
+                                ),
                               ),
-                              const SizedBox(width: 10),
                               IgnorePointer(
                                 ignoring: !canNext,
                                 child: ModernButton(
-                                  size: 48,
+                                  size: 34,
                                   backgroundColor: theme.colorScheme.primary,
                                   iconColor: theme.colorScheme.onPrimary,
-                                  icon: Icon(Icons.arrow_forward, size: 25),
+                                  icon: Icon(Icons.arrow_forward, size: 20),
                                   onPressed: () {
-                                    _amountController.clear();
                                     Navigator.pushNamed(
-                                        context, Routes.bridgeDestinationNetworkPage, arguments: bridgeViewModel);
+                                        context, Routes.bridgeDestinationNetworkPage,
+                                        arguments: bridgeViewModel);
                                   },
                                 ),
                               ),
                             ],
                           ),
+                          SizedBox(
+                            height: 24,
+                          )
                         ],
                       );
                     },
@@ -302,4 +296,3 @@ class _BridgeAmountPageState extends State<BridgeAmountPage> {
     );
   }
 }
-

lib/new-ui/pages/bridge/bridge_confirm_sheet.dart

@@ -6,6 +6,7 @@ import 'package:cake_wallet/new-ui/widgets/receive_page/receive_top_bar.dart';
 import 'package:cake_wallet/new-ui/widgets/send_page/send_confirm_bottom_widget.dart';
 import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
 import 'package:cake_wallet/view_model/bridge/bridge_view_model.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
 import 'package:mobx/mobx.dart';
@@ -98,7 +99,7 @@ class _BridgeConfirmSheetState extends State<BridgeConfirmSheet> {
                     return const Padding(
                       padding: EdgeInsets.symmetric(vertical: 48),
                       child: Center(
-                        child: CircularProgressIndicator(),
+                        child: CupertinoActivityIndicator(),
                       ),
                     );
                   }
@@ -176,9 +177,14 @@ class _BridgeConfirmSheetState extends State<BridgeConfirmSheet> {
                           ),
                         ],
                       ),
-                      NetworkPathPill(
-                        sourceChainName: bridgeViewModel.wallet.type.name,
-                        destChainName: bridgeViewModel.destinationChainInfo?.name ?? '',
+                      Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          NetworkPathPill(
+                            sourceChainName: bridgeViewModel.wallet.type.name,
+                            destChainName: bridgeViewModel.destinationChainInfo?.name ?? '',
+                          ),
+                        ],
                       ),
                       ConfirmDetailsCard(bridgeViewModel: bridgeViewModel),
                       if (bridgeViewModel.executeError != null) ...[
@@ -199,22 +205,16 @@ class _BridgeConfirmSheetState extends State<BridgeConfirmSheet> {
               child: Observer(
                 builder: (_) {
                   if (bridgeViewModel.isExecuting) {
-                    return const LoadingBottomWidget(
-                      text: 'Bridging...',
-                    );
+                    return LoadingBottomWidget(text: "${S.of(context).bridging}...",);
                   }
-                  final canSwipe = bridgeViewModel.quote != null && !bridgeViewModel.isQuoteLoading;
-                  return IgnorePointer(
-                    ignoring: !canSwipe,
-                    child: Opacity(
-                      opacity: canSwipe ? 1 : 0.45,
-                      child: ConfirmSwiper(
-                        onConfirmed: () {
-                          bridgeViewModel.executeBridge();
-                        },
-                        swiperText: 'Swipe to bridge',
-                      ),
-                    ),
+                  if(bridgeViewModel.isQuoteLoading || bridgeViewModel.quote == null) {
+                    return LoadingBottomWidget(text: "${S.of(context).loading}...");
+                  }
+                  return ConfirmSwiper(
+                    onConfirmed: () {
+                      bridgeViewModel.executeBridge();
+                    },
+                    swiperText: S.of(context).swipe_to_bridge,
                   );
                 },
               ),

lib/new-ui/pages/swap_page.dart

@@ -378,11 +378,12 @@ class _NewSwapPageState extends State<NewSwapPage> {
 
   @override
   void dispose() {
-    super.dispose();
     _depositAmountFocus.dispose();
     _depositAddressFocus.dispose();
     _receiveAmountFocus.dispose();
     _receiveAddressFocus.dispose();
+    widget.exchangeViewModel.dispose();
+    super.dispose();
   }
 
   void _onCurrencyChange(CryptoCurrency currency, ExchangeViewModel exchangeViewModel,

lib/new-ui/widgets/bridge/network_path_pill.dart

@@ -28,18 +28,16 @@ class NetworkPathPill extends StatelessWidget {
           color: scheme.onSurfaceVariant,
         ),
         const SizedBox(width: 8),
-        Flexible(
-          child: Text(
-            sourceChainName.capitalized(),
-            maxLines: 1,
-            overflow: TextOverflow.ellipsis,
-            style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  color: scheme.onSurface,
-                  fontWeight: FontWeight.w400,
-                  fontSize: 16,
-                  letterSpacing: -0.08,
-                ),
-          ),
+        Text(
+          sourceChainName.capitalized(),
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+                color: scheme.onSurface,
+                fontWeight: FontWeight.w400,
+                fontSize: 16,
+                letterSpacing: -0.08,
+              ),
         ),
         Padding(
           padding: const EdgeInsets.symmetric(horizontal: 8),
@@ -56,18 +54,16 @@ class NetworkPathPill extends StatelessWidget {
           color: scheme.onSurfaceVariant,
         ),
         const SizedBox(width: 8),
-        Flexible(
-          child: Text(
-            destChainName,
-            maxLines: 1,
-            overflow: TextOverflow.ellipsis,
-            style: Theme.of(context).textTheme.bodyLarge?.copyWith(
-                  color: scheme.onSurface,
-                  fontWeight: FontWeight.w400,
-                  fontSize: 16,
-                  letterSpacing: -0.08,
-                ),
-          ),
+        Text(
+          destChainName,
+          maxLines: 1,
+          overflow: TextOverflow.ellipsis,
+          style: Theme.of(context).textTheme.bodyLarge?.copyWith(
+                color: scheme.onSurface,
+                fontWeight: FontWeight.w400,
+                fontSize: 16,
+                letterSpacing: -0.08,
+              ),
         ),
       ],
     );

lib/new-ui/widgets/send_page/send_address_input.dart

@@ -169,7 +169,11 @@ class _NewSendAddressInputState extends State<NewSendAddressInput> {
 
     try {
       final uri = Uri.parse(code);
-      widget.addressController.text = uri.path;
+      // probably should remove this and let the `onURIScanned` handle it, but for now,
+      // will fix that it takes the token contract address
+      if (!uri.path.contains("/transfer")) {
+        widget.addressController.text = uri.path;
+      }
       widget.onURIScanned?.call(uri);
     } catch (_) {
       widget.addressController.text = code;

lib/src/screens/settings/connection_sync_page.dart

@@ -100,7 +100,7 @@ class ConnectionSyncPage extends BasePage {
                                 label: S.of(context).arbiscan_history,
                                 value: _connectionSyncViewModel.useArbiScan,
                                 onChanged: (val) {
-                                  _connectionSyncViewModel.setUsePolygonScan(val);
+                                  _connectionSyncViewModel.setUseArbiScan(val);
                                 }),
                           if (_connectionSyncViewModel.canUseBscScan)
                             ListItemToggle(
@@ -116,7 +116,7 @@ class ConnectionSyncPage extends BasePage {
                                 label: S.of(context).trongrid_history,
                                 value: _connectionSyncViewModel.useTronGrid,
                                 onChanged: (val) {
-                                  _connectionSyncViewModel.setUsePolygonScan(val);
+                                  _connectionSyncViewModel.setUseTronGrid(val);
                                 }),
                           if (_connectionSyncViewModel.canUseMempoolFeeAPI)
                             ListItemToggle(

lib/src/widgets/bottom_sheet/base_bottom_sheet_widget.dart

@@ -55,13 +55,15 @@ abstract class BaseBottomSheet extends StatelessWidget {
             topLeft: Radius.circular(30.0), topRight: Radius.circular(30.0)),
         child: Container(
           color: Theme.of(context).colorScheme.surface,
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: <Widget>[
-              _buildHeader(context),
-              contentWidget(context),
-              _buildFooter(context),
-            ],
+          child: SafeArea(
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: <Widget>[
+                _buildHeader(context),
+                contentWidget(context),
+                _buildFooter(context),
+              ],
+            ),
           ),
         ),
       ),
@@ -108,7 +110,7 @@ abstract class BaseBottomSheet extends StatelessWidget {
 
       case FooterType.slideActionButton:
         return Padding(
-          padding: const EdgeInsets.fromLTRB(40, 12, 40, 34),
+          padding: const EdgeInsets.fromLTRB(40, 12, 40, 24),
           child: StandardSlideButton(
             key: ValueKey('base_bottom_sheet_widget_standard_slide_button_key'),
             buttonText: slideActionButtonText ?? '',
@@ -120,7 +122,7 @@ abstract class BaseBottomSheet extends StatelessWidget {
 
       case FooterType.singleActionButton:
         return Padding(
-          padding: const EdgeInsets.fromLTRB(16, 12, 16, 34),
+          padding: const EdgeInsets.fromLTRB(16, 12, 16, 24),
           child: LoadingPrimaryButton(
             key: singleActionButtonKey,
             text: singleActionButtonText ?? '',
@@ -134,7 +136,7 @@ abstract class BaseBottomSheet extends StatelessWidget {
 
       case FooterType.doubleActionButton:
         return Padding(
-          padding: const EdgeInsets.fromLTRB(16, 0, 16, 34),
+          padding: const EdgeInsets.fromLTRB(16, 0, 16, 24),
           child: Row(
             children: [
               Expanded(

lib/src/widgets/bottom_sheet/info_bottom_sheet_widget.dart

@@ -100,6 +100,7 @@ class InfoBottomSheet extends BaseBottomSheet {
             )
           else
             Container(),
+          SizedBox(height: 24,),
           if (content != null)
             Expanded(
               flex: 2,

lib/src/widgets/bottom_sheet/token_selection_bottom_sheet.dart

@@ -15,6 +15,9 @@ import 'package:cake_wallet/wallet_types.g.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/currency.dart';
 import 'package:cw_core/currency_for_wallet_type.dart';
+import 'package:cw_core/erc20_token.dart';
+import 'package:cw_core/spl_token.dart';
+import 'package:cw_core/tron_token.dart';
 import 'package:cw_core/utils/print_verbose.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/material.dart';
@@ -78,7 +81,8 @@ class _TokenSelectionContentState extends State<_TokenSelectionContent> {
     _autoSelectToken();
   }
 
-  bool get _isNetworkSelectable => widget.fixedNetwork == null || isEVMCompatibleChain(widget.fixedNetwork!);
+  bool get _isNetworkSelectable =>
+      widget.fixedNetwork == null || isEVMCompatibleChain(widget.fixedNetwork!);
 
   Future<void> _autoSelectToken() async {
     if (selectedNetwork == null) return;
@@ -102,7 +106,11 @@ class _TokenSelectionContentState extends State<_TokenSelectionContent> {
       }
 
       setState(() {
-        selectedToken = tokens.first;
+        selectedToken = tokens.firstWhere((e) {
+          return (e is Erc20Token && e.contractAddress == widget.paymentRequest.contractAddress) ||
+              (e is SPLToken && e.mintAddress == widget.paymentRequest.contractAddress) ||
+              (e is TronToken && e.contractAddress == widget.paymentRequest.contractAddress);
+        }, orElse: () => tokens.first);
         isLoadingTokens = false;
       });
     } catch (e) {

lib/utils/exception_handler.dart

@@ -304,6 +304,7 @@ class ExceptionHandler {
     "Image upload failed due to loss of GPU access",
     "transport error",
     "SdkError.sparkError(field0: Operator RPC error: Connection error: status: Unavailable, message: \"dns error\", details: []",
+    "the timeout of the request was reached",
 
     "support for coin removed, your seedphrase:"
   ];

lib/view_model/bridge/bridge_view_model.dart

@@ -17,6 +17,7 @@ import 'package:cake_wallet/store/app_store.dart';
 import 'package:cake_wallet/store/bridge_transfers_store.dart';
 import 'package:cake_wallet/store/dashboard/fiat_conversion_store.dart';
 import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cw_core/crypto_amount_format.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/erc20_token.dart';
 import 'package:cw_core/wallet_base.dart';
@@ -187,7 +188,7 @@ abstract class BridgeViewModelBase extends WalletChangeListenerViewModel with St
   String get quoteNativeFeeFormattedForDisplay {
     if (quoteNativeFee.isEmpty) return '';
 
-    return '${quoteNativeFee} ${wallet.currency.title}';
+    return '${quoteNativeFee.withMaxDecimals(8)} ${wallet.currency.title}';
   }
 
   @computed

lib/view_model/bridge_details_view_model.dart

@@ -97,9 +97,9 @@ abstract class BridgeDetailsViewModelBase with Store {
     );
 
     final sourceName =
-        evm?.getChainNameByChainId(transfer.sourceChainId) ?? '${transfer.sourceChainId}';
+        evm?.getChainInfoByChainId(transfer.sourceChainId)?.name ?? '${transfer.sourceChainId}';
     final destName =
-        evm?.getChainNameByChainId(transfer.destinationChainId) ?? '${transfer.destinationChainId}';
+        evm?.getChainInfoByChainId(transfer.destinationChainId)?.name ?? '${transfer.destinationChainId}';
 
     items.add(
       StandartListItem(

lib/view_model/dashboard/dashboard_view_model.dart

@@ -770,9 +770,9 @@ abstract class DashboardViewModelBase with Store {
         "public view key is 0",
       // if (wallet.seed == null) "wallet seed is null",
       // if (wallet.seed == "") "wallet seed is empty",
-      if (monero!.getSubaddressList(wallet).getAll(wallet)[0].address ==
-          "41d7FXjswpK1111111111111111111111111111111111111111111111111111111111111111111111111111112KhNi4")
-        "primary address is invalid, you won't be able to receive / spend funds",
+      // if (monero!.getSubaddressList(wallet).getAll(wallet)[0].address ==
+      //     "41d7FXjswpK1111111111111111111111111111111111111111111111111111111111111111111111111111112KhNi4")
+        // "primary address is invalid, you won't be able to receive / spend funds",
     ];
     return errors;
   }

lib/view_model/exchange/exchange_view_model.dart

@@ -82,6 +82,16 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
     // depositCurrency = wallet.currency;
   }
 
+  final List<ReactionDisposer> _disposers = [];
+
+  void dispose() {
+    bestRateSync.cancel();
+    for (final disposer in _disposers) {
+      disposer();
+    }
+    _disposers.clear();
+  }
+
   ExchangeViewModelBase(
     this._appStore,
     this.trades,
@@ -166,11 +176,11 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
     depositAddress =
         useSameWalletAddress(depositCurrency) ? wallet.walletAddresses.addressForExchange : '';
 
-    reaction((_) => receiveAddress, (_) {
+    _disposers.add(reaction((_) => receiveAddress, (_) {
       if(!(tradeState is TradeIsCreatedSuccessfully)) {
         receiveAddressDisplayName = null;
       }
-    });
+    }));
 
     provider = providerList.firstOrNull;
     final initialProvider = provider;
@@ -184,9 +194,9 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
 
     // providerDisplay is read by ui to display auto-selected provider.
     // it's on a delay so it doesn't flicker.
-    reaction((_)=>bestRateProvider,(val) {
+    _disposers.add(reaction((_) => bestRateProvider, (val) {
       providerDisplay = val;
-    },delay: 300);
+    }, delay: 300));
 
     receiveCurrencies = CryptoCurrency.all
         .where((cryptoCurrency) => !excludeReceiveCurrencies.contains(cryptoCurrency))
@@ -202,19 +212,19 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
     _injectUserTronTokensIntoCurrencyLists();
     _defineIsReceiveAmountEditable();
     loadLimits();
-    reaction((_) => isFixedRateMode, (Object _) {
+    _disposers.add(reaction((_) => isFixedRateMode, (Object _) {
       bestRateProvider = null;
       bestRate = 0.0;
       loadLimits();
-    });
+    }));
 
-    reaction((_) => forceDecentralizedExchanges, (val) {
+    _disposers.add(reaction((_) => forceDecentralizedExchanges, (val) {
       if (val && (bestRateProvider?.description.isCentralized ?? false)) {
         bestRateProvider = null;
         bestRate = 0.0;
         loadLimits();
       }
-    });
+    }));
 
     if (isElectrumWallet) {
       bitcoin!.updateFeeRates(wallet);
@@ -1071,6 +1081,11 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with
 
         printV('createTrade: trying provider=${provider.title}');
 
+        // should not happen but just as an extra check
+        if (isFixedRateMode && provider.supportsFixedRate == false) {
+          continue;
+        }
+
         // Skip Swaps.xyz when sending from external
         if (isSendFromExternal &&
             provider.description == ExchangeProviderDescription.swapsXyz) {

lib/view_model/transaction_details_view_model.dart

@@ -98,22 +98,30 @@ class TxDetailRowDefinition {
         keyString: "standard_list_item_transaction_details_recipient_address_key",
         title: S.current.transaction_details_recipient_address,
         valueGetter: (vm) {
-          vm.isRecipientAddressShown = true;
+          String? ret = null;
+
           switch (vm.wallet.type) {
             case WalletType.monero:
-              return monero!.getTransactionAddress(
-                  vm.wallet,
-                  vm.transactionInfo.additionalInfo['accountIndex'] as int,
-                  vm.transactionInfo.additionalInfo['addressIndex'] as int);
+              if (vm.transactionInfo.direction == TransactionDirection.incoming) {
+                ret = monero!.getTransactionAddress(
+                    vm.wallet,
+                    vm.transactionInfo.additionalInfo['accountIndex'] as int,
+                    vm.transactionInfo.additionalInfo['addressIndex'] as int);
+              }
             case WalletType.bitcoin:
-              return (bitcoin!.getTransactionAddresses(vm.wallet, vm.transactionInfo) ?? [])
+              ret = (bitcoin!.getTransactionAddresses(vm.wallet, vm.transactionInfo) ?? [])
                       .firstOrNull ??
                   "";
             case WalletType.tron:
-              return tron!.getTronBase58Address(vm.transactionInfo.to!, vm.wallet);
+              ret = tron!.getTronBase58Address(vm.transactionInfo.to!, vm.wallet);
             default:
-              return vm.transactionInfo.to!;
+              break;
           }
+          if(ret == null) {
+            ret = vm.transactionInfo.to ?? "";
+          }
+          vm.isRecipientAddressShown = ret.isNotEmpty;
+          return ret;
         },
         applicable: (vm) =>
             vm.showRecipientAddress &&

lib/view_model/wallet_address_list/wallet_address_list_view_model.dart

@@ -409,7 +409,7 @@ abstract class WalletAddressListViewModelBase extends WalletChangeListenerViewMo
     // update the address list:
     await wallet.walletAddresses.saveAddressesInBox();
     if (wallet.type == WalletType.monero) {
-      monero!
+      await monero!
           .getSubaddressList(wallet)
           .update(wallet, accountIndex: monero!.getCurrentAccount(wallet).id);
     } else if (wallet.type == WalletType.wownero) {

res/values/strings_ar.arb

@@ -835,12 +835,12 @@
   "restore_bitcoin_description_from_keys": "استعادة محفظتك من سلسلة WIF المُولَّدة من مفاتيحك الخاصة",
   "restore_bitcoin_description_from_seed": "استعد محفظتك باستخدام رمز مكوّن من 24 كلمة",
   "restore_bitcoin_title_from_keys": "الاستعادة من WIF",
-  "restore_description_from_backup": "يمكنك استعادة تطبيق Cake Wallet بالكامل من ملف النسخة الاحتياطية",
+  "restore_description_from_backup": "استعد Cake Wallet تمامًا كما كان عن طريق الاستعادة من ملف نسخ احتياطي.",
   "restore_description_from_cupcake": "اربط بتطبيقنا المرافق غير المتصل بالإنترنت (Air-gapped)، المثبت على هاتف ثانٍ.",
   "restore_description_from_hardware_wallet": "اربط جهاز محفظتك الصلبة من مجموعة متنوعة من الشركات المصنِّعة.",
   "restore_description_from_keys": "استعادة محفظتك من ضغطات المفاتيح المُولَّدة والمحفوظة من مفاتيحك الخاصة",
   "restore_description_from_seed": "استعادة محفظتك باستخدام رمز الاستعادة المكوّن من 25 كلمة أو 13 كلمة",
-  "restore_description_from_seed_keys": "استعد محفظتك باستخدام عبارة الاسترداد/المفاتيح التي حفظتها في مكان آمن",
+  "restore_description_from_seed_keys": "استعد محفظتك من عبارة seed أو المفاتيح التي حفظتها مسبقًا.",
   "restore_existing_wallet": "استعادة محفظة موجودة",
   "restore_from_date_or_blockheight": "يرجى إدخال تاريخ قبل بضعة أيام من إنشاء هذه المحفظة. أو إذا كنت تعرف ارتفاع الكتلة، فيرجى إدخاله بدلاً من ذلك",
   "restore_from_seed_placeholder": "يرجى إدخال أو لصق عبارة الاسترداد الخاصة بك هنا",
@@ -850,12 +850,12 @@
   "restore_restore_wallet": "استعادة المحفظة",
   "restore_seed_keys_restore": "استعادة البذرة/المفاتيح",
   "restore_spend_key_private": "مفتاح الإنفاق (خاص)",
-  "restore_title_from_backup": "الاستعادة من نسخة احتياطية",
+  "restore_title_from_backup": "ملف النسخ الاحتياطي",
   "restore_title_from_cupcake": "تطبيق Cupcake",
-  "restore_title_from_hardware_wallet": "الاستعادة من محفظة أجهزة",
+  "restore_title_from_hardware_wallet": "محفظة الأجهزة    ",
   "restore_title_from_keys": "الاستعادة باستخدام المفاتيح",
   "restore_title_from_seed": "استعادة من عبارة الاسترداد",
-  "restore_title_from_seed_keys": "استعادة من عبارة الاسترداد/المفاتيح",
+  "restore_title_from_seed_keys": "Seed أو مفاتيح",
   "restore_view_key_private": "مفتاح العرض (خاص)",
   "restore_wallet": "استعادة المحفظة",
   "restore_wallet_name": "اسم المحفظة",
@@ -873,7 +873,7 @@
   "savings": "المدخرات",
   "scan": "مسح ضوئي",
   "scan_one_block": "فحص كتلة واحدة",
-  "scan_qr_code": "امسح رمز الاستجابة السريعة",
+  "scan_qr_code": "رمز QR",
   "scan_qr_code_to_get_address": "امسح رمز الاستجابة السريعة للحصول على العنوان",
   "scan_qr_on_device": "امسح رمز الاستجابة السريعة هذا على جهاز آخر",
   "search": "بحث",
@@ -1371,4 +1371,4 @@
   "zcash_card_missing_funds": "هل أموالك مفقودة؟",
   "zcash_card_scan": "مسح",
   "zcash_card_warning": "لا تُغلق التطبيق حتى يكتمل الإجراء، لأنك إن فعلت ذلك فستحتاج هذه العملية إلى البدء من جديد من البداية."
-}
+}

res/values/strings_bg.arb

@@ -835,12 +835,12 @@
   "restore_bitcoin_description_from_keys": "Възстановете портфейла си от генериран WIF низ от вашите частни ключове",
   "restore_bitcoin_description_from_seed": "Възстановете портфейла си от 24‑словен код",
   "restore_bitcoin_title_from_keys": "Възстановяване от WIF",
-  "restore_description_from_backup": "Можете да възстановите цялото приложение Cake Wallet от своя резервен файл",
+  "restore_description_from_backup": "Върнете Cake Wallet точно такъв, какъвто е бил, като го възстановите от резервен файл.",
   "restore_description_from_cupcake": "Свържете се с нашето съпътстващо air-gapped приложение, инсталирано на втори телефон.",
   "restore_description_from_hardware_wallet": "Свържете устройството на вашия хардуерен портфейл от различни производители.",
   "restore_description_from_keys": "Възстановете портфейла си от генерираните натискания на клавиши, запазени от вашите частни ключове",
   "restore_description_from_seed": "Възстановете портфейла си с 25- или 13‑думен код",
-  "restore_description_from_seed_keys": "Възстановете портфейла си от seed/keys, които сте запазили на сигурно място",
+  "restore_description_from_seed_keys": "Възстановете портфейла си от seed фраза или ключове, които сте запазили преди това.",
   "restore_existing_wallet": "Възстановяване на съществуващ портфейл",
   "restore_from_date_or_blockheight": "Моля, въведете дата няколко дни преди да създадете този портфейл. Или, ако знаете височината на блока, въведете я вместо това",
   "restore_from_seed_placeholder": "Моля, въведете или поставете вашата seed фраза тук",
@@ -850,12 +850,12 @@
   "restore_restore_wallet": "Възстановяване на портфейл",
   "restore_seed_keys_restore": "Възстановяване чрез Seed/Keys",
   "restore_spend_key_private": "Ключ за разход (частен)",
-  "restore_title_from_backup": "Възстановяване от резервно копие",
+  "restore_title_from_backup": "Резервен файл",
   "restore_title_from_cupcake": "Приложението Cupcake",
-  "restore_title_from_hardware_wallet": "Възстановяване от хардуерен портфейл",
+  "restore_title_from_hardware_wallet": "Хардуерен портфейл    ",
   "restore_title_from_keys": "Възстановяване от ключове",
   "restore_title_from_seed": "Възстановяване от seed фраза",
-  "restore_title_from_seed_keys": "Възстановяване от seed/ключове",
+  "restore_title_from_seed_keys": "Seed или ключове",
   "restore_view_key_private": "Ключ за преглед (частен)",
   "restore_wallet": "Възстановяване на портфейл",
   "restore_wallet_name": "Име на портфейла",
@@ -873,7 +873,7 @@
   "savings": "Спестявания",
   "scan": "Сканиране",
   "scan_one_block": "Сканиране на един блок",
-  "scan_qr_code": "Сканирайте QR код",
+  "scan_qr_code": "QR код",
   "scan_qr_code_to_get_address": "Сканирайте QR кода, за да получите адреса",
   "scan_qr_on_device": "Сканирайте този QR код на друго устройство",
   "search": "Търсене",
@@ -1371,4 +1371,4 @@
   "zcash_card_missing_funds": "Липсват средства?",
   "zcash_card_scan": "Сканирай",
   "zcash_card_warning": "Не затваряйте приложението, докато процедурата не приключи. Ако го направите, процесът ще трябва да започне отначало."
-}
+}

res/values/strings_cs.arb

@@ -835,12 +835,12 @@
   "restore_bitcoin_description_from_keys": "Obnovte svou peněženku z vygenerovaného WIF řetězce z vašich soukromých klíčů",
   "restore_bitcoin_description_from_seed": "Obnovte svou peněženku z 24slovné seed fráze",
   "restore_bitcoin_title_from_keys": "Obnovit z WIF",
-  "restore_description_from_backup": "Celou aplikaci Cake Wallet můžete obnovit ze souboru se zálohou",
+  "restore_description_from_backup": "Obnovte Cake Wallet přesně tak, jak jste ho měli, obnovením ze záložního souboru.",
   "restore_description_from_cupcake": "Propojte s naší doprovodnou air-gapped aplikací nainstalovanou na druhém telefonu.",
   "restore_description_from_hardware_wallet": "Propojte své zařízení hardwarové peněženky od různých výrobců.",
   "restore_description_from_keys": "Obnovte svou peněženku z vygenerovaných stisků kláves uložených z vašich soukromých klíčů",
   "restore_description_from_seed": "Obnovte svou peněženku pomocí kombinace kódu o 25 nebo 13 slovech",
-  "restore_description_from_seed_keys": "Obnovte svou peněženku ze seedu/klíčů, které jste si uložili na bezpečném místě",
+  "restore_description_from_seed_keys": "Obnovte svou peněženku ze seed fráze nebo klíčů, které jste dříve uložili.",
   "restore_existing_wallet": "Obnovit stávající peněženku",
   "restore_from_date_or_blockheight": "Zadejte prosím datum několik dní před tím, než jste tuto peněženku vytvořili. Nebo pokud znáte výšku bloku, zadejte ji místo toho.",
   "restore_from_seed_placeholder": "Zadejte nebo vložte sem svůj seed",
@@ -850,12 +850,12 @@
   "restore_restore_wallet": "Obnovit peněženku",
   "restore_seed_keys_restore": "Obnova seedu/klíčů",
   "restore_spend_key_private": "Klíč pro utrácení (soukromý)",
-  "restore_title_from_backup": "Obnovit ze zálohy",
+  "restore_title_from_backup": "Záložní soubor",
   "restore_title_from_cupcake": "Aplikace Cupcake",
-  "restore_title_from_hardware_wallet": "Obnovit z hardwarové peněženky",
+  "restore_title_from_hardware_wallet": "Hardwarová peněženka    ",
   "restore_title_from_keys": "Obnovit z klíčů",
   "restore_title_from_seed": "Obnovit ze seedu",
-  "restore_title_from_seed_keys": "Obnovit ze seedu/klíčů",
+  "restore_title_from_seed_keys": "Seed nebo klíče",
   "restore_view_key_private": "Zobrazovací klíč (soukromý)",
   "restore_wallet": "Obnovit peněženku",
   "restore_wallet_name": "Název peněženky",
@@ -873,7 +873,7 @@
   "savings": "Úspory",
   "scan": "Skenovat",
   "scan_one_block": "Naskenovat jeden blok",
-  "scan_qr_code": "Naskenujte QR kód",
+  "scan_qr_code": "QR kód",
   "scan_qr_code_to_get_address": "Naskenujte QR kód a získejte adresu",
   "scan_qr_on_device": "Naskenujte tento QR kód na jiném zařízení",
   "search": "Hledat",
@@ -1371,4 +1371,4 @@
   "zcash_card_missing_funds": "Chybějící prostředky?",
   "zcash_card_scan": "Skenovat",
   "zcash_card_warning": "Nezavírejte aplikaci, dokud se postup nedokončí. Pokud tak učiníte, bude nutné tento proces spustit znovu od začátku."
-}
+}

res/values/strings_de.arb

@@ -836,12 +836,12 @@
   "restore_bitcoin_description_from_keys": "Stellen Sie Ihre Wallet aus der aus Ihren privaten Schlüsseln generierten WIF-Zeichenfolge wieder her",
   "restore_bitcoin_description_from_seed": "Stellen Sie Ihre Wallet mit dem 24-Wort-Wiederherstellungscode wieder her",
   "restore_bitcoin_title_from_keys": "Aus WIF wiederherstellen",
-  "restore_description_from_backup": "Sie können die gesamte Cake Wallet-App aus Ihrer Backup-Datei wiederherstellen",
+  "restore_description_from_backup": "Stellen Sie Cake Wallet genau so wieder her, wie Sie es hatten, indem Sie es aus einer Backup-Datei wiederherstellen.",
   "restore_description_from_cupcake": "Verknüpfen Sie die App mit unserer air-gapped Begleit-App, die auf einem zweiten Telefon installiert ist.",
   "restore_description_from_hardware_wallet": "Verknüpfen Sie Ihr Hardware-Wallet-Gerät von verschiedenen Herstellern.",
   "restore_description_from_keys": "Stellen Sie Ihre Wallet mithilfe der aus Ihren privaten Schlüsseln generierten Schlüssel wieder her",
   "restore_description_from_seed": "Stellen Sie Ihre Wallet entweder mit der 25-Wort- oder der 13-Wort-Wiederherstellungsphrase wieder her",
-  "restore_description_from_seed_keys": "Stellen Sie Ihr Wallet aus Seed/Schlüsseln wieder her, die Sie an einem sicheren Ort aufbewahrt haben",
+  "restore_description_from_seed_keys": "Stellen Sie Ihre Wallet aus einer Seed-Phrase oder Schlüsseln wieder her, die Sie zuvor gespeichert haben.",
   "restore_existing_wallet": "Vorhandene Wallet wiederherstellen",
   "restore_from_date_or_blockheight": "Bitte geben Sie ein Datum ein, das einige Tage vor der Erstellung dieser Wallet liegt. Oder, wenn Sie die Blockhöhe kennen, geben Sie stattdessen diese ein.",
   "restore_from_seed_placeholder": "Bitte geben Sie Ihren Seed hier ein oder fügen Sie ihn ein",
@@ -851,12 +851,12 @@
   "restore_restore_wallet": "Wallet wiederherstellen",
   "restore_seed_keys_restore": "Seed/Schlüssel-Wiederherstellung",
   "restore_spend_key_private": "Spend-Key (privat)",
-  "restore_title_from_backup": "Aus einem Backup wiederherstellen",
+  "restore_title_from_backup": "Backup-Datei",
   "restore_title_from_cupcake": "Cupcake App",
-  "restore_title_from_hardware_wallet": "Aus Hardware-Wallet wiederherstellen",
+  "restore_title_from_hardware_wallet": "Hardware-Wallet    ",
   "restore_title_from_keys": "Aus Schlüsseln wiederherstellen",
   "restore_title_from_seed": "Aus Seed wiederherstellen",
-  "restore_title_from_seed_keys": "Aus Seed/Schlüsseln wiederherstellen",
+  "restore_title_from_seed_keys": "Seed oder Schlüssel",
   "restore_view_key_private": "View-Key (privat)",
   "restore_wallet": "Wallet wiederherstellen",
   "restore_wallet_name": "Wallet-Name",
@@ -874,7 +874,7 @@
   "savings": "Ersparnisse",
   "scan": "Scannen",
   "scan_one_block": "Einen Block scannen",
-  "scan_qr_code": "QR-Code scannen",
+  "scan_qr_code": "QR-Code",
   "scan_qr_code_to_get_address": "Scannen Sie den QR-Code, um die Adresse zu erhalten",
   "scan_qr_on_device": "Scannen Sie diesen QR-Code auf einem anderen Gerät",
   "search": "Suche",
@@ -1375,4 +1375,4 @@
   "zcash_card_missing_funds": "Fehlende Gelder?",
   "zcash_card_scan": "Scannen",
   "zcash_card_warning": "Schließen Sie die App nicht, bis der Vorgang abgeschlossen ist. Andernfalls muss der Vorgang von Grund auf neu gestartet werden."
-}
+}

res/values/strings_en.arb

@@ -87,6 +87,7 @@
   "auto_generate_addresses": "Auto generate addresses",
   "auto_generate_subaddresses": "Auto generate subaddresses",
   "automatic": "Automatic",
+  "available": "Available",
   "available_balance": "Available Balance",
   "available_balance_description": "The “Available Balance” or “Confirmed Balance” are funds that can be spent immediately. If funds appear in the lower balance but not the top balance, then you must wait a few minutes for the incoming funds to get more network confirmations. After they get more confirmations, they will be spendable.",
   "avg_savings": "Avg. Savings",
@@ -123,6 +124,7 @@
   "block_remaining": "1 Block Remaining",
   "Blocks_remaining": "${status} Blocks Remaining",
   "bluetooth": "Bluetooth",
+  "bridging": "Bridging",
   "bright_theme": "Bright",
   "bscscan_history": "BSCScan History",
   "bump_fee": "Bump fee",
@@ -838,12 +840,12 @@
   "restore_bitcoin_description_from_keys": "Restore your wallet from generated WIF string from your private keys",
   "restore_bitcoin_description_from_seed": "Restore your wallet from 24 word combination code",
   "restore_bitcoin_title_from_keys": "Restore from WIF",
-  "restore_description_from_backup": "You can restore the whole Cake Wallet app from your back-up file",
+  "restore_description_from_backup": "Get Cake Wallet back exactly as you had it by restoring from a backup file.",
   "restore_description_from_cupcake": "Link with our companion air-gapped app, installed on a second phone.",
   "restore_description_from_hardware_wallet": "Link your hardware wallet device from a variety of manufacturers.",
   "restore_description_from_keys": "Restore your wallet from generated keystrokes saved from your private keys",
   "restore_description_from_seed": "Restore your wallet from either the 25 word or 13 word combination code",
-  "restore_description_from_seed_keys": "Get back your wallet from seed/keys that you've saved to secure place",
+  "restore_description_from_seed_keys": "Restore your wallet from a seed phrase or keys that you’ve previously saved.",
   "restore_existing_wallet": "Restore Existing Wallet",
   "restore_from_date_or_blockheight": "Please enter a date a few days before you created this wallet. Or if you know the blockheight, please enter it instead",
   "restore_from_seed_placeholder": "Please enter or paste your seed here",
@@ -853,12 +855,12 @@
   "restore_restore_wallet": "Restore Wallet",
   "restore_seed_keys_restore": "Seed/Keys Restore",
   "restore_spend_key_private": "Spend key (private)",
-  "restore_title_from_backup": "Restore from backup",
+  "restore_title_from_backup": "Backup file",
   "restore_title_from_cupcake": "Cupcake App",
-  "restore_title_from_hardware_wallet": "Restore from hardware wallet",
+  "restore_title_from_hardware_wallet": "Hardware wallet    ",
   "restore_title_from_keys": "Restore from keys",
   "restore_title_from_seed": "Restore from seed",
-  "restore_title_from_seed_keys": "Restore from seed/keys",
+  "restore_title_from_seed_keys": "Seed or Keys",
   "restore_view_key_private": "View key (private)",
   "restore_wallet": "Restore Wallet",
   "restore_wallet_name": "Wallet name",
@@ -876,7 +878,7 @@
   "savings": "Savings",
   "scan": "Scan",
   "scan_one_block": "Scan one block",
-  "scan_qr_code": "Scan QR code",
+  "scan_qr_code": "QR code",
   "scan_qr_code_to_get_address": "Scan the QR code to get the address",
   "scan_qr_on_device": "Scan this QR code on another device",
   "search": "Search",
@@ -1091,6 +1093,7 @@
   "swap_providers": "Swap providers",
   "sweeping_wallet": "Sweeping wallet",
   "sweeping_wallet_alert": "This shouldn’t take long. DO NOT LEAVE THIS SCREEN OR THE SWEPT FUNDS MAY BE LOST.",
+  "swipe_to_bridge": "Swipe to bridge",
   "swipe_to_send": "Swipe to send",
   "switch_wallet": "Switch Wallet",
   "switchToETHWallet": "Please switch to an Ethereum wallet and try again",

res/values/strings_es.arb

@@ -836,12 +836,12 @@
   "restore_bitcoin_description_from_keys": "Restaura tu billetera a partir de una cadena WIF generada desde tus claves privadas",
   "restore_bitcoin_description_from_seed": "Restaura tu billetera a partir del código de combinación de 24 palabras",
   "restore_bitcoin_title_from_keys": "Restaurar desde WIF",
-  "restore_description_from_backup": "Puedes restaurar toda la app de Cake Wallet desde tu archivo de copia de seguridad",
+  "restore_description_from_backup": "Recupera Cake Wallet exactamente como lo tenías restaurándolo desde un archivo de copia de seguridad.",
   "restore_description_from_cupcake": "Vincula con nuestra aplicación complementaria con air-gap, instalada en un segundo teléfono.",
   "restore_description_from_hardware_wallet": "Vincula tu dispositivo de billetera de hardware de una variedad de fabricantes.",
   "restore_description_from_keys": "Restaura tu billetera a partir de pulsaciones de teclas generadas y guardadas de tus claves privadas",
   "restore_description_from_seed": "Restaura tu billetera a partir de la frase semilla de 25 o 13 palabras",
-  "restore_description_from_seed_keys": "Recupera tu monedero a partir de la semilla o las claves que guardaste en un lugar seguro",
+  "restore_description_from_seed_keys": "Restaura tu monedero desde una frase seed o claves que hayas guardado anteriormente.",
   "restore_existing_wallet": "Restaurar monedero existente",
   "restore_from_date_or_blockheight": "Por favor, ingrese una fecha de unos días antes de haber creado esta billetera. O, si conoce la altura de bloque, ingrésela en su lugar",
   "restore_from_seed_placeholder": "Por favor, ingresa o pega tu frase semilla aquí",
@@ -851,12 +851,12 @@
   "restore_restore_wallet": "Restaurar billetera",
   "restore_seed_keys_restore": "Restaurar semilla/claves",
   "restore_spend_key_private": "Clave de gasto (privada)",
-  "restore_title_from_backup": "Restaurar desde una copia de seguridad",
+  "restore_title_from_backup": "Archivo de copia de seguridad",
   "restore_title_from_cupcake": "App Cupcake",
-  "restore_title_from_hardware_wallet": "Restaurar desde una billetera de hardware",
+  "restore_title_from_hardware_wallet": "Monedero hardware    ",
   "restore_title_from_keys": "Restaurar desde claves",
   "restore_title_from_seed": "Restaurar desde la frase semilla",
-  "restore_title_from_seed_keys": "Restaurar desde semilla/claves",
+  "restore_title_from_seed_keys": "Seed o claves",
   "restore_view_key_private": "Clave de visualización (privada)",
   "restore_wallet": "Restaurar billetera",
   "restore_wallet_name": "Nombre de la cartera",
@@ -874,7 +874,7 @@
   "savings": "Ahorros",
   "scan": "Escanear",
   "scan_one_block": "Escanear un bloque",
-  "scan_qr_code": "Escanear código QR",
+  "scan_qr_code": "Código QR",
   "scan_qr_code_to_get_address": "Escanea el código QR para obtener la dirección",
   "scan_qr_on_device": "Escanea este código QR en otro dispositivo",
   "search": "Buscar",
@@ -1373,4 +1373,4 @@
   "zcash_card_missing_funds": "¿Faltan fondos?",
   "zcash_card_scan": "Escanear",
   "zcash_card_warning": "No cierre la aplicación hasta que se complete el procedimiento; si lo hace, este proceso deberá reiniciarse desde cero."
-}
+}

res/values/strings_fa.arb

@@ -834,12 +834,12 @@
   "restore_bitcoin_description_from_keys": "کیف پول خود را از رشته WIF تولیدشده از کلیدهای خصوصی‌تان بازیابی کنید",
   "restore_bitcoin_description_from_seed": "کیف پول خود را با کد ترکیبی ۲۴ کلمه‌ای بازیابی کنید",
   "restore_bitcoin_title_from_keys": "بازیابی از WIF",
-  "restore_description_from_backup": "می‌توانید کل برنامه Cake Wallet را از فایل پشتیبان خود بازیابی کنید",
+  "restore_description_from_backup": "Cake Wallet را دقیقاً همان‌طور که داشتید با بازیابی از یک فایل پشتیبان برگردانید.",
   "restore_description_from_cupcake": "با اپلیکیشن همراهِ آفلاین (air-gapped) ما که روی یک گوشی دوم نصب شده است، لینک کنید.",
   "restore_description_from_hardware_wallet": "دستگاه کیف پول سخت‌افزاری خود را از میان تولیدکنندگان مختلف متصل کنید.",
   "restore_description_from_keys": "کیف پول خود را با استفاده از کلیدهای تولیدشده (Keystrokes) که از کلیدهای خصوصی شما ذخیره شده‌اند، بازیابی کنید",
   "restore_description_from_seed": "کیف پول خود را با استفاده از عبارت بازیابی ۲۵ کلمه‌ای یا ۱۳ کلمه‌ای بازیابی کنید",
-  "restore_description_from_seed_keys": "کیف پول خود را با استفاده از سید/کلیدهایی که در مکانی امن ذخیره کرده‌اید بازیابی کنید",
+  "restore_description_from_seed_keys": "کیف پول خود را از عبارت seed یا کلیدهایی که قبلاً ذخیره کرده‌اید بازیابی کنید.",
   "restore_existing_wallet": "بازیابی کیف پول موجود",
   "restore_from_date_or_blockheight": "لطفاً تاریخی را چند روز قبل از ایجاد این کیف پول وارد کنید.\nیا اگر ارتفاع بلاک را می‌دانید، لطفاً به‌جای آن همان را وارد کنید",
   "restore_from_seed_placeholder": "لطفاً عبارت بازیابی خود را اینجا وارد یا جای‌گذاری کنید",
@@ -849,12 +849,12 @@
   "restore_restore_wallet": "بازیابی کیف پول",
   "restore_seed_keys_restore": "بازیابی سید/کلیدها",
   "restore_spend_key_private": "کلید خرج‌کرد (خصوصی)",
-  "restore_title_from_backup": "بازیابی از نسخهٔ پشتیبان",
+  "restore_title_from_backup": "فایل پشتیبان",
   "restore_title_from_cupcake": "اپلیکیشن Cupcake",
-  "restore_title_from_hardware_wallet": "بازیابی از کیف پول سخت‌افزاری",
+  "restore_title_from_hardware_wallet": "کیف پول سخت‌افزاری    ",
   "restore_title_from_keys": "بازیابی از کلیدها",
   "restore_title_from_seed": "بازیابی از عبارت بازیابی",
-  "restore_title_from_seed_keys": "بازیابی از عبارت بازیابی/کلیدها",
+  "restore_title_from_seed_keys": "Seed یا کلیدها",
   "restore_view_key_private": "کلید مشاهده (خصوصی)",
   "restore_wallet": "بازیابی کیف پول",
   "restore_wallet_name": "نام کیف پول",
@@ -872,7 +872,7 @@
   "savings": "پس‌انداز",
   "scan": "اسکن",
   "scan_one_block": "اسکن یک بلاک",
-  "scan_qr_code": "اسکن کد QR",
+  "scan_qr_code": "کد QR",
   "scan_qr_code_to_get_address": "برای دریافت آدرس، کد QR را اسکن کنید",
   "scan_qr_on_device": "این کد QR را با دستگاه دیگری اسکن کنید",
   "search": "جستجو",
@@ -1368,4 +1368,4 @@
   "zcash_card_missing_funds": "موجودی گم شده؟",
   "zcash_card_scan": "اسکن",
   "zcash_card_warning": "تا زمانی که این فرایند کامل نشده است، برنامه را نبندید؛ در غیر این صورت، این فرایند باید از ابتدا دوباره شروع شود."
-}
+}

res/values/strings_fr.arb

@@ -835,12 +835,12 @@
   "restore_bitcoin_description_from_keys": "Restaurer votre portefeuille à partir de la chaîne WIF générée depuis vos clés privées",
   "restore_bitcoin_description_from_seed": "Restaurer votre portefeuille à partir d'une phrase de récupération de 24 mots",
   "restore_bitcoin_title_from_keys": "Restaurer depuis WIF",
-  "restore_description_from_backup": "Vous pouvez restaurer l'application Cake Wallet dans son intégralité à partir de votre fichier de sauvegarde",
+  "restore_description_from_backup": "Retrouvez Cake Wallet exactement tel que vous l'aviez en le restaurant depuis un fichier de sauvegarde.",
   "restore_description_from_cupcake": "Associez notre application compagnon isolée (air‑gapped), installée sur un deuxième téléphone.",
   "restore_description_from_hardware_wallet": "Liez votre appareil de portefeuille matériel parmi une variété de fabricants.",
   "restore_description_from_keys": "Restaurer votre portefeuille à partir des frappes de touches générées et sauvegardées depuis vos clés privées",
   "restore_description_from_seed": "Restaurer votre portefeuille à partir du code de combinaison de 25 ou 13 mots",
-  "restore_description_from_seed_keys": "Récupérez votre portefeuille à partir de la phrase de récupération ou des clés que vous avez sauvegardées en lieu sûr",
+  "restore_description_from_seed_keys": "Restaurez votre portefeuille à partir d'une phrase seed ou de clés que vous avez précédemment sauvegardées.",
   "restore_existing_wallet": "Restaurer un portefeuille existant",
   "restore_from_date_or_blockheight": "Veuillez saisir une date quelques jours avant la création de ce portefeuille. Ou, si vous connaissez la hauteur de bloc, veuillez la saisir à la place.",
   "restore_from_seed_placeholder": "Veuillez saisir ou coller votre phrase de récupération ici",
@@ -850,12 +850,12 @@
   "restore_restore_wallet": "Restaurer le portefeuille",
   "restore_seed_keys_restore": "Restauration de seed/clés",
   "restore_spend_key_private": "Clé de dépense (privée)",
-  "restore_title_from_backup": "Restaurer à partir d’une sauvegarde",
+  "restore_title_from_backup": "Fichier de sauvegarde",
   "restore_title_from_cupcake": "App Cupcake",
-  "restore_title_from_hardware_wallet": "Restaurer depuis un portefeuille matériel",
+  "restore_title_from_hardware_wallet": "Portefeuille matériel    ",
   "restore_title_from_keys": "Restaurer à partir des clés",
   "restore_title_from_seed": "Restaurer depuis une phrase de récupération (seed)",
-  "restore_title_from_seed_keys": "Restaurer depuis une phrase de récupération (seed) ou des clés",
+  "restore_title_from_seed_keys": "Seed ou clés",
   "restore_view_key_private": "Clé de visualisation (privée)",
   "restore_wallet": "Restaurer le portefeuille",
   "restore_wallet_name": "Nom du portefeuille",
@@ -873,7 +873,7 @@
   "savings": "Épargne",
   "scan": "Scanner",
   "scan_one_block": "Analyser un bloc",
-  "scan_qr_code": "Scanner le code QR",
+  "scan_qr_code": "Code QR",
   "scan_qr_code_to_get_address": "Scannez le code QR pour obtenir l'adresse",
   "scan_qr_on_device": "Scannez ce code QR sur un autre appareil",
   "search": "Rechercher",
@@ -1371,4 +1371,4 @@
   "zcash_card_missing_funds": "Fonds manquants ?",
   "zcash_card_scan": "Scanner",
   "zcash_card_warning": "Ne fermez pas l'application tant que la procédure n'est pas terminée. Si vous le faites, ce processus devra redémarrer depuis le début."
-}
+}

res/values/strings_gn.arb

@@ -657,11 +657,11 @@
   "restore_bitcoin_description_from_keys": "Emoheñói jey nde billetera peteĩ WIF joajuhágui, heñóiva nde clave privada-gui.",
   "restore_bitcoin_description_from_seed": "Emoheñói jey nde billetera pe kódigo ñembojuehegua 24 ñe’ẽgui.",
   "restore_bitcoin_title_from_keys": "Emboguejy WIF-gui",
-  "restore_description_from_backup": "Ikatu remohenda jey opaite Cake Wallet app ne marandu ñongatupyre (back-up) guive.",
+  "restore_description_from_backup": "Emoĩporã jey Cake Wallet hína chagüe oĩva'ekue rami, emoĩporã jey ñongatupyre archivo-gui.",
   "restore_description_from_hardware_wallet": "Embojuaju ne hardware wallet mba’e’oka heta hag̃ua fabricante-gui.",
   "restore_description_from_keys": "Emoĩporã jey nde billetera umi teclakuéra heñóiva rehegua, oñeñongatúva nde clave privada-gui.",
   "restore_description_from_seed": "Emoheñói jey nde billetera pe kódigo ñembojoaju 25 térã 13 ñe’ẽgui.",
-  "restore_description_from_seed_keys": "Eguereko jey nde billetera umi seed/keys reñongatúva peteĩ tenda hekorosã hag̃uarãme.",
+  "restore_description_from_seed_keys": "Emoĩporã jey ne billetera ñe'ẽñemi seed-gui térã mba'ekuaarepy oñongatúvagui.",
   "restore_from_date_or_blockheight": "Ikatúpiko emoinge peteĩ arange ko billetera emoheñói mboyve heta’ẽmi ára. Térã reikuaáramo pe blockheight, emoinge upéva hendaguépe.",
   "restore_from_seed_placeholder": "Emoinge térã emboja nde seed ko’ápe.",
   "restore_new_seed": "Seed pyahu",
@@ -670,11 +670,11 @@
   "restore_restore_wallet": "Embojevyjey billetera",
   "restore_seed_keys_restore": "Ñemoĩporã jey Seed/Keys",
   "restore_spend_key_private": "Spend key (ñemigua)",
-  "restore_title_from_backup": "Emoĩporã jey ñongatupyre guive",
-  "restore_title_from_hardware_wallet": "Emoĩporã jey peteĩ billetera hardware-gui",
+  "restore_title_from_backup": "Archivo de backup",
+  "restore_title_from_hardware_wallet": "Hardware wallet    ",
   "restore_title_from_keys": "Emboguejy hag̃ua clave-kuéra guive",
   "restore_title_from_seed": "Emboguyjey ñe’ẽñemigua guive",
-  "restore_title_from_seed_keys": "Emoĩjey ñe’ẽñemígui/mbogueha hag̃ua",
+  "restore_title_from_seed_keys": "Seed térã mba'ekuaarepy",
   "restore_view_key_private": "Ehecha hag̃ua (ñemigua)",
   "restore_wallet": "Emoĩporã jey Billetera",
   "restore_wallet_name": "Téra bielletera",
@@ -692,7 +692,7 @@
   "savings": "Ahorro",
   "scan": "Escanear",
   "scan_one_block": "Eescanea peteĩ bloque",
-  "scan_qr_code": "Eescanea papapy QR",
+  "scan_qr_code": "Código QR",
   "scan_qr_code_to_get_address": "Emoikundaha pe código QR ereko hag̃ua pe dirección",
   "scan_qr_on_device": "Emoñe'ẽ ko código QR ambue dispositivo-pe",
   "search": "Heka",
@@ -1110,4 +1110,4 @@
   "zcash_card_missing_funds": "¿Nde fondo okañy?",
   "zcash_card_scan": "Escanear",
   "zcash_card_warning": "Ani remboty pe app pe procedimiento opa hag̃ua, rejapo ramo upéicha ko proceso tekotevẽta oñepyrũ jey cero guive."
-}
+}

res/values/strings_ha.arb

@@ -837,12 +837,12 @@
   "restore_bitcoin_description_from_keys": "Mayar da walat ɗinka daga rubutun WIF da aka ƙirƙira daga maɓallan sirrinka",
   "restore_bitcoin_description_from_seed": "Maido da walat ɗinka daga lambar haɗin kalmomi 24",
   "restore_bitcoin_title_from_keys": "Mayar daga WIF",
-  "restore_description_from_backup": "Kuna iya dawo da duk manhajar Cake Wallet daga fayil ɗin ajiyar ku",
+  "restore_description_from_backup": "Dawo da Cake Wallet daidai yadda kake da shi ta hanyar maido daga fayil ɗin ajiya.",
   "restore_description_from_cupcake": "Haɗa da manhajar abokinmu mai air-gapped, wadda aka shigar a kan wata waya ta biyu.",
   "restore_description_from_hardware_wallet": "Haɗa na'urar hardware wallet ɗinka daga masana'antun daban-daban.",
   "restore_description_from_keys": "Maido walat ɗinka daga keystrokes da aka ƙirƙira da aka ajiye daga maɓallan sirrinka",
   "restore_description_from_seed": "Maido da walat ɗinka daga ko dai haɗin kalmomi 25 ko 13 (seed phrase)",
-  "restore_description_from_seed_keys": "Sake dawo da walat ɗin ku daga iri/maɓallan da kuka adana a wuri mai tsaro",
+  "restore_description_from_seed_keys": "Maido da walat ɗinka daga jumlar seed ko maɓallan da ka adana a baya.",
   "restore_existing_wallet": "Mayar da Walat da ke Akwai",
   "restore_from_date_or_blockheight": "Don Allah shigar da kwanan wata 'yan kwanaki kafin ku ƙirƙiri wannan walat. Ko kuma idan kun san blockheight, don Allah shigar da shi maimakon haka",
   "restore_from_seed_placeholder": "Da fatan za a shigar ko a manna jumlar seed ɗinku a nan",
@@ -852,12 +852,12 @@
   "restore_restore_wallet": "Mayar da Wallet",
   "restore_seed_keys_restore": "Mayar da Seed/Maɓallai",
   "restore_spend_key_private": "Maɓallin kashewa (na sirri)",
-  "restore_title_from_backup": "Mayar daga madadin",
+  "restore_title_from_backup": "Fayil ɗin ajiya",
   "restore_title_from_cupcake": "Manhajar Cupcake",
-  "restore_title_from_hardware_wallet": "Mayar da walat daga hardware wallet",
+  "restore_title_from_hardware_wallet": "Hardware wallet    ",
   "restore_title_from_keys": "Mayar da walat daga maɓallan sirri",
   "restore_title_from_seed": "Mayarwa daga seed",
-  "restore_title_from_seed_keys": "Mayarwa daga seed/maɓallai",
+  "restore_title_from_seed_keys": "Seed ko maɓallai",
   "restore_view_key_private": "Maɓallin kallo (na sirri)",
   "restore_wallet": "Mayar da Wallet",
   "restore_wallet_name": "Sunan walat",
@@ -875,7 +875,7 @@
   "savings": "Ajiya",
   "scan": "Duba",
   "scan_one_block": "Duba toshe ɗaya",
-  "scan_qr_code": "Duba lambar QR",
+  "scan_qr_code": "Lambar QR",
   "scan_qr_code_to_get_address": "Duba lambar QR don samun adireshin",
   "scan_qr_on_device": "Duba wannan lambar QR a wata na'ura",
   "search": "Bincike",
@@ -1374,4 +1374,4 @@
   "zcash_card_missing_funds": "Kuɗi sun ɓace?",
   "zcash_card_scan": "Duba",
   "zcash_card_warning": "Kada ku rufe manhajar har sai an kammala aikin; idan kun yi haka, wannan tsari zai buƙaci a sake farawa daga farko."
-}
+}

res/values/strings_hi.arb

@@ -837,12 +837,12 @@
   "restore_bitcoin_description_from_keys": "अपनी निजी कुंजियों से जनरेट की गई WIF स्ट्रिंग से अपना वॉलेट पुनर्स्थापित करें",
   "restore_bitcoin_description_from_seed": "24 शब्दों के संयोजन कोड से अपना वॉलेट पुनर्स्थापित करें",
   "restore_bitcoin_title_from_keys": "WIF से पुनर्स्थापित करें",
-  "restore_description_from_backup": "आप अपनी बैक-अप फ़ाइल से पूरे Cake Wallet ऐप को पुनर्स्थापित कर सकते हैं",
+  "restore_description_from_backup": "बैकअप फ़ाइल से पुनर्स्थापित करके Cake Wallet को बिल्कुल वैसा वापस पाएं जैसा आपके पास था।",
   "restore_description_from_cupcake": "दूसरे फोन पर इंस्टॉल किए गए हमारे साथी एयर-गैप्ड ऐप के साथ लिंक करें।",
   "restore_description_from_hardware_wallet": "विभिन्न निर्माताओं के हार्डवेयर वॉलेट डिवाइस को लिंक करें।",
   "restore_description_from_keys": "अपनी निजी कुंजियों से सहेजे गए जनरेटेड कीस्ट्रोक्स से अपना वॉलेट पुनर्स्थापित करें",
   "restore_description_from_seed": "25 शब्द या 13 शब्द के संयोजन कोड से अपना वॉलेट पुनर्स्थापित करें",
-  "restore_description_from_seed_keys": "अपने वॉलेट को उस सीड/कीज़ से पुनर्स्थापित करें जिसे आपने सुरक्षित स्थान पर सहेजा है",
+  "restore_description_from_seed_keys": "अपने पहले से सहेजे गए seed phrase या keys से अपनी wallet को पुनर्स्थापित करें।",
   "restore_existing_wallet": "मौजूदा वॉलेट पुनर्स्थापित करें",
   "restore_from_date_or_blockheight": "कृपया इस वॉलेट को बनाने से कुछ दिन पहले की कोई तारीख दर्ज करें। या यदि आपको ब्लॉकहाइट पता है, तो इसके बजाय उसे दर्ज करें",
   "restore_from_seed_placeholder": "कृपया अपना सीड यहाँ दर्ज करें या पेस्ट करें",
@@ -852,12 +852,12 @@
   "restore_restore_wallet": "वॉलेट पुनर्स्थापित करें",
   "restore_seed_keys_restore": "सीड/कुंजियाँ पुनर्स्थापित करें",
   "restore_spend_key_private": "स्पेंड कुंजी (निजी)",
-  "restore_title_from_backup": "बैकअप से पुनर्स्थापित करें",
+  "restore_title_from_backup": "बैकअप फ़ाइल",
   "restore_title_from_cupcake": "कपकेक ऐप",
-  "restore_title_from_hardware_wallet": "हार्डवेयर वॉलेट से पुनर्स्थापित करें",
+  "restore_title_from_hardware_wallet": "हार्डवेयर वॉलेट    ",
   "restore_title_from_keys": "कुंजियों से पुनर्स्थापित करें",
   "restore_title_from_seed": "सीड से पुनर्स्थापित करें",
-  "restore_title_from_seed_keys": "सीड/कुंजियों से पुनर्स्थापित करें",
+  "restore_title_from_seed_keys": "Seed या कुंजियाँ",
   "restore_view_key_private": "व्यू कुंजी (निजी)",
   "restore_wallet": "वॉलेट पुनर्स्थापित करें",
   "restore_wallet_name": "वॉलेट का नाम",
@@ -875,7 +875,7 @@
   "savings": "बचत",
   "scan": "स्कैन",
   "scan_one_block": "एक ब्लॉक स्कैन करें",
-  "scan_qr_code": "QR कोड स्कैन करें",
+  "scan_qr_code": "QR कोड",
   "scan_qr_code_to_get_address": "पता प्राप्त करने के लिए QR कोड स्कैन करें",
   "scan_qr_on_device": "इस QR कोड को किसी दूसरे डिवाइस पर स्कैन करें",
   "search": "खोजें",
@@ -1373,4 +1373,4 @@
   "zcash_card_missing_funds": "फंड गायब हैं?",
   "zcash_card_scan": "स्कैन",
   "zcash_card_warning": "प्रक्रिया पूरी होने तक ऐप बंद न करें। यदि आप ऐसा करते हैं, तो यह प्रक्रिया शुरू से फिर से शुरू करनी होगी।"
-}
+}

res/values/strings_hr.arb

@@ -835,12 +835,12 @@
   "restore_bitcoin_description_from_keys": "Oporavi svoj novčanik iz generiranog WIF niza iz svojih privatnih ključeva",
   "restore_bitcoin_description_from_seed": "Oporavi svoj novčanik pomoću kombinacijskog koda od 24 riječi",
   "restore_bitcoin_title_from_keys": "Vrati iz WIF-a",
-  "restore_description_from_backup": "Možete vratiti cijelu aplikaciju Cake Wallet iz svoje datoteke sigurnosne kopije",
+  "restore_description_from_backup": "Vratite Cake Wallet točno onakav kakav je bio obnavljanjem iz datoteke sigurnosne kopije.",
   "restore_description_from_cupcake": "Povežite se s našom pratećom aplikacijom s air-gapped načinom rada, instaliranom na drugom telefonu.",
   "restore_description_from_hardware_wallet": "Povežite svoj hardverski novčanik od raznih proizvođača.",
   "restore_description_from_keys": "Obnovite svoj novčanik iz generiranih nizova tipki spremljenih iz vaših privatnih ključeva",
   "restore_description_from_seed": "Obnovite svoj novčanik pomoću kombinacije od 25 ili 13 riječi",
-  "restore_description_from_seed_keys": "Vrati svoj novčanik iz seed fraze/ključeva koje si spremio na sigurno mjesto",
+  "restore_description_from_seed_keys": "Obnovite svoj novčanik iz seed fraze ili ključeva koje ste prethodno spremili.",
   "restore_existing_wallet": "Obnovi postojeći novčanik",
   "restore_from_date_or_blockheight": "Molimo unesite datum nekoliko dana prije nego što ste izradili ovaj novčanik. Ili, ako znate visinu bloka, umjesto toga unesite nju.",
   "restore_from_seed_placeholder": "Molimo unesite ili zalijepite svoju seed frazu ovdje",
@@ -850,12 +850,12 @@
   "restore_restore_wallet": "Vrati novčanik",
   "restore_seed_keys_restore": "Obnova seed fraze/ključeva",
   "restore_spend_key_private": "Ključ za trošenje (privatni)",
-  "restore_title_from_backup": "Vrati iz sigurnosne kopije",
+  "restore_title_from_backup": "Datoteka sigurnosne kopije",
   "restore_title_from_cupcake": "Cupcake App",
-  "restore_title_from_hardware_wallet": "Obnovi iz hardverskog novčanika",
+  "restore_title_from_hardware_wallet": "Hardverski novčanik    ",
   "restore_title_from_keys": "Oporavi pomoću ključeva",
   "restore_title_from_seed": "Oporavi iz seed fraze",
-  "restore_title_from_seed_keys": "Obnovi iz seed fraze/ključeva",
+  "restore_title_from_seed_keys": "Seed ili ključevi",
   "restore_view_key_private": "Ključ za pregled (privatni)",
   "restore_wallet": "Vrati novčanik",
   "restore_wallet_name": "Naziv novčanika",
@@ -873,7 +873,7 @@
   "savings": "Štednja",
   "scan": "Skeniraj",
   "scan_one_block": "Skeniraj jedan blok",
-  "scan_qr_code": "Skenirajte QR kod",
+  "scan_qr_code": "QR kôd",
   "scan_qr_code_to_get_address": "Skeniraj QR kod kako bi dobio adresu",
   "scan_qr_on_device": "Skenirajte ovaj QR kod na drugom uređaju",
   "search": "Pretraži",
@@ -1371,4 +1371,4 @@
   "zcash_card_missing_funds": "Nedostaju sredstva?",
   "zcash_card_scan": "Skeniraj",
   "zcash_card_warning": "Ne zatvarajte aplikaciju dok se postupak ne dovrši; ako to učinite, postupak će se morati ponovno pokrenuti ispočetka."
-}
+}

res/values/strings_hy.arb

@@ -834,12 +834,12 @@
   "restore_bitcoin_description_from_keys": "Վերականգնեք ձեր դրամապանակը ձեր գաղտնի բանալիներից գեներացված WIF տողից",
   "restore_bitcoin_description_from_seed": "Վերականգնեք ձեր դրամապանակը 24 բառից բաղկացած համակցման կոդով",
   "restore_bitcoin_title_from_keys": "Վերականգնել WIF-ից",
-  "restore_description_from_backup": "Դուք կարող եք վերականգնել Cake Wallet հավելվածն ամբողջությամբ ձեր պահուստային ֆայլից",
+  "restore_description_from_backup": "Վերականգնեք Cake Wallet-ը ճիշտ այնպես, ինչպես ունեիք՝ վերականգնելով կրկնօրինակի ֆայլից։",
   "restore_description_from_cupcake": "Կապակցեք մեր ուղեկից օդային բացված հավելվածի հետ, որը տեղադրված է երկրորդ հեռախոսում։",
   "restore_description_from_hardware_wallet": "Կապեք ձեր ապարատային դրամապանակի սարքը տարբեր արտադրողների սարքերի ցանկից։",
   "restore_description_from_keys": "Վերականգնեք ձեր դրամապանակը ձեր գաղտնի բանալիներից պահպանված՝ ստեղծված ստեղնահարվածներից",
   "restore_description_from_seed": "Վերականգնեք ձեր դրամապանակը 25 կամ 13 բառից բաղկացած վերականգնման կոդի միջոցով",
-  "restore_description_from_seed_keys": "Վերականգնեք ձեր դրամապանակը սերմից/բանալիներից, որոնք դուք պահպանել եք ապահով վայրում",
+  "restore_description_from_seed_keys": "Վերականգնեք ձեր դրամապանակը seed արտահայտությունից կամ ձեր նախկինում պահած բանալիներից։",
   "restore_existing_wallet": "Վերականգնել առկա դրամապանակը",
   "restore_from_date_or_blockheight": "Խնդրում ենք մուտքագրել այս դրամապանակը ստեղծելուց մի քանի օր առաջվա ամսաթիվը։ Կամ, եթե գիտեք բլոկի բարձրությունը, դրա փոխարեն մուտքագրեք այն",
   "restore_from_seed_placeholder": "Խնդրում ենք մուտքագրել կամ պատճենել և տեղադրել ձեր սիդը այստեղ",
@@ -849,12 +849,12 @@
   "restore_restore_wallet": "Վերականգնել դրամապանակը",
   "restore_seed_keys_restore": "Սերմի/բանալիների վերականգնում",
   "restore_spend_key_private": "Ծախսման բանալի (գաղտնի)",
-  "restore_title_from_backup": "Վերականգնել կրկնօրինակից",
+  "restore_title_from_backup": "Կրկնօրինակի ֆայլ",
   "restore_title_from_cupcake": "Cupcake հավելվածը",
-  "restore_title_from_hardware_wallet": "Վերականգնել սարքավորային դրամապանակից",
+  "restore_title_from_hardware_wallet": "Ապարատային դրամապանակ    ",
   "restore_title_from_keys": "Վերականգնել բանալիներից",
   "restore_title_from_seed": "Վերականգնել սերմային արտահայտությունից",
-  "restore_title_from_seed_keys": "Վերականգնել սերմից/բանալիներից",
+  "restore_title_from_seed_keys": "Seed կամ բանալիներ",
   "restore_view_key_private": "Դիտման բանալի (գաղտնի)",
   "restore_wallet": "Վերականգնել դրամապանակը",
   "restore_wallet_name": "Դրամապանակի անունը",
@@ -872,7 +872,7 @@
   "savings": "Խնայողություններ",
   "scan": "Սկանավորել",
   "scan_one_block": "Սկանավորել մեկ բլոկ",
-  "scan_qr_code": "Սկանավորել QR կոդը",
+  "scan_qr_code": "QR կոդ",
   "scan_qr_code_to_get_address": "Սկանավորեք QR կոդը՝ հասցեն ստանալու համար",
   "scan_qr_on_device": "Սկանավորեք այս QR կոդը մեկ այլ սարքով",
   "search": "Որոնել",
@@ -1369,4 +1369,4 @@
   "zcash_card_missing_funds": "Միջոցները բացակա՞յում են",
   "zcash_card_scan": "Սկանավորել",
   "zcash_card_warning": "Մի փակեք հավելվածը մինչև ընթացակարգի ավարտը, քանի որ հակառակ դեպքում այս գործընթացը պետք է վերագործարկվի զրոյից։"
-}
+}

res/values/strings_id.arb

@@ -837,12 +837,12 @@
   "restore_bitcoin_description_from_keys": "Pulihkan dompet Anda dari string WIF yang dihasilkan dari kunci privat Anda",
   "restore_bitcoin_description_from_seed": "Pulihkan dompet Anda dari kode kombinasi 24 kata",
   "restore_bitcoin_title_from_keys": "Pulihkan dari WIF",
-  "restore_description_from_backup": "Anda dapat memulihkan seluruh aplikasi Cake Wallet dari file cadangan Anda",
+  "restore_description_from_backup": "Dapatkan kembali Cake Wallet persis seperti yang Anda miliki dengan memulihkan dari file cadangan.",
   "restore_description_from_cupcake": "Tautkan dengan aplikasi pendamping kami yang air-gapped, terinstal di ponsel kedua.",
   "restore_description_from_hardware_wallet": "Hubungkan perangkat dompet perangkat keras Anda dari berbagai produsen.",
   "restore_description_from_keys": "Pulihkan dompet Anda dari penekanan tombol yang dihasilkan dan disimpan dari kunci pribadi Anda",
   "restore_description_from_seed": "Pulihkan dompet Anda dari kode kombinasi 25 kata atau 13 kata",
-  "restore_description_from_seed_keys": "Pulihkan dompet Anda dari seed/kunci yang telah Anda simpan di tempat yang aman",
+  "restore_description_from_seed_keys": "Pulihkan dompet Anda dari seed phrase atau kunci yang sebelumnya telah Anda simpan.",
   "restore_existing_wallet": "Pulihkan Dompet yang Ada",
   "restore_from_date_atau_blockheight": "Silakan masukkan tanggal beberapa hari sebelum Anda membuat dompet ini. Atau jika Anda tahu blockheight, silakan masukkannya sebagai gantinya",
   "restore_from_date_or_blockheight": "Harap masukkan tanggal beberapa hari sebelum Anda membuat dompet ini. Atau jika Anda mengetahui blockheight, silakan masukkan itu sebagai gantinya",
@@ -853,12 +853,12 @@
   "restore_restore_wallet": "Pulihkan Wallet",
   "restore_seed_keys_restore": "Pemulihan Seed/Kunci",
   "restore_spend_key_private": "Kunci pengeluaran (pribadi)",
-  "restore_title_from_backup": "Pulihkan dari cadangan",
+  "restore_title_from_backup": "File cadangan",
   "restore_title_from_cupcake": "Aplikasi Cupcake",
-  "restore_title_from_hardware_wallet": "Pulihkan dari dompet perangkat keras",
+  "restore_title_from_hardware_wallet": "Dompet perangkat keras    ",
   "restore_title_from_keys": "Pulihkan dari kunci",
   "restore_title_from_seed": "Pulihkan dari seed",
-  "restore_title_from_seed_keys": "Pulihkan dari seed/kunci",
+  "restore_title_from_seed_keys": "Seed atau Kunci",
   "restore_view_key_private": "Kunci lihat (pribadi)",
   "restore_wallet": "Pulihkan Wallet",
   "restore_wallet_name": "Nama wallet",
@@ -876,7 +876,7 @@
   "savings": "Tabungan",
   "scan": "Pindai",
   "scan_one_block": "Pindai satu blok",
-  "scan_qr_code": "Pindai kode QR",
+  "scan_qr_code": "Kode QR",
   "scan_qr_code_to_get_address": "Pindai kode QR untuk mendapatkan alamat",
   "scan_qr_on_device": "Pindai kode QR ini di perangkat lain",
   "search": "Cari",
@@ -1374,4 +1374,4 @@
   "zcash_card_missing_funds": "Dana hilang?",
   "zcash_card_scan": "Pindai",
   "zcash_card_warning": "Jangan tutup aplikasi sampai prosedur selesai. Jika Anda melakukannya, proses ini harus dimulai ulang dari awal."
-}
+}

res/values/strings_it.arb

@@ -835,12 +835,12 @@
   "restore_bitcoin_description_from_keys": "Ripristina il tuo wallet da una stringa WIF generata dalle tue chiavi private",
   "restore_bitcoin_description_from_seed": "Ripristina il tuo wallet da una combinazione di 24 parole",
   "restore_bitcoin_title_from_keys": "Ripristina da WIF",
-  "restore_description_from_backup": "Puoi ripristinare l'app Cake Wallet per intero dal tuo file di backup",
+  "restore_description_from_backup": "Ripristina Cake Wallet esattamente com'era ripristinandolo da un file di backup.",
   "restore_description_from_cupcake": "Collegati alla nostra app complementare air-gapped, installata su un secondo telefono.",
   "restore_description_from_hardware_wallet": "Collega il tuo dispositivo wallet hardware da una varietà di produttori.",
   "restore_description_from_keys": "Ripristina il tuo wallet da una sequenza di tasti generata e salvata dalle tue chiavi private",
   "restore_description_from_seed": "Ripristina il tuo wallet usando la combinazione di 25 o 13 parole",
-  "restore_description_from_seed_keys": "Ripristina il tuo wallet dal seed/chiavi che hai salvato in un luogo sicuro",
+  "restore_description_from_seed_keys": "Ripristina il tuo portafoglio da una seed phrase o dalle chiavi che hai precedentemente salvato.",
   "restore_existing_wallet": "Ripristina portafoglio esistente",
   "restore_from_date_or_blockheight": "Inserisci una data di qualche giorno precedente alla creazione di questo wallet. Oppure, se conosci l'altezza del blocco, inseriscila invece",
   "restore_from_seed_placeholder": "Inserisci o incolla qui la tua frase seed",
@@ -850,12 +850,12 @@
   "restore_restore_wallet": "Ripristina Wallet",
   "restore_seed_keys_restore": "Ripristino Seed/Chiavi",
   "restore_spend_key_private": "Chiave di spesa (privata)",
-  "restore_title_from_backup": "Ripristina da backup",
+  "restore_title_from_backup": "File di backup",
   "restore_title_from_cupcake": "App Cupcake",
-  "restore_title_from_hardware_wallet": "Ripristina da wallet hardware",
+  "restore_title_from_hardware_wallet": "Portafoglio hardware    ",
   "restore_title_from_keys": "Ripristina dalle chiavi",
   "restore_title_from_seed": "Ripristina da seed",
-  "restore_title_from_seed_keys": "Ripristina da seed/chiavi",
+  "restore_title_from_seed_keys": "Seed o chiavi",
   "restore_view_key_private": "Chiave di visualizzazione (privata)",
   "restore_wallet": "Ripristina Wallet",
   "restore_wallet_name": "Nome del wallet",
@@ -873,7 +873,7 @@
   "savings": "Risparmi",
   "scan": "Scansiona",
   "scan_one_block": "Scansiona un blocco",
-  "scan_qr_code": "Scansiona il codice QR",
+  "scan_qr_code": "Codice QR",
   "scan_qr_code_to_get_address": "Scansiona il codice QR per ottenere l'indirizzo",
   "scan_qr_on_device": "Scansiona questo codice QR su un altro dispositivo",
   "search": "Cerca",
@@ -1373,4 +1373,4 @@
   "zcash_card_missing_funds": "Fondi mancanti?",
   "zcash_card_scan": "Scansiona",
   "zcash_card_warning": "Non chiudere l'app finché la procedura non è completata, altrimenti sarà necessario riavviare il processo da zero."
-}
+}

res/values/strings_ja.arb

@@ -835,12 +835,12 @@
   "restore_bitcoin_description_from_keys": "秘密鍵から生成されたWIF文字列を使ってウォレットを復元します",
   "restore_bitcoin_description_from_seed": "24語のシードフレーズからウォレットを復元する",
   "restore_bitcoin_title_from_keys": "WIFから復元",
-  "restore_description_from_backup": "バックアップファイルからCake Walletアプリ全体を復元できます",
+  "restore_description_from_backup": "バックアップファイルから復元して、Cake Walletをそのままの状態に戻しましょう。",
   "restore_description_from_cupcake": "2台目のスマートフォンにインストールされた、当社のコンパニオン用エアギャップアプリとリンクします。",
   "restore_description_from_hardware_wallet": "さまざまなメーカーのハードウェアウォレットデバイスを連携します。",
   "restore_description_from_keys": "秘密鍵から保存された生成済みキーストロークを使用してウォレットを復元します",
   "restore_description_from_seed": "25語または13語の組み合わせコードからウォレットを復元します",
-  "restore_description_from_seed_keys": "安全な場所に保存したシード/キーからウォレットを復元する",
+  "restore_description_from_seed_keys": "以前に保存したseedフレーズまたはキーからウォレットを復元します。",
   "restore_existing_wallet": "既存のウォレットを復元",
   "restore_from_date_or_blockheight": "このウォレットを作成した日より数日前の日付を入力してください。ブロック高がわかる場合は、代わりにそれを入力してください",
   "restore_from_seed_placeholder": "ここにシードフレーズを入力または貼り付けてください",
@@ -850,12 +850,12 @@
   "restore_restore_wallet": "ウォレットを復元",
   "restore_seed_keys_restore": "シード/キーの復元",
   "restore_spend_key_private": "スぺンドキー（秘密）",
-  "restore_title_from_backup": "バックアップから復元",
+  "restore_title_from_backup": "バックアップファイル",
   "restore_title_from_cupcake": "Cupcake App",
-  "restore_title_from_hardware_wallet": "ハードウェアウォレットから復元",
+  "restore_title_from_hardware_wallet": "ハードウェアウォレット    ",
   "restore_title_from_keys": "キーから復元",
   "restore_title_from_seed": "シードから復元",
-  "restore_title_from_seed_keys": "シード/キーから復元",
+  "restore_title_from_seed_keys": "シードまたはキー",
   "restore_view_key_private": "ビューキー（秘密鍵）",
   "restore_wallet": "ウォレットを復元",
   "restore_wallet_name": "ウォレット名",
@@ -873,7 +873,7 @@
   "savings": "貯蓄",
   "scan": "スキャン",
   "scan_one_block": "1ブロックをスキャン",
-  "scan_qr_code": "QRコードをスキャン",
+  "scan_qr_code": "QRコード",
   "scan_qr_code_to_get_address": "QRコードをスキャンしてアドレスを取得します",
   "scan_qr_on_device": "別のデバイスでこのQRコードをスキャンしてください",
   "search": "検索",
@@ -1371,4 +1371,4 @@
   "zcash_card_missing_funds": "資金が見当たりませんか？",
   "zcash_card_scan": "スキャン",
   "zcash_card_warning": "手順が完了するまでアプリを閉じないでください。閉じると、このプロセスを最初からやり直す必要があります。"
-}
+}

res/values/strings_ko.arb

@@ -835,12 +835,12 @@
   "restore_bitcoin_description_from_keys": "개인 키에서 생성된 WIF 문자열로 지갑을 복구하세요",
   "restore_bitcoin_description_from_seed": "24단어 조합 코드로 지갑을 복원하세요",
   "restore_bitcoin_title_from_keys": "WIF에서 복원",
-  "restore_description_from_backup": "백업 파일로 Cake Wallet 앱 전체를 복원할 수 있습니다",
+  "restore_description_from_backup": "백업 파일에서 복원하여 Cake Wallet을 이전 상태 그대로 되찾으세요.",
   "restore_description_from_cupcake": "두 번째 휴대폰에 설치된 동반자 에어갭 앱과 연결하세요.",
   "restore_description_from_hardware_wallet": "다양한 제조사의 하드웨어 지갑 기기를 연결하세요.",
   "restore_description_from_keys": "개인 키에서 생성된 키 입력(keystrokes)으로 지갑을 복구합니다",
   "restore_description_from_seed": "25단어 또는 13단어 조합 코드로 지갑을 복원하세요",
-  "restore_description_from_seed_keys": "안전한 장소에 저장해 둔 시드/키로 지갑을 복구하세요",
+  "restore_description_from_seed_keys": "이전에 저장해 둔 시드 구문 또는 키로 지갑을 복원하세요.",
   "restore_existing_wallet": "기존 지갑 복원",
   "restore_from_date_or_blockheight": "이 지갑을 생성한 날짜보다 며칠 전의 날짜를 입력해 주세요. 또는 블록 높이(block height)를 알고 있다면 대신 입력해 주세요",
   "restore_from_seed_placeholder": "여기에 시드 문구를 입력하거나 붙여넣어 주세요",
@@ -850,12 +850,12 @@
   "restore_restore_wallet": "지갑 복원",
   "restore_seed_keys_restore": "시드/키 복원",
   "restore_spend_key_private": "스펜드 키(개인)",
-  "restore_title_from_backup": "백업에서 복원",
+  "restore_title_from_backup": "백업 파일",
   "restore_title_from_cupcake": "컵케이크 앱",
-  "restore_title_from_hardware_wallet": "하드웨어 지갑에서 복원",
+  "restore_title_from_hardware_wallet": "하드웨어 지갑    ",
   "restore_title_from_keys": "키로 복구",
   "restore_title_from_seed": "시드 문구로 복원",
-  "restore_title_from_seed_keys": "시드/키로 복구",
+  "restore_title_from_seed_keys": "시드 또는 키",
   "restore_view_key_private": "보기 키(비공개)",
   "restore_wallet": "지갑 복원",
   "restore_wallet_name": "지갑 이름",
@@ -873,7 +873,7 @@
   "savings": "저축",
   "scan": "스캔",
   "scan_one_block": "블록 1개 스캔",
-  "scan_qr_code": "QR 코드 스캔",
+  "scan_qr_code": "QR 코드",
   "scan_qr_code_to_get_address": "QR 코드를 스캔하여 주소를 확인하세요",
   "scan_qr_on_device": "다른 기기에서 이 QR 코드를 스캔하세요",
   "search": "검색",
@@ -1371,4 +1371,4 @@
   "zcash_card_missing_funds": "자금이 사라졌나요?",
   "zcash_card_scan": "스캔",
   "zcash_card_warning": "절차가 완료될 때까지 앱을 닫지 마십시오. 닫으면 이 과정을 처음부터 다시 시작해야 합니다."
-}
+}

res/values/strings_my.arb

@@ -834,12 +834,12 @@
   "restore_bitcoin_description_from_keys": "သင့်ကိုယ်ပိုင်သော့များမှ ထုတ်လုပ်ထားသော WIF စာကြောင်းကို အသုံးပြုပြီး သင့်ပိုက်ဆံအိတ်ကို ပြန်လည်ရယူပါ။",
   "restore_bitcoin_description_from_seed": "စကားလုံး 24 လုံးပါသော ပေါင်းစပ်ကုဒ်မှ သင့်ပိုက်ဆံအိတ်ကို ပြန်လည်ရယူပါ",
   "restore_bitcoin_title_from_keys": "WIF မှ ပြန်လည်ထည့်သွင်းပါ",
-  "restore_description_from_backup": "သင့်အရန်ကူးဖိုင်မှ Cake Wallet အက်ပ်တစ်ခုလုံးကို ပြန်လည်ရယူနိုင်သည်။",
+  "restore_description_from_backup": "Backup ဖိုင်မှ ပြန်လည်ရယူ၍ Cake Wallet ကို မူလအတိုင်း ပြန်လည်ရယူပါ။",
   "restore_description_from_cupcake": "ဒုတိယဖုန်းတွင် ထည့်သွင်းထားသော ကျွန်ုပ်တို့၏ အဖော် air-gapped app နှင့် ချိတ်ဆက်ပါ။",
   "restore_description_from_hardware_wallet": "ထုတ်လုပ်သူအမျိုးမျိုး၏ hardware wallet စက်ပစ္စည်းကို ချိတ်ဆက်ပါ။",
   "restore_description_from_keys": "သင့်ကိုယ်ပိုင်သော့များမှ သိမ်းဆည်းထားသော ထုတ်ပေးထားသည့် keystrokes များမှ သင့်ပိုက်ဆံအိတ်ကို ပြန်လည်ရယူပါ။",
   "restore_description_from_seed": "25 စကားလုံး သို့မဟုတ် 13 စကားလုံး ပေါင်းစပ်ကုဒ်မှ သင့်ဝေါလက်ကို ပြန်လည်ရယူပါ",
-  "restore_description_from_seed_keys": "လုံခြုံသောနေရာတွင် သိမ်းဆည်းထားသော မျိုးစေ့/သော့များမှ သင့်ပိုက်ဆံအိတ်ကို ပြန်လည်ရယူပါ။",
+  "restore_description_from_seed_keys": "ယခင်သိမ်းဆည်းထားသော seed phrase သို့မဟုတ် keys မှ သင်၏ wallet ကို ပြန်လည်ရယူပါ။",
   "restore_existing_wallet": "ရှိပြီးသား Wallet ကို ပြန်လည်ရယူရန်",
   "restore_from_date_or_blockheight": "ဤပိုက်ဆံအိတ်ကို သင်ဖန်တီးခဲ့သည့်နေ့မတိုင်မီ ရက်အနည်းငယ်အလိုက ရက်စွဲတစ်ခုကို ထည့်သွင်းပါ။ သို့မဟုတ် block height ကို သိပါက ၎င်းအစား ထည့်သွင်းပါ။",
   "restore_from_seed_placeholder": "သင့် seed ကို ဤနေရာတွင် ရိုက်ထည့်ပါ သို့မဟုတ် ကူးထည့်ပါ",
@@ -849,12 +849,12 @@
   "restore_restore_wallet": "Wallet ကို ပြန်လည်ရယူပါ",
   "restore_seed_keys_restore": "Seed/Keys ပြန်လည်ရယူခြင်း",
   "restore_spend_key_private": "Spend key (သီးသန့်)",
-  "restore_title_from_backup": "အရန်ကူးမှ ပြန်လည်ရယူပါ",
+  "restore_title_from_backup": "Backup ဖိုင်",
   "restore_title_from_cupcake": "Cupcake App",
-  "restore_title_from_hardware_wallet": "ဟာ့ဒ်ဝဲပိုက်ဆံအိတ်မှ ပြန်လည်ရယူရန်",
+  "restore_title_from_hardware_wallet": "Hardware wallet    ",
   "restore_title_from_keys": "သော့များမှ ပြန်လည်ရယူရန်",
   "restore_title_from_seed": "Seed မှ ပြန်လည်ရယူပါ",
-  "restore_title_from_seed_keys": "Seed/Keys မှ ပြန်လည်ရယူရန်",
+  "restore_title_from_seed_keys": "Seed သို့မဟုတ် Keys",
   "restore_view_key_private": "ကြည့်ရှုရန်သော့ (သီးသန့်)",
   "restore_wallet": "ပိုက်ဆံအိတ်ကို ပြန်လည်ရယူပါ",
   "restore_wallet_name": "ဝေါလက်အမည်",
@@ -872,7 +872,7 @@
   "savings": "စုဆောင်းငွေ",
   "scan": "စကင်",
   "scan_one_block": "ဘလော့ခ်တစ်ခုကို စကင်ဖတ်ပါ",
-  "scan_qr_code": "QR ကုဒ်ကို စကင်န်ဖတ်ပါ",
+  "scan_qr_code": "QR ကုဒ်",
   "scan_qr_code_to_get_address": "လိပ်စာရယူရန် QR ကုဒ်ကို စကင်န်ဖတ်ပါ",
   "scan_qr_on_device": "အခြားစက်ပေါ်တွင် ဤ QR ကုဒ်ကို စကင်ဖတ်ပါ",
   "search": "ရှာဖွေရန်",
@@ -1370,4 +1370,4 @@
   "zcash_card_missing_funds": "ငွေကြေး ပျောက်ဆုံးနေပါသလား?",
   "zcash_card_scan": "စကင်",
   "zcash_card_warning": "လုပ်ငန်းစဉ် ပြီးဆုံးသည်အထိ အက်ပ်ကို မပိတ်ပါနှင့်။ ပိတ်လိုက်ပါက ဤလုပ်ငန်းစဉ်ကို အစမှ ပြန်လည်စတင်ရမည်ဖြစ်သည်။"
-}
+}

res/values/strings_nl.arb

@@ -831,12 +831,12 @@
   "restore_bitcoin_description_from_keys": "Herstel je wallet van de gegenereerde WIF-string van je privésleutels",
   "restore_bitcoin_description_from_seed": "Herstel je wallet met een combinatiecode van 24 woorden",
   "restore_bitcoin_title_from_keys": "Herstel van WIF",
-  "restore_description_from_backup": "Je kunt de hele Cake Wallet-app herstellen van je back-upbestand",
+  "restore_description_from_backup": "Zet Cake Wallet precies terug zoals het was door het te herstellen vanuit een back-upbestand.",
   "restore_description_from_cupcake": "Verbind met onze bijbehorende air-gapped-app, geïnstalleerd op een tweede telefoon.",
   "restore_description_from_hardware_wallet": "Koppel je hardware-wallet van verschillende fabrikanten.",
   "restore_description_from_keys": "Herstel je wallet met de opgeslagen sleutels van je privésleutels",
   "restore_description_from_seed": "Herstel je wallet met de combinatiecode van 25 of 13 woorden",
-  "restore_description_from_seed_keys": "Krijg je wallet terug met de seed/sleutels die je op een veilige plaats hebt opgeslagen",
+  "restore_description_from_seed_keys": "Herstel uw wallet vanuit een seed phrase of sleutels die u eerder hebt opgeslagen.",
   "restore_existing_wallet": "Herstel de bestaande wallet",
   "restore_from_date_or_blockheight": "Voer een datum in van een paar dagen voordat je deze wallet hebt gemaakt. Of als je de blokhoogte kent, voer deze dan in",
   "restore_from_seed_placeholder": "Voer hier je seed in of plak deze",
@@ -846,12 +846,12 @@
   "restore_restore_wallet": "Wallet herstellen",
   "restore_seed_keys_restore": "Seed / sleutels herstellen",
   "restore_spend_key_private": "Spend key (privaat)",
-  "restore_title_from_backup": "Herstellen vanuit een back-upbestand",
+  "restore_title_from_backup": "Back-upbestand",
   "restore_title_from_cupcake": "Cupcake-app",
-  "restore_title_from_hardware_wallet": "Herstel van de hardware-wallet",
+  "restore_title_from_hardware_wallet": "Hardware wallet    ",
   "restore_title_from_keys": "Herstel van sleutels",
   "restore_title_from_seed": "Herstel van seed",
-  "restore_title_from_seed_keys": "Herstel van seed/sleutels",
+  "restore_title_from_seed_keys": "Seed of sleutels",
   "restore_view_key_private": "View key (privaat)",
   "restore_wallet": "Wallet herstellen",
   "restore_wallet_name": "Walletnaam",
@@ -869,7 +869,7 @@
   "savings": "Spaargeld",
   "scan": "Scannen",
   "scan_one_block": "Scan een blok",
-  "scan_qr_code": "Scan QR-code",
+  "scan_qr_code": "QR-code",
   "scan_qr_code_to_get_address": "Scan de QR-code om het adres op te halen",
   "scan_qr_on_device": "Scan deze QR-code op een ander apparaat",
   "search": "Zoeken",
@@ -1368,4 +1368,4 @@
   "zcash_card_missing_funds": "Fondsen ontbreken?",
   "zcash_card_scan": "Scannen",
   "zcash_card_warning": "Sluit de app niet voordat de procedure is voltooid. Als je dit wel doet, moet dit proces helemaal opnieuw worden gestart."
-}
+}

res/values/strings_pl.arb

@@ -833,12 +833,12 @@
   "restore_bitcoin_description_from_keys": "Przywróć swój portfel z wygenerowanego ciągu WIF na podstawie kluczy prywatnych",
   "restore_bitcoin_description_from_seed": "Przywróć swój portfel za pomocą 24‑wyrazowej frazy seed",
   "restore_bitcoin_title_from_keys": "Przywróć z WIF",
-  "restore_description_from_backup": "Możesz przywrócić całą aplikację Cake Wallet z pliku kopii zapasowej",
+  "restore_description_from_backup": "Przywróć Cake Wallet dokładnie taki, jaki miałeś, przywracając go z pliku kopii zapasowej.",
   "restore_description_from_cupcake": "Połącz z naszą towarzyszącą aplikacją air-gapped, zainstalowaną na drugim telefonie.",
   "restore_description_from_hardware_wallet": "Połącz swoje urządzenie portfela sprzętowego od jednego z wielu producentów.",
   "restore_description_from_keys": "Przywróć swój portfel z wygenerowanych sekwencji klawiszy zapisanych na podstawie twoich kluczy prywatnych",
   "restore_description_from_seed": "Przywróć swój portfel za pomocą 25‑ lub 13‑wyrazowego kodu odzyskiwania",
-  "restore_description_from_seed_keys": "Przywróć swój portfel z seeda/kluczy, które zapisałeś w bezpiecznym miejscu",
+  "restore_description_from_seed_keys": "Przywróć swój portfel z frazy seed lub kluczy, które wcześniej zapisałeś.",
   "restore_existing_wallet": "Przywróć istniejący portfel",
   "restore_from_date_or_blockheight": "Wprowadź datę sprzed kilku dni przed utworzeniem tego portfela. Jeśli znasz wysokość bloku, wprowadź ją zamiast daty.",
   "restore_from_seed_placeholder": "Wpisz lub wklej tutaj swoją frazę seed",
@@ -848,12 +848,12 @@
   "restore_restore_wallet": "Przywróć portfel",
   "restore_seed_keys_restore": "Przywracanie seeda/kluczy",
   "restore_spend_key_private": "Klucz wydawania (prywatny)",
-  "restore_title_from_backup": "Przywróć z kopii zapasowej",
+  "restore_title_from_backup": "Plik kopii zapasowej",
   "restore_title_from_cupcake": "Aplikacja Cupcake",
-  "restore_title_from_hardware_wallet": "Odzyskaj z portfela sprzętowego",
+  "restore_title_from_hardware_wallet": "Portfel sprzętowy    ",
   "restore_title_from_keys": "Przywróć z kluczy",
   "restore_title_from_seed": "Przywróć z seeda",
-  "restore_title_from_seed_keys": "Przywróć z frazy seed/kluczy",
+  "restore_title_from_seed_keys": "Seed lub klucze",
   "restore_view_key_private": "Klucz widoku (prywatny)",
   "restore_wallet": "Odzyskaj portfel",
   "restore_wallet_name": "Nazwa portfela",
@@ -871,7 +871,7 @@
   "savings": "Oszczędności",
   "scan": "Skanuj",
   "scan_one_block": "Skanuj jeden blok",
-  "scan_qr_code": "Skanuj kod QR",
+  "scan_qr_code": "Kod QR",
   "scan_qr_code_to_get_address": "Zeskanuj kod QR, aby uzyskać adres",
   "scan_qr_on_device": "Zeskanuj ten kod QR na innym urządzeniu",
   "search": "Szukaj",
@@ -1369,4 +1369,4 @@
   "zcash_card_missing_funds": "Brakuje środków?",
   "zcash_card_scan": "Skanuj",
   "zcash_card_warning": "Nie zamykaj aplikacji do czasu zakończenia procedury. Jeśli to zrobisz, proces będzie musiał rozpocząć się od nowa."
-}
+}

res/values/strings_pt.arb

@@ -836,12 +836,12 @@
   "restore_bitcoin_description_from_keys": "Restaure sua carteira a partir da string WIF gerada a partir de suas chaves privadas",
   "restore_bitcoin_description_from_seed": "Restaure sua carteira a partir de um código de combinação de 24 palavras",
   "restore_bitcoin_title_from_keys": "Restaurar a partir de WIF",
-  "restore_description_from_backup": "Você pode restaurar todo o aplicativo Cake Wallet a partir do seu arquivo de backup",
+  "restore_description_from_backup": "Recupere o Cake Wallet exatamente como estava restaurando a partir de um arquivo de backup.",
   "restore_description_from_cupcake": "Vincule com nosso aplicativo complementar air-gapped, instalado em um segundo telefone.",
   "restore_description_from_hardware_wallet": "Vincule o dispositivo da sua carteira de hardware de uma variedade de fabricantes.",
   "restore_description_from_keys": "Restaure sua carteira a partir das teclas geradas salvas das suas chaves privadas",
   "restore_description_from_seed": "Restaure sua carteira a partir da combinação de 25 ou 13 palavras",
-  "restore_description_from_seed_keys": "Recupere sua carteira a partir da seed/chaves que você salvou em um local seguro",
+  "restore_description_from_seed_keys": "Restaure sua carteira a partir de uma frase seed ou chaves que você salvou anteriormente.",
   "restore_existing_wallet": "Restaurar carteira existente",
   "restore_from_date_or_blockheight": "Insira uma data de alguns dias antes de você ter criado esta carteira. Ou, se você souber a altura do bloco, insira-a.",
   "restore_from_seed_placeholder": "Digite ou cole sua frase-semente aqui",
@@ -851,12 +851,12 @@
   "restore_restore_wallet": "Restaurar carteira",
   "restore_seed_keys_restore": "Restauração de seed/chaves",
   "restore_spend_key_private": "Chave de gasto (privada)",
-  "restore_title_from_backup": "Restaurar a partir de um backup",
+  "restore_title_from_backup": "Arquivo de backup",
   "restore_title_from_cupcake": "App Cupcake",
-  "restore_title_from_hardware_wallet": "Restaurar a partir de uma carteira de hardware",
+  "restore_title_from_hardware_wallet": "Carteira de hardware    ",
   "restore_title_from_keys": "Restaurar a partir das chaves",
   "restore_title_from_seed": "Restaurar a partir da seed",
-  "restore_title_from_seed_keys": "Restaurar a partir de seed/chaves",
+  "restore_title_from_seed_keys": "Seed ou chaves",
   "restore_view_key_private": "Chave de visualização (privada)",
   "restore_wallet": "Restaurar Carteira",
   "restore_wallet_name": "Nome da carteira",
@@ -874,7 +874,7 @@
   "savings": "Poupança",
   "scan": "Escanear",
   "scan_one_block": "Escanear um bloco",
-  "scan_qr_code": "Escanear código QR",
+  "scan_qr_code": "Código QR",
   "scan_qr_code_to_get_address": "Escaneie o código QR para obter o endereço",
   "scan_qr_on_device": "Escaneie este código QR em outro dispositivo",
   "search": "Pesquisar",
@@ -1373,4 +1373,4 @@
   "zcash_card_missing_funds": "Fundos em falta?",
   "zcash_card_scan": "Escanear",
   "zcash_card_warning": "Não feche o aplicativo até que o procedimento seja concluído; se você fizer isso, esse processo precisará ser reiniciado do zero."
-}
+}

res/values/strings_pt_BR.arb

@@ -830,12 +830,12 @@
   "restore_bitcoin_description_from_keys": "Restaure sua carteira a partir da string WIF gerada a partir de suas chaves privadas",
   "restore_bitcoin_description_from_seed": "Restaure sua carteira a partir de um código de combinação de 24 palavras",
   "restore_bitcoin_title_from_keys": "Restaurar a partir de WIF",
-  "restore_description_from_backup": "Você pode restaurar todo o app Cake Wallet a partir do seu arquivo de backup",
+  "restore_description_from_backup": "Recupere o Cake Wallet exatamente como estava restaurando a partir de um arquivo de backup.",
   "restore_description_from_cupcake": "Vincule com nosso aplicativo complementar air-gapped, instalado em um segundo telefone.",
   "restore_description_from_hardware_wallet": "Vincule o dispositivo da sua carteira de hardware de uma variedade de fabricantes.",
   "restore_description_from_keys": "Restaure sua carteira a partir das teclas geradas salvas das suas chaves privadas",
   "restore_description_from_seed": "Restaure sua carteira a partir do código de combinação de 25 ou 13 palavras",
-  "restore_description_from_seed_keys": "Recupere sua carteira a partir da seed/chaves que você salvou em um local seguro",
+  "restore_description_from_seed_keys": "Restaure sua carteira a partir de uma frase seed ou chaves que você salvou anteriormente.",
   "restore_existing_wallet": "Restaurar carteira existente",
   "restore_from_date_or_blockheight": "Insira uma data de alguns dias antes de você ter criado esta carteira. Ou, se você souber a altura do bloco, insira-a.",
   "restore_from_seed_placeholder": "Digite ou cole sua frase-semente aqui",
@@ -845,12 +845,12 @@
   "restore_restore_wallet": "Restaurar carteira",
   "restore_seed_keys_restore": "Restauração de Seed/Chaves",
   "restore_spend_key_private": "Chave de gasto (privada)",
-  "restore_title_from_backup": "Restaurar a partir de um backup",
+  "restore_title_from_backup": "Arquivo de backup",
   "restore_title_from_cupcake": "Aplicativo Cupcake",
-  "restore_title_from_hardware_wallet": "Restaurar de uma carteira de hardware",
+  "restore_title_from_hardware_wallet": "Carteira de hardware    ",
   "restore_title_from_keys": "Restaurar a partir das chaves",
   "restore_title_from_seed": "Restaurar a partir da seed",
-  "restore_title_from_seed_keys": "Restaurar a partir de seed/chaves",
+  "restore_title_from_seed_keys": "Seed ou chaves",
   "restore_view_key_private": "Chave de visualização (privada)",
   "restore_wallet": "Restaurar carteira",
   "restore_wallet_name": "Nome da carteira",
@@ -868,7 +868,7 @@
   "savings": "Poupança",
   "scan": "Escanear",
   "scan_one_block": "Escanear um bloco",
-  "scan_qr_code": "Escanear código QR",
+  "scan_qr_code": "Código QR",
   "scan_qr_code_to_get_address": "Escaneie o código QR para obter o endereço",
   "scan_qr_on_device": "Escaneie este código QR em outro dispositivo",
   "search": "Pesquisar",
@@ -1365,4 +1365,4 @@
   "zcash_card_missing_funds": "Fundos ausentes?",
   "zcash_card_scan": "Escanear",
   "zcash_card_warning": "Não feche o app até que o procedimento seja concluído; caso contrário, este processo precisará ser reiniciado do zero."
-}
+}

res/values/strings_ru.arb

@@ -835,12 +835,12 @@
   "restore_bitcoin_description_from_keys": "Восстановите кошелёк из сгенерированной WIF-строки из ваших приватных ключей",
   "restore_bitcoin_description_from_seed": "Восстановите кошелёк с помощью комбинации из 24 слов",
   "restore_bitcoin_title_from_keys": "Восстановить из WIF",
-  "restore_description_from_backup": "Вы можете восстановить всё приложение Cake Wallet из файла резервной копии",
+  "restore_description_from_backup": "Восстановите Cake Wallet в точности таким, каким он был, используя файл резервной копии.",
   "restore_description_from_cupcake": "Свяжите с нашим вспомогательным приложением с воздушным зазором, установленным на втором телефоне.",
   "restore_description_from_hardware_wallet": "Подключите устройство аппаратного кошелька от различных производителей.",
   "restore_description_from_keys": "Восстановите кошелёк с помощью сгенерированных нажатий клавиш, сохранённых из ваших приватных ключей",
   "restore_description_from_seed": "Восстановите кошелёк с помощью кода из 25 или 13 слов",
-  "restore_description_from_seed_keys": "Восстановите кошелёк из seed-фразы/ключей, которые вы сохранили в надёжном месте",
+  "restore_description_from_seed_keys": "Восстановите кошелёк из seed-фразы или ключей, которые вы ранее сохранили.",
   "restore_existing_wallet": "Восстановить существующий кошелек",
   "restore_from_date_or_blockheight": "Пожалуйста, введите дату за несколько дней до создания этого кошелька. Или, если вы знаете высоту блока, введите её вместо даты",
   "restore_from_seed_placeholder": "Пожалуйста, введите или вставьте сюда вашу seed-фразу",
@@ -850,12 +850,12 @@
   "restore_restore_wallet": "Восстановить кошелёк",
   "restore_seed_keys_restore": "Восстановление из seed-фразы/ключей",
   "restore_spend_key_private": "Ключ траты (приватный)",
-  "restore_title_from_backup": "Восстановить из резервной копии",
+  "restore_title_from_backup": "Файл резервной копии",
   "restore_title_from_cupcake": "Приложение Cupcake",
-  "restore_title_from_hardware_wallet": "Восстановить с аппаратного кошелька",
+  "restore_title_from_hardware_wallet": "Аппаратный кошелёк    ",
   "restore_title_from_keys": "Восстановить по ключам",
   "restore_title_from_seed": "Восстановить из seed-фразы",
-  "restore_title_from_seed_keys": "Восстановить из seed-фразы/ключей",
+  "restore_title_from_seed_keys": "Seed или ключи",
   "restore_view_key_private": "Ключ просмотра (приватный)",
   "restore_wallet": "Восстановить кошелек",
   "restore_wallet_name": "Имя кошелька",
@@ -873,7 +873,7 @@
   "savings": "Сбережения",
   "scan": "Сканировать",
   "scan_one_block": "Сканировать один блок",
-  "scan_qr_code": "Сканировать QR-код",
+  "scan_qr_code": "QR-код",
   "scan_qr_code_to_get_address": "Отсканируйте QR-код, чтобы получить адрес",
   "scan_qr_on_device": "Отсканируйте этот QR-код на другом устройстве",
   "search": "Поиск",
@@ -1371,4 +1371,4 @@
   "zcash_card_missing_funds": "Не хватает средств?",
   "zcash_card_scan": "Сканировать",
   "zcash_card_warning": "Не закрывайте приложение до завершения процедуры. Если вы это сделаете, процесс придется перезапустить с нуля."
-}
+}

res/values/strings_th.arb

@@ -834,12 +834,12 @@
   "restore_bitcoin_description_from_keys": "กู้คืนวอลเล็ตของคุณจากสตริง WIF ที่สร้างขึ้นจากคีย์ส่วนตัวของคุณ",
   "restore_bitcoin_description_from_seed": "กู้คืนกระเป๋าเงินของคุณจากรหัสคำ 24 คำ",
   "restore_bitcoin_title_from_keys": "กู้คืนจาก WIF",
-  "restore_description_from_backup": "คุณสามารถกู้คืนแอป Cake Wallet ทั้งหมดจากไฟล์สำรองข้อมูลของคุณ",
+  "restore_description_from_backup": "คืนค่า Cake Wallet ให้เหมือนเดิมทุกประการโดยการกู้คืนจากไฟล์สำรองข้อมูล",
   "restore_description_from_cupcake": "เชื่อมต่อกับแอปคู่หูแบบ air-gapped ของเราที่ติดตั้งบนโทรศัพท์เครื่องที่สอง",
   "restore_description_from_hardware_wallet": "เชื่อมต่ออุปกรณ์กระเป๋าเงินฮาร์ดแวร์ของคุณจากผู้ผลิตหลากหลายราย",
   "restore_description_from_keys": "กู้คืนกระเป๋าเงินของคุณจากชุดคีย์สโตรกที่สร้างขึ้นซึ่งบันทึกไว้จาก private keys ของคุณ",
   "restore_description_from_seed": "กู้คืนกระเป๋าเงินของคุณจากรหัสกู้คืนแบบชุดคำ 25 คำหรือ 13 คำ",
-  "restore_description_from_seed_keys": "กู้คืนกระเป๋าเงินของคุณจาก seed/keys ที่คุณได้บันทึกไว้ในที่ปลอดภัย",
+  "restore_description_from_seed_keys": "กู้คืนกระเป๋าเงินของคุณจาก seed phrase หรือ keys ที่คุณเคยบันทึกไว้",
   "restore_existing_wallet": "กู้คืนกระเป๋าเงินที่มีอยู่",
   "restore_from_date_or_blockheight": "โปรดป้อนวันที่ก่อนวันที่คุณสร้างกระเป๋าเงินนี้ไม่กี่วัน หรือหากคุณทราบ blockheight โปรดป้อนแทน",
   "restore_from_seed_placeholder": "โปรดป้อนหรือวางวลีกู้คืน (seed) ของคุณที่นี่",
@@ -849,12 +849,12 @@
   "restore_restore_wallet": "กู้คืนกระเป๋าเงิน",
   "restore_seed_keys_restore": "กู้คืน Seed/Keys",
   "restore_spend_key_private": "คีย์สำหรับใช้จ่าย (ส่วนตัว)",
-  "restore_title_from_backup": "กู้คืนจากข้อมูลสำรอง",
+  "restore_title_from_backup": "ไฟล์สำรองข้อมูล",
   "restore_title_from_cupcake": "แอป Cupcake",
-  "restore_title_from_hardware_wallet": "กู้คืนจากฮาร์ดแวร์วอลเล็ต",
+  "restore_title_from_hardware_wallet": "กระเป๋าฮาร์ดแวร์    ",
   "restore_title_from_keys": "กู้คืนจากคีย์",
   "restore_title_from_seed": "กู้คืนจาก Seed",
-  "restore_title_from_seed_keys": "กู้คืนจาก seed/keys",
+  "restore_title_from_seed_keys": "Seed หรือ Keys",
   "restore_view_key_private": "คีย์สำหรับดู (ส่วนตัว)",
   "restore_wallet": "กู้คืนกระเป๋าเงิน",
   "restore_wallet_name": "ชื่อวอลเล็ต",
@@ -872,7 +872,7 @@
   "savings": "เงินออม",
   "scan": "สแกน",
   "scan_one_block": "สแกน 1 บล็อก",
-  "scan_qr_code": "สแกนคิวอาร์โค้ด",
+  "scan_qr_code": "คิวอาร์โค้ด",
   "scan_qr_code_to_get_address": "สแกน QR code เพื่อรับที่อยู่",
   "scan_qr_on_device": "สแกนคิวอาร์โค้ดนี้บนอุปกรณ์อื่น",
   "search": "ค้นหา",
@@ -1370,4 +1370,4 @@
   "zcash_card_missing_funds": "ยอดเงินหายไป?",
   "zcash_card_scan": "สแกน",
   "zcash_card_warning": "อย่าปิดแอปจนกว่าขั้นตอนจะเสร็จสิ้น หากคุณปิดแอป กระบวนการนี้จะต้องเริ่มใหม่ตั้งแต่ต้น"
-}
+}

res/values/strings_tl.arb

@@ -834,12 +834,12 @@
   "restore_bitcoin_description_from_keys": "Ibalik ang iyong wallet mula sa nabuong WIF string gamit ang iyong mga private key",
   "restore_bitcoin_description_from_seed": "Ibalik ang iyong wallet gamit ang 24-salitang combination code",
   "restore_bitcoin_title_from_keys": "I-restore mula sa WIF",
-  "restore_description_from_backup": "Maaari mong ibalik ang buong Cake Wallet app mula sa iyong back-up file",
+  "restore_description_from_backup": "Ibalik ang Cake Wallet nang eksakto tulad ng dati sa pamamagitan ng pagpapanumbalik mula sa backup na file.",
   "restore_description_from_cupcake": "I-link sa aming kasamang naka-air-gapped na app, na naka-install sa pangalawang telepono.",
   "restore_description_from_hardware_wallet": "I-link ang iyong hardware wallet device mula sa iba't ibang mga tagagawa.",
   "restore_description_from_keys": "Ibalik ang iyong wallet mula sa mga nabuong keystroke na na-save mula sa iyong mga private key",
   "restore_description_from_seed": "Ibalik ang iyong wallet gamit ang alinman sa 25-salita o 13-salita na combination code",
-  "restore_description_from_seed_keys": "Ibalik ang iyong wallet gamit ang seed/keys na na-save mo sa isang ligtas na lugar",
+  "restore_description_from_seed_keys": "Ibalik ang iyong wallet mula sa seed phrase o mga susi na iyong nai-save na.",
   "restore_existing_wallet": "I-restore ang Umiiral na Wallet",
   "restore_from_date_or_blockheight": "Mangyaring maglagay ng petsa ilang araw bago mo ginawa ang wallet na ito. O kung alam mo ang blockheight, ilagay ito sa halip.",
   "restore_from_seed_placeholder": "Mangyaring ilagay o i-paste ang iyong seed dito",
@@ -849,12 +849,12 @@
   "restore_restore_wallet": "I-restore ang Wallet",
   "restore_seed_keys_restore": "Pag-restore ng Seed/Keys",
   "restore_spend_key_private": "Spend key (pribado)",
-  "restore_title_from_backup": "I-restore mula sa backup",
+  "restore_title_from_backup": "Backup na file",
   "restore_title_from_cupcake": "Cupcake App",
-  "restore_title_from_hardware_wallet": "I-restore mula sa hardware wallet",
+  "restore_title_from_hardware_wallet": "Hardware wallet    ",
   "restore_title_from_keys": "Ibalik mula sa mga key",
   "restore_title_from_seed": "I-restore mula sa seed",
-  "restore_title_from_seed_keys": "I-restore mula sa seed/keys",
+  "restore_title_from_seed_keys": "Seed o Mga Susi",
   "restore_view_key_private": "View key (pribado)",
   "restore_wallet": "I-restore ang Wallet",
   "restore_wallet_name": "Pangalan ng wallet",
@@ -872,7 +872,7 @@
   "savings": "Ipon",
   "scan": "I-scan",
   "scan_one_block": "I-scan ang isang block",
-  "scan_qr_code": "I-scan ang QR code",
+  "scan_qr_code": "QR code",
   "scan_qr_code_to_get_address": "I-scan ang QR code para makuha ang address",
   "scan_qr_on_device": "I-scan ang QR code na ito sa ibang device",
   "search": "Maghanap",
@@ -1370,4 +1370,4 @@
   "zcash_card_missing_funds": "Nawawalang pondo?",
   "zcash_card_scan": "I-scan",
   "zcash_card_warning": "Huwag isara ang app hanggang sa makumpleto ang proseso; kung gagawin mo ito, kakailanganing magsimula muli mula sa simula."
-}
+}

res/values/strings_tr.arb

@@ -834,12 +834,12 @@
   "restore_bitcoin_description_from_keys": "Cüzdanını, özel anahtarlarından oluşturulan WIF dizesinden geri yükle",
   "restore_bitcoin_description_from_seed": "Cüzdanınızı 24 kelimelik kurtarma ifadesinden geri yükleyin",
   "restore_bitcoin_title_from_keys": "WIF'ten geri yükle",
-  "restore_description_from_backup": "Yedek dosyanla tüm Cake Wallet uygulamasını geri yükleyebilirsin",
+  "restore_description_from_backup": "Bir yedek dosyasından geri yükleyerek Cake Wallet'ı tam olarak sahip olduğunuz gibi geri alın.",
   "restore_description_from_cupcake": "İkinci bir telefona yüklenen, eşlik eden air-gapped uygulamamızla bağlantı kurun.",
   "restore_description_from_hardware_wallet": "Çeşitli üreticilerin donanım cüzdan cihazınızı bağlayın.",
   "restore_description_from_keys": "Cüzdanınızı, özel anahtarlarınızdan kaydedilen oluşturulmuş tuş vuruşlarından geri yükleyin",
   "restore_description_from_seed": "Cüzdanınızı 25 veya 13 kelimelik kurtarma ifadesi kodundan geri yükleyin",
-  "restore_description_from_seed_keys": "Güvenli bir yere kaydettiğin tohum/anahtarlardan cüzdanını geri yükle",
+  "restore_description_from_seed_keys": "Cüzdanınızı daha önce kaydettiğiniz seed phrase veya anahtarlardan geri yükleyin.",
   "restore_existing_wallet": "Mevcut Cüzdanı Geri Yükle",
   "restore_from_date_or_blockheight": "Lütfen bu cüzdanı oluşturmadan birkaç gün önceki bir tarihi girin. Veya blok yüksekliğini biliyorsanız, bunun yerine lütfen onu girin",
   "restore_from_seed_placeholder": "Lütfen seed ifadenizi buraya girin veya yapıştırın",
@@ -849,12 +849,12 @@
   "restore_restore_wallet": "Cüzdanı Geri Yükle",
   "restore_seed_keys_restore": "Seed/Anahtarları Geri Yükle",
   "restore_spend_key_private": "Harcama anahtarı (özel)",
-  "restore_title_from_backup": "Yedekten geri yükle",
+  "restore_title_from_backup": "Yedek dosyası",
   "restore_title_from_cupcake": "Cupcake Uygulaması",
-  "restore_title_from_hardware_wallet": "Donanım cüzdanından geri yükle",
+  "restore_title_from_hardware_wallet": "Donanım cüzdanı    ",
   "restore_title_from_keys": "Anahtarlardan geri yükle",
   "restore_title_from_seed": "Seed'den geri yükle",
-  "restore_title_from_seed_keys": "Tohumdan/anahtarlardan geri yükle",
+  "restore_title_from_seed_keys": "Seed veya Anahtarlar",
   "restore_view_key_private": "Görüntüleme anahtarı (özel)",
   "restore_wallet": "Cüzdanı Geri Yükle",
   "restore_wallet_name": "Cüzdan adı",
@@ -872,7 +872,7 @@
   "savings": "Birikimler",
   "scan": "Tara",
   "scan_one_block": "Bir bloğu tara",
-  "scan_qr_code": "QR kodunu tara",
+  "scan_qr_code": "QR kodu",
   "scan_qr_code_to_get_address": "Adresi almak için QR kodunu tara",
   "scan_qr_on_device": "Bu QR kodunu başka bir cihazda tarayın",
   "search": "Ara",
@@ -1370,4 +1370,4 @@
   "zcash_card_missing_funds": "Bakiye eksik mi?",
   "zcash_card_scan": "Tara",
   "zcash_card_warning": "İşlem tamamlanana kadar uygulamayı kapatmayın; aksi takdirde bu işlemin baştan yeniden başlatılması gerekecektir."
-}
+}

res/values/strings_uk.arb

@@ -835,12 +835,12 @@
   "restore_bitcoin_description_from_keys": "Відновіть свій гаманець із згенерованого WIF-рядка з ваших приватних ключів",
   "restore_bitcoin_description_from_seed": "Відновіть свій гаманець за допомогою 24-слівної мнемонічної фрази",
   "restore_bitcoin_title_from_keys": "Відновити з WIF",
-  "restore_description_from_backup": "Ви можете відновити весь застосунок Cake Wallet із вашого резервного файлу",
+  "restore_description_from_backup": "Відновіть Cake Wallet у точно такому вигляді, яким він був, відновивши його з файлу резервної копії.",
   "restore_description_from_cupcake": "Зв’яжіться з нашим допоміжним air-gapped додатком, встановленим на другому телефоні.",
   "restore_description_from_hardware_wallet": "Підключіть пристрій апаратного гаманця від різних виробників.",
   "restore_description_from_keys": "Відновіть свій гаманець із згенерованих натискань клавіш, збережених із ваших приватних ключів",
   "restore_description_from_seed": "Відновіть свій гаманець за допомогою коду з комбінації 25 або 13 слів",
-  "restore_description_from_seed_keys": "Ви можете відновити гаманець із seed-фрази/ключів, які ви зберегли в безпечному місці",
+  "restore_description_from_seed_keys": "Відновіть гаманець із seed-фрази або ключів, які ви раніше зберегли.",
   "restore_existing_wallet": "Відновити наявний гаманець",
   "restore_from_date_or_blockheight": "Будь ласка, введіть дату за кілька днів до створення цього гаманця. Або, якщо ви знаєте висоту блоку, введіть її замість цього",
   "restore_from_seed_placeholder": "Будь ласка, введіть або вставте тут вашу сід-фразу",
@@ -850,12 +850,12 @@
   "restore_restore_wallet": "Відновити гаманець",
   "restore_seed_keys_restore": "Відновлення за допомогою seed-фрази/ключів",
   "restore_spend_key_private": "Ключ витрат (приватний)",
-  "restore_title_from_backup": "Відновити з резервної копії",
+  "restore_title_from_backup": "Файл резервної копії",
   "restore_title_from_cupcake": "Додаток Cupcake",
-  "restore_title_from_hardware_wallet": "Відновити з апаратного гаманця",
+  "restore_title_from_hardware_wallet": "Апаратний гаманець    ",
   "restore_title_from_keys": "Відновити з ключів",
   "restore_title_from_seed": "Відновити з seed-фрази",
-  "restore_title_from_seed_keys": "Відновити з seed/ключів",
+  "restore_title_from_seed_keys": "Seed або ключі",
   "restore_view_key_private": "Ключ перегляду (приватний)",
   "restore_wallet": "Відновити гаманець",
   "restore_wallet_name": "Назва гаманця",
@@ -873,7 +873,7 @@
   "savings": "Заощадження",
   "scan": "Сканувати",
   "scan_one_block": "Просканувати один блок",
-  "scan_qr_code": "Сканувати QR-код",
+  "scan_qr_code": "QR-код",
   "scan_qr_code_to_get_address": "Скануйте QR-код, щоб отримати адресу",
   "scan_qr_on_device": "Відскануйте цей QR-код на іншому пристрої",
   "search": "Пошук",
@@ -1371,4 +1371,4 @@
   "zcash_card_missing_funds": "Зникли кошти?",
   "zcash_card_scan": "Сканувати",
   "zcash_card_warning": "Не закривайте застосунок, доки процедура не завершиться. Якщо ви це зробите, цей процес потрібно буде перезапустити з нуля."
-}
+}

res/values/strings_ur.arb

@@ -836,12 +836,12 @@
   "restore_bitcoin_description_from_keys": "اپنی نجی کلیدوں سے تیار کردہ WIF سٹرنگ کے ذریعے اپنا والیٹ بحال کریں۔",
   "restore_bitcoin_description_from_seed": "24 الفاظ کے مجموعے کے کوڈ سے اپنا والیٹ بحال کریں",
   "restore_bitcoin_title_from_keys": "WIF سے بحال کریں",
-  "restore_description_from_backup": "آپ اپنی بیک اپ فائل سے پوری Cake Wallet ایپ کو بحال کر سکتے ہیں۔",
+  "restore_description_from_backup": "بیک اپ فائل سے بحال کر کے Cake Wallet کو بالکل ویسا واپس پائیں جیسا آپ کے پاس تھا۔",
   "restore_description_from_cupcake": "دوسرے فون پر نصب ہمارے ساتھی ایئر گیپڈ ایپ کے ساتھ لنک کریں۔",
   "restore_description_from_hardware_wallet": "متعدد مینوفیکچررز کے ہارڈ ویئر والیٹ ڈیوائسز میں سے اپنے ڈیوائس کو لنک کریں۔",
   "restore_description_from_keys": "اپنے بٹوے کو اپنی نجی کلیدوں سے محفوظ کردہ تیار کردہ کی اسٹروکس سے بحال کریں۔",
   "restore_description_from_seed": "اپنے والیٹ کو 25 الفاظ یا 13 الفاظ کے کمبینیشن کوڈ سے بحال کریں",
-  "restore_description_from_seed_keys": "اپنے بٹوے کو اس سیڈ/کیز سے بحال کریں جو آپ نے کسی محفوظ جگہ پر محفوظ کی ہیں۔",
+  "restore_description_from_seed_keys": "اپنے wallet کو پہلے سے محفوظ کردہ seed phrase یا keys سے بحال کریں۔",
   "restore_existing_wallet": "موجودہ والیٹ بحال کریں",
   "restore_from_date_or_blockheight": "براہ کرم یہ والیٹ بنانے سے چند دن پہلے کی تاریخ درج کریں۔ یا اگر آپ کو بلاک ہائٹ معلوم ہے تو براہ کرم اس کے بجائے وہ درج کریں۔",
   "restore_from_seed_placeholder": "براہ کرم اپنا سیڈ یہاں درج کریں یا پیسٹ کریں",
@@ -851,12 +851,12 @@
   "restore_restore_wallet": "والیٹ بحال کریں",
   "restore_seed_keys_restore": "سیڈ/کیز کی بحالی",
   "restore_spend_key_private": "اسپینڈ کی (نجی)",
-  "restore_title_from_backup": "بیک اپ سے بحال کریں",
+  "restore_title_from_backup": "بیک اپ فائل",
   "restore_title_from_cupcake": "کپ کیک ایپ",
-  "restore_title_from_hardware_wallet": "ہارڈ ویئر والیٹ سے بحال کریں",
+  "restore_title_from_hardware_wallet": "ہارڈویئر والیٹ    ",
   "restore_title_from_keys": "کلیدوں سے بحال کریں",
   "restore_title_from_seed": "سیڈ سے بحال کریں",
-  "restore_title_from_seed_keys": "سیڈ/کیز سے بحال کریں",
+  "restore_title_from_seed_keys": "Seed یا چابیاں",
   "restore_view_key_private": "ویو کی (نجی)",
   "restore_wallet": "والیٹ بحال کریں",
   "restore_wallet_name": "والیٹ کا نام",
@@ -874,7 +874,7 @@
   "savings": "بچت",
   "scan": "اسکین کریں",
   "scan_one_block": "ایک بلاک اسکین کریں",
-  "scan_qr_code": "QR کوڈ اسکین کریں",
+  "scan_qr_code": "QR کوڈ",
   "scan_qr_code_to_get_address": "ایڈریس حاصل کرنے کے لیے QR کوڈ اسکین کریں",
   "scan_qr_on_device": "اس QR کوڈ کو کسی دوسرے ڈیوائس پر اسکین کریں",
   "search": "تلاش کریں",
@@ -1372,4 +1372,4 @@
   "zcash_card_missing_funds": "فنڈز غائب ہیں؟",
   "zcash_card_scan": "اسکین کریں",
   "zcash_card_warning": "طریقہ کار مکمل ہونے تک ایپ بند نہ کریں۔ اگر آپ ایسا کریں گے تو یہ عمل شروع سے دوبارہ شروع کرنا پڑے گا۔"
-}
+}

res/values/strings_vi.arb

@@ -832,12 +832,12 @@
   "restore_bitcoin_description_from_keys": "Khôi phục ví của bạn từ chuỗi WIF được tạo từ các khóa riêng của bạn",
   "restore_bitcoin_description_from_seed": "Khôi phục ví của bạn từ cụm từ khôi phục gồm 24 từ",
   "restore_bitcoin_title_from_keys": "Khôi phục từ WIF",
-  "restore_description_from_backup": "Bạn có thể khôi phục toàn bộ ứng dụng Cake Wallet từ tệp sao lưu của bạn",
+  "restore_description_from_backup": "Khôi phục Cake Wallet về đúng trạng thái cũ bằng cách phục hồi từ tệp sao lưu.",
   "restore_description_from_cupcake": "Liên kết với ứng dụng đồng hành air-gapped của chúng tôi, được cài đặt trên điện thoại thứ hai.",
   "restore_description_from_hardware_wallet": "Liên kết thiết bị ví phần cứng của bạn từ nhiều nhà sản xuất khác nhau.",
   "restore_description_from_keys": "Khôi phục ví của bạn từ các phím gõ được tạo ra và lưu từ khóa riêng của bạn",
   "restore_description_from_seed": "Khôi phục ví của bạn từ cụm từ khôi phục gồm 25 từ hoặc 13 từ",
-  "restore_description_from_seed_keys": "Khôi phục ví của bạn từ cụm từ khôi phục/khóa mà bạn đã lưu ở nơi an toàn",
+  "restore_description_from_seed_keys": "Khôi phục ví của bạn từ cụm từ seed hoặc các khóa mà bạn đã lưu trước đó.",
   "restore_existing_wallet": "Khôi phục ví hiện có",
   "restore_from_date_or_blockheight": "Vui lòng nhập một ngày trước vài ngày so với thời điểm bạn tạo ví này. Hoặc nếu bạn biết blockheight, vui lòng nhập blockheight thay thế",
   "restore_from_seed_placeholder": "Vui lòng nhập hoặc dán cụm từ khôi phục của bạn vào đây",
@@ -847,12 +847,12 @@
   "restore_restore_wallet": "Khôi phục ví",
   "restore_seed_keys_restore": "Khôi phục Seed/Khóa",
   "restore_spend_key_private": "Khóa chi tiêu (khóa riêng tư)",
-  "restore_title_from_backup": "Khôi phục từ bản sao lưu",
+  "restore_title_from_backup": "Tệp sao lưu",
   "restore_title_from_cupcake": "Ứng dụng Cupcake",
-  "restore_title_from_hardware_wallet": "Khôi phục từ ví phần cứng",
+  "restore_title_from_hardware_wallet": "Ví phần cứng    ",
   "restore_title_from_keys": "Khôi phục từ khóa",
   "restore_title_from_seed": "Khôi phục từ cụm từ khôi phục",
-  "restore_title_from_seed_keys": "Khôi phục từ seed/khóa",
+  "restore_title_from_seed_keys": "Seed hoặc Khóa",
   "restore_view_key_private": "Khóa xem (riêng tư)",
   "restore_wallet": "Khôi phục ví",
   "restore_wallet_name": "Tên ví",
@@ -870,7 +870,7 @@
   "savings": "Tiết kiệm",
   "scan": "Quét",
   "scan_one_block": "Quét một khối",
-  "scan_qr_code": "Quét mã QR",
+  "scan_qr_code": "Mã QR",
   "scan_qr_code_to_get_address": "Quét mã QR để lấy địa chỉ",
   "scan_qr_on_device": "Quét mã QR này trên một thiết bị khác",
   "search": "Tìm kiếm",
@@ -1367,4 +1367,4 @@
   "zcash_card_missing_funds": "Thiếu tiền?",
   "zcash_card_scan": "Quét",
   "zcash_card_warning": "Không đóng ứng dụng cho đến khi quy trình hoàn tất; nếu bạn làm vậy, quy trình này sẽ phải bắt đầu lại từ đầu."
-}
+}

res/values/strings_yo.arb

@@ -835,12 +835,12 @@
   "restore_bitcoin_description_from_keys": "Mú àpamọ́wọ́ yín padà láti ọ̀rọ̀ WIF tí a ti dá láti àwọn kọ́kọ́rọ́ àdáni yín",
   "restore_bitcoin_description_from_seed": "Mú àpamọ́wọ́ yín padà láti inú kóòdù àkòpọ̀ ọ̀rọ̀ 24",
   "restore_bitcoin_title_from_keys": "Mú padà bò láti WIF",
-  "restore_description_from_backup": "Ẹ lè tún gbogbo àpù Cake Wallet ṣe láti inú fáìlì àfipamọ́ yín.",
+  "restore_description_from_backup": "Gba Cake Wallet padà gẹ́gẹ́ bí o ṣe ní rẹ̀ nípa mímú padà láti fáìlì afẹyìntí.",
   "restore_description_from_cupcake": "So pọ̀ mọ́ ohun elo alábàáṣiṣẹ́ wa tí kò ní asopọ̀ (air-gapped), tí a fi sílẹ̀ lórí fónù kejì.",
   "restore_description_from_hardware_wallet": "So ẹrọ apamọwọ hardware rẹ pọ̀ láti ọ̀dọ̀ oríṣìíríṣìí àwọn aṣelọpọ.",
   "restore_description_from_keys": "Mú àpamọ́wọ́ yín padà láti àwọn gbolóhùn ìmúpadàbọ̀ tí a dá sílẹ̀ tí ẹ ti fipamọ́ láti inú àwọn kọ́kọ́rọ́ àdáni yín",
   "restore_description_from_seed": "Mu àpamọ́wọ́ rẹ padà láti inú kóòdù àkójọpọ̀ ọ̀rọ̀ 25 tàbí 13",
-  "restore_description_from_seed_keys": "Gba àpamọ́wọ́ rẹ padà láti inú seed/kọ́kọ́rọ́ tí o ti pamọ́ sí ibi ààbò",
+  "restore_description_from_seed_keys": "Mú padà wọ́lẹ́tì rẹ láti inú gbolohun seed tàbí àwọn kọ́kọ́rọ́ tí o ti tọ́jú rẹ̀ tẹ́lẹ̀.",
   "restore_existing_wallet": "Mu apamọwọ tó wà tẹ́lẹ̀ padà",
   "restore_from_date_or_blockheight": "Ẹ jọ̀wọ́, tẹ ọjọ́ kan tí ó jẹ́ ọjọ́ díẹ̀ ṣáájú ìgbà tí ẹ dá àpamọ́wọ́ yìí. Tàbí bí ẹ bá mọ blockheight, ẹ jọ̀wọ́ tẹ̀ é dípò rẹ̀.",
   "restore_from_seed_placeholder": "Jọ̀wọ́ tẹ̀ tàbí lẹ́ẹ̀ mọ́ irúgbìn (seed) rẹ síbí",
@@ -850,12 +850,12 @@
   "restore_restore_wallet": "Mu Apamọwọ pada",
   "restore_seed_keys_restore": "Ìmúpadàbọ̀ Seed/Keys",
   "restore_spend_key_private": "Kọ́kọ́rọ́ ìnáwó (àdáni)",
-  "restore_title_from_backup": "Mu padà láti inú ẹ̀dà afẹ́yinti",
+  "restore_title_from_backup": "Fáìlì afẹyìntí",
   "restore_title_from_cupcake": "Ohun elo Cupcake",
-  "restore_title_from_hardware_wallet": "Mu pada lati apamọwọ hardware",
+  "restore_title_from_hardware_wallet": "Hardware wallet    ",
   "restore_title_from_keys": "Mu padà láti inú àwọn kọ́kọ́rọ́",
   "restore_title_from_seed": "Mù pàdà padà",
-  "restore_title_from_seed_keys": "Mu padà láti inú seed/àwọn kọ́kọ́rọ́",
+  "restore_title_from_seed_keys": "Seed tàbí Àwọn Kọ́kọ́rọ́",
   "restore_view_key_private": "Bọtini ìwò (àdáni)",
   "restore_wallet": "Mu Wallet pada",
   "restore_wallet_name": "Orúkọ Wallet",
@@ -873,7 +873,7 @@
   "savings": "Ifipamọ",
   "scan": "Ṣe àyẹ̀wò",
   "scan_one_block": "Ṣàwárí bulọki kan",
-  "scan_qr_code": "Ṣàwárí kóòdù QR",
+  "scan_qr_code": "Kóòdù QR",
   "scan_qr_code_to_get_address": "Ṣe àyẹ̀wò kóòdù QR náà láti gba àdírẹ́sì náà",
   "scan_qr_on_device": "Ṣe àyẹ̀wò kóòdù QR yìí lórí ẹ̀rọ mìíràn",
   "search": "Wádìí",
@@ -1371,4 +1371,4 @@
   "zcash_card_missing_funds": "Ṣe owó rẹ sọnù?",
   "zcash_card_scan": "Ṣàwárí",
   "zcash_card_warning": "Maṣe pa ohun elo naa titi ilana naa yoo fi pari; bí o bá ṣe bẹ́ẹ̀, ilana yìí yóò ní láti tún bẹ̀rẹ̀ láti ìbẹ̀rẹ̀."
-}
+}

res/values/strings_zh.arb

@@ -834,12 +834,12 @@
   "restore_bitcoin_description_from_keys": "从由私钥生成的WIF字符串恢复您的钱包",
   "restore_bitcoin_description_from_seed": "使用 24 个单词组合码恢复您的钱包",
   "restore_bitcoin_title_from_keys": "从 WIF 恢复",
-  "restore_description_from_backup": "您可以通过备份文件恢复整个 Cake Wallet 应用",
+  "restore_description_from_backup": "通过从备份文件恢复，将 Cake Wallet 完全还原为原来的状态。",
   "restore_description_from_cupcake": "与我们配套的隔离网络（air-gapped）应用配对，该应用安装在第二部手机上。",
   "restore_description_from_hardware_wallet": "连接来自不同制造商的硬件钱包设备。",
   "restore_description_from_keys": "从由私钥生成并保存的按键序列恢复你的钱包",
   "restore_description_from_seed": "使用 25 个词或 13 个词的组合码恢复你的钱包",
-  "restore_description_from_seed_keys": "通过你保存在安全地方的助记词/密钥找回钱包",
+  "restore_description_from_seed_keys": "通过您之前保存的 seed 短语或密钥恢复您的钱包。",
   "restore_existing_wallet": "恢复现有钱包",
   "restore_from_date_or_blockheight": "请输入一个早于您创建此钱包日期几天的日期。或者如果您知道区块高度，请改为输入区块高度",
   "restore_from_seed_placeholder": "请在此处输入或粘贴您的助记词",
@@ -849,12 +849,12 @@
   "restore_restore_wallet": "恢复钱包",
   "restore_seed_keys_restore": "助记词/密钥恢复",
   "restore_spend_key_private": "支出密钥（私密）",
-  "restore_title_from_backup": "从备份恢复",
+  "restore_title_from_backup": "备份文件",
   "restore_title_from_cupcake": "Cupcake 应用",
-  "restore_title_from_hardware_wallet": "从硬件钱包恢复",
+  "restore_title_from_hardware_wallet": "硬件钱包    ",
   "restore_title_from_keys": "从密钥恢复",
   "restore_title_from_seed": "从助记词恢复",
-  "restore_title_from_seed_keys": "从助记词/密钥恢复",
+  "restore_title_from_seed_keys": "助记词或密钥",
   "restore_view_key_private": "查看密钥（私密）",
   "restore_wallet": "恢复钱包",
   "restore_wallet_name": "钱包名称",
@@ -872,7 +872,7 @@
   "savings": "储蓄",
   "scan": "扫描",
   "scan_one_block": "扫描一个区块",
-  "scan_qr_code": "扫描二维码",
+  "scan_qr_code": "二维码",
   "scan_qr_code_to_get_address": "扫描二维码以获取地址",
   "scan_qr_on_device": "在另一台设备上扫描此二维码",
   "search": "搜索",
@@ -1370,4 +1370,4 @@
   "zcash_card_missing_funds": "资金不见了？",
   "zcash_card_scan": "扫描",
   "zcash_card_warning": "在该过程完成之前请勿关闭应用程序，否则该过程将需要从头重新开始。"
-}
+}

res/values/strings_zh_tw.arb

@@ -719,12 +719,12 @@
   "restore_bitcoin_description_from_keys": "從由您的私鑰生成的 WIF 字串還原您的錢包",
   "restore_bitcoin_description_from_seed": "使用 24 個單字組合碼恢復您的錢包",
   "restore_bitcoin_title_from_keys": "從 WIF 復原",
-  "restore_description_from_backup": "您可以從備份檔案還原整個 Cake Wallet 應用程式",
+  "restore_description_from_backup": "透過從備份檔案還原，將 Cake Wallet 完全恢復為原本的狀態。",
   "restore_description_from_cupcake": "與我們的配套離線隔離應用程式連結，安裝在第二台手機上。",
   "restore_description_from_hardware_wallet": "連結來自不同製造商的硬體錢包裝置。",
   "restore_description_from_keys": "從由私鑰產生並儲存的密鑰按鍵序列還原您的錢包",
   "restore_description_from_seed": "使用 25 詞或 13 詞組合碼恢復錢包",
-  "restore_description_from_seed_keys": "從你保存在安全地方的助記詞/金鑰取回錢包",
+  "restore_description_from_seed_keys": "透過您先前儲存的 seed 短語或金鑰來還原您的錢包。",
   "restore_existing_wallet": "還原現有錢包",
   "restore_from_date_or_blockheight": "請輸入您建立此錢包前幾天的日期。或者，如果您知道區塊高度，請改為輸入區塊高度",
   "restore_from_seed_placeholder": "請在此輸入或貼上您的助記詞",
@@ -734,12 +734,12 @@
   "restore_restore_wallet": "還原錢包",
   "restore_seed_keys_restore": "助記詞/金鑰復原",
   "restore_spend_key_private": "支出金鑰（私密）",
-  "restore_title_from_backup": "從備份還原",
+  "restore_title_from_backup": "備份檔案",
   "restore_title_from_cupcake": "Cupcake 應用程式",
-  "restore_title_from_hardware_wallet": "從硬體錢包復原",
+  "restore_title_from_hardware_wallet": "硬體錢包    ",
   "restore_title_from_keys": "從金鑰還原",
   "restore_title_from_seed": "從助記詞復原",
-  "restore_title_from_seed_keys": "從助記詞/金鑰還原",
+  "restore_title_from_seed_keys": "助記詞或金鑰",
   "restore_view_key_private": "查看金鑰（私密）",
   "restore_wallet": "還原錢包",
   "restore_wallet_name": "錢包名稱",
@@ -752,7 +752,7 @@
   "save_to_downloads": "儲存到下載資料夾",
   "saved_the_trade_id": "我已儲存交易 ID",
   "scan_one_block": "掃描一個區塊",
-  "scan_qr_code": "掃描 QR code",
+  "scan_qr_code": "QR碼",
   "scan_qr_code_to_get_address": "掃描 QR 碼以取得地址",
   "scan_qr_on_device": "在另一台裝置上掃描此 QR 碼",
   "search": "搜尋",
@@ -1174,4 +1174,4 @@
   "youCanGoBackToYourDapp": "您現在可以返回您的 dApp",
   "your": "您的",
   "yy": "YY"
-}
+}

scripts/android/app_env.sh

@@ -14,15 +14,15 @@ TYPES=($MONERO_COM $CAKEWALLET)
 APP_ANDROID_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="6.1.0"
-MONERO_COM_BUILD_NUMBER=4157
+MONERO_COM_VERSION="6.1.2"
+MONERO_COM_BUILD_NUMBER=4158
 MONERO_COM_BUNDLE_ID="com.monero.app"
 MONERO_COM_PACKAGE="com.monero.app"
 MONERO_COM_SCHEME="monero.com"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="6.1.0"
-CAKEWALLET_BUILD_NUMBER=4408
+CAKEWALLET_VERSION="6.1.2"
+CAKEWALLET_BUILD_NUMBER=4410
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
 CAKEWALLET_SCHEME="cakewallet"

scripts/ios/app_env.sh

@@ -12,13 +12,13 @@ TYPES=($MONERO_COM $CAKEWALLET)
 APP_IOS_TYPE=$1
 
 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="6.1.0"
-MONERO_COM_BUILD_NUMBER=162
+MONERO_COM_VERSION="6.1.2"
+MONERO_COM_BUILD_NUMBER=163
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
 
 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="6.1.0"
-CAKEWALLET_BUILD_NUMBER=416
+CAKEWALLET_VERSION="6.1.2"
+CAKEWALLET_BUILD_NUMBER=418
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
 
 

tool/configure.dart

@@ -490,9 +490,9 @@ WalletCredentials createMoneroNewWalletCredentials({required String name, requir
 
 abstract class MoneroSubaddressList {
   ObservableList<Subaddress> get subaddresses;
-  void update(Object wallet, {required int accountIndex});
+  Future<void> update(Object wallet, {required int accountIndex});
   void refresh(Object wallet, {required int accountIndex});
-  List<Subaddress> getAll(Object wallet);
+  Future<List<Subaddress>> getAll(Object wallet);
   Future<void> addSubaddress(Object wallet, {required int accountIndex, required String label});
   Future<void> setLabelSubaddress(Object wallet,
       {required int accountIndex, required int addressIndex, required String label});