Merge branch 'main' into CW-438-add-nano

2025-01-10 21:04:53 +00:00 · 2023-08-22 19:28:57 -04:00 · 2023-08-22 19:28:57 -04:00 · 8e9c485b2b
commit 8e9c485b2b
parent 53a1ffe40f 43cf8a896e
37 changed files with 174 additions and 154 deletions
--- a/lib/buy/onramper/onramper_buy_provider.dart
+++ b/lib/buy/onramper/onramper_buy_provider.dart
@ -1,8 +1,10 @@
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
+import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/store/settings_store.dart';
-import 'package:cake_wallet/themes/theme_base.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cw_core/wallet_base.dart';
+import 'package:flutter/material.dart';

 class OnRamperBuyProvider {
  OnRamperBuyProvider({required SettingsStore settingsStore, required WalletBase wallet})
@ -29,7 +31,11 @@ class OnRamperBuyProvider {
    }
  }

-  Uri requestUrl() {
+  String getColorStr(Color color) {
+    return color.value.toRadixString(16).replaceAll(RegExp(r'^ff'), "");
+  }
+
+  Uri requestUrl(BuildContext context) {
    String primaryColor,
        secondaryColor,
        primaryTextColor,
@ -37,31 +43,16 @@ class OnRamperBuyProvider {
        containerColor,
        cardColor;

-    switch (_settingsStore.currentTheme.type) {
-      case ThemeType.bright:
-        primaryColor = '815dfbff';
-        secondaryColor = 'ffffff';
-        primaryTextColor = '141519';
-        secondaryTextColor = '6b6f80';
-        containerColor = 'ffffff';
-        cardColor = 'f2f0faff';
-        break;
-      case ThemeType.light:
-        primaryColor = '2194ffff';
-        secondaryColor = 'ffffff';
-        primaryTextColor = '141519';
-        secondaryTextColor = '6b6f80';
-        containerColor = 'ffffff';
-        cardColor = 'e5f7ff';
-        break;
-      case ThemeType.dark:
-        primaryColor = '456effff';
-        secondaryColor = '1b2747ff';
-        primaryTextColor = 'ffffff';
-        secondaryTextColor = 'ffffff';
-        containerColor = '19233C';
-        cardColor = '232f4fff';
-        break;
+    primaryColor = getColorStr(Theme.of(context).primaryColor);
+    secondaryColor = getColorStr(Theme.of(context).colorScheme.background);
+    primaryTextColor = getColorStr(Theme.of(context).extension<CakeTextTheme>()!.titleColor);
+    secondaryTextColor =
+        getColorStr(Theme.of(context).extension<CakeTextTheme>()!.secondaryTextColor);
+    containerColor = getColorStr(Theme.of(context).colorScheme.background);
+    cardColor = getColorStr(Theme.of(context).cardColor);
+
+    if (_settingsStore.currentTheme.title == S.current.high_contrast_theme) {
+      cardColor = getColorStr(Colors.white);
    }

    final networkName = _wallet.currency.fullName?.toUpperCase().replaceAll(" ", "");
--- a/lib/entities/main_actions.dart
+++ b/lib/entities/main_actions.dart
@ -51,7 +51,7 @@ class MainActions {
        case WalletType.banano:
        case WalletType.monero:
          if (viewModel.isEnabledBuyAction) {
-            final uri = getIt.get<OnRamperBuyProvider>().requestUrl();
+            final uri = getIt.get<OnRamperBuyProvider>().requestUrl(context);
            if (DeviceInfo.instance.isMobile) {
              Navigator.of(context)
                  .pushNamed(Routes.webViewPage, arguments: [S.of(context).buy, uri]);
--- a/lib/src/screens/backup/backup_page.dart
+++ b/lib/src/screens/backup/backup_page.dart
@ -127,9 +127,9 @@ class BackupPage extends BasePage {
        builder: (dialogContext) {
          return AlertWithTwoActions(
              alertTitle: S.of(context).export_backup,
-              alertContent: 'Please select destination for the backup file.',
-              rightButtonText: 'Save to Downloads',
-              leftButtonText: 'Share',
+              alertContent: S.of(context).select_destination,
+              rightButtonText: S.of(context).save_to_downloads,
+              leftButtonText:S.of(context).share,
              actionRightButton: () async {
                final permission = await Permission.storage.request();

--- a/lib/src/screens/contact/contact_list_page.dart
+++ b/lib/src/screens/contact/contact_list_page.dart
@ -1,6 +1,7 @@
 import 'package:cake_wallet/core/auth_service.dart';
 import 'package:cake_wallet/entities/contact_base.dart';
 import 'package:cake_wallet/entities/contact_record.dart';
+import 'package:cake_wallet/themes/extensions/cake_text_theme.dart';
 import 'package:cake_wallet/themes/extensions/exchange_page_theme.dart';
 import 'package:cake_wallet/utils/show_bar.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
@ -39,7 +40,7 @@ class ContactListPage extends BasePage {
          children: <Widget>[
            Icon(
              Icons.add,
-              color: Theme.of(context).dialogTheme.backgroundColor,
+              color: Theme.of(context).appBarTheme.titleTextStyle!.color,
              size: 22.0,
            ),
            ButtonTheme(
@ -71,7 +72,7 @@ class ContactListPage extends BasePage {
  @override
  Widget body(BuildContext context) {
    return Container(
-        padding: EdgeInsets.only(top: 20.0, bottom: 20.0),
+        padding: EdgeInsets.all(20.0),
        child: Observer(builder: (_) {
          final contacts = contactListViewModel.contactsToShow;
          final walletContacts = contactListViewModel.walletContactsToShow;
@ -131,7 +132,6 @@ class ContactListPage extends BasePage {
        }
      },
      child: Container(
-        color: Colors.transparent,
        padding: const EdgeInsets.only(top: 16, bottom: 16, right: 24),
        child: Row(
          mainAxisSize: MainAxisSize.min,
@ -146,7 +146,7 @@ class ContactListPage extends BasePage {
                style: TextStyle(
                  fontSize: 14,
                  fontWeight: FontWeight.normal,
-                  color: Theme.of(context).dialogTheme.backgroundColor,
+                  color: Theme.of(context).extension<CakeTextTheme>()!.titleColor,
                ),
              ),
            ))
--- a/lib/src/screens/dashboard/widgets/address_page.dart
+++ b/lib/src/screens/dashboard/widgets/address_page.dart
@ -182,9 +182,8 @@ class AddressPage extends BasePage {
                      decoration: BoxDecoration(
                          borderRadius: BorderRadius.all(Radius.circular(25)),
                          border: Border.all(
-                              color: Theme.of(context)
-                                  .extension<ReceivePageTheme>()!
-                                  .iconsBackgroundColor,
+                              color:
+                                  Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
                              width: 1),
                          color: Theme.of(context)
                              .extension<SyncIndicatorTheme>()!
@ -202,13 +201,12 @@ class AddressPage extends BasePage {
                                        fontSize: 14,
                                        fontWeight: FontWeight.w500,
                                        color: Theme.of(context)
-                                            .extension<DashboardPageTheme>()!
-                                            .textColor),
+                                            .extension<SyncIndicatorTheme>()!.textColor),
                                  )),
                          Icon(
                            Icons.arrow_forward_ios,
                            size: 14,
-                            color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
+                            color: Theme.of(context).extension<SyncIndicatorTheme>()!.textColor,
                          )
                        ],
                      ),
--- a/lib/src/screens/dashboard/widgets/balance_page.dart
+++ b/lib/src/screens/dashboard/widgets/balance_page.dart
@ -2,7 +2,6 @@ import 'package:cake_wallet/routes.dart';
 import 'package:cake_wallet/src/screens/exchange_trade/information_page.dart';
 import 'package:cake_wallet/store/settings_store.dart';
 import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
-import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/feature_flag.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:flutter/material.dart';
@ -77,9 +76,7 @@ class BalancePage extends StatelessWidget {
                  return IntroducingCard(
                      title: S.of(context).introducing_cake_pay,
                      subTitle: S.of(context).cake_pay_learn_more,
-                      borderColor: settingsStore.currentTheme.type == ThemeType.bright
-                          ? Color.fromRGBO(255, 255, 255, 0.2)
-                          : Colors.transparent,
+                      borderColor: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
                      closeCard: dashboardViewModel.balanceViewModel.disableIntroCakePayCard);
                }
                return Container();
@ -139,9 +136,7 @@ class BalancePage extends StatelessWidget {
      decoration: BoxDecoration(
        borderRadius: BorderRadius.circular(30.0),
        border: Border.all(
-          color: settingsStore.currentTheme.type == ThemeType.bright
-              ? Color.fromRGBO(255, 255, 255, 0.2)
-              : Colors.transparent,
+          color: Theme.of(context).extension<BalancePageTheme>()!.cardBorderColor,
          width: 1,
        ),
        color: Theme.of(context).extension<SyncIndicatorTheme>()!.syncedBackgroundColor,
@ -282,7 +277,7 @@ class BalancePage extends StatelessWidget {
                      fontSize: 20,
                      fontFamily: 'Lato',
                      fontWeight: FontWeight.w400,
-                      color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
+                      color: Theme.of(context).extension<BalancePageTheme>()!.assetTitleColor,
                      height: 1,
                    ),
                    maxLines: 1,
@ -296,7 +291,7 @@ class BalancePage extends StatelessWidget {
                      fontSize: 12,
                      fontFamily: 'Lato',
                      fontWeight: FontWeight.w400,
-                      color: Theme.of(context).extension<DashboardPageTheme>()!.textColor,
+                      color: Theme.of(context).extension<BalancePageTheme>()!.textColor,
                      height: 1,
                    ),
                  ),
--- a/lib/src/screens/exchange/exchange_page.dart
+++ b/lib/src/screens/exchange/exchange_page.dart
@ -5,6 +5,7 @@ import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/desktop_exchange_cards_section.dart';
 import 'package:cake_wallet/src/screens/exchange/widgets/mobile_exchange_cards_section.dart';
 import 'package:cake_wallet/src/widgets/add_template_button.dart';
+import 'package:cake_wallet/themes/extensions/send_page_theme.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/utils/debounce.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
@ -629,7 +630,7 @@ class ExchangePage extends BasePage {
              },
              imageArrow: arrowBottomPurple,
              currencyButtonColor: Colors.transparent,
-              addressButtonsColor: Theme.of(context).focusColor,
+              addressButtonsColor: Theme.of(context).extension<SendPageTheme>()!.textFieldButtonColor,
              borderColor: Theme.of(context).extension<ExchangePageTheme>()!.textFieldBorderTopPanelColor,
              currencyValueValidator: (value) {
                return !exchangeViewModel.isFixedRateMode
@ -677,7 +678,7 @@ class ExchangePage extends BasePage {
                  exchangeViewModel.changeReceiveCurrency(currency: currency),
              imageArrow: arrowBottomCakeGreen,
              currencyButtonColor: Colors.transparent,
-              addressButtonsColor: Theme.of(context).focusColor,
+              addressButtonsColor: Theme.of(context).extension<SendPageTheme>()!.textFieldButtonColor,
              borderColor: Theme.of(context).extension<ExchangePageTheme>()!.textFieldBorderBottomPanelColor,
              currencyValueValidator: (value) {
                return exchangeViewModel.isFixedRateMode
--- a/lib/src/widgets/search_bar_widget.dart
+++ b/lib/src/widgets/search_bar_widget.dart
@ -17,24 +17,21 @@ class SearchBarWidget extends StatelessWidget {
  Widget build(BuildContext context) {
    return TextFormField(
      controller: searchController,
-      style: TextStyle(
-          color: Theme.of(context).extension<PickerTheme>()!.searchTextColor),
+      style: TextStyle(color: Theme.of(context).extension<PickerTheme>()!.searchTextColor),
      decoration: InputDecoration(
        hintText: hintText ?? S.of(context).search_currency,
-        hintStyle: TextStyle(
-            color: Theme.of(context).extension<PickerTheme>()!.searchHintColor),
+        hintStyle: TextStyle(color: Theme.of(context).extension<PickerTheme>()!.searchHintColor),
        prefixIcon: Image.asset("assets/images/search_icon.png",
            color: Theme.of(context).extension<PickerTheme>()!.searchIconColor),
        filled: true,
-        fillColor: Theme.of(context)
-            .extension<PickerTheme>()!
-            .searchBackgroundFillColor,
+        fillColor: Theme.of(context).extension<PickerTheme>()!.searchBackgroundFillColor,
        alignLabelWithHint: false,
        contentPadding: const EdgeInsets.symmetric(vertical: 4, horizontal: 16),
        enabledBorder: OutlineInputBorder(
            borderRadius: BorderRadius.circular(borderRadius),
-            borderSide: const BorderSide(
-              color: Colors.transparent,
+            borderSide: BorderSide(
+              color: Theme.of(context).extension<PickerTheme>()!.searchBorderColor ??
+                  Colors.transparent,
            )),
        focusedBorder: OutlineInputBorder(
            borderRadius: BorderRadius.circular(borderRadius),
--- a/lib/themes/extensions/picker_theme.dart
+++ b/lib/themes/extensions/picker_theme.dart
@ -6,13 +6,15 @@ class PickerTheme extends ThemeExtension<PickerTheme> {
  final Color searchBackgroundFillColor;
  final Color searchTextColor;
  final Color? searchHintColor;
+  final Color? searchBorderColor;

  PickerTheme(
      {required this.dividerColor,
      this.searchIconColor,
      required this.searchBackgroundFillColor,
      required this.searchTextColor,
-      this.searchHintColor});
+      this.searchHintColor,
+      this.searchBorderColor});

  @override
  PickerTheme copyWith(
@ -20,14 +22,15 @@ class PickerTheme extends ThemeExtension<PickerTheme> {
          Color? searchIconColor,
          Color? searchBackgroundFillColor,
          Color? searchTextColor,
-          Color? searchHintColor}) =>
+          Color? searchHintColor,
+          Color? searchBorderColor}) =>
      PickerTheme(
          dividerColor: dividerColor ?? this.dividerColor,
          searchIconColor: searchIconColor ?? this.searchIconColor,
-          searchBackgroundFillColor:
-              searchBackgroundFillColor ?? this.searchBackgroundFillColor,
+          searchBackgroundFillColor: searchBackgroundFillColor ?? this.searchBackgroundFillColor,
          searchTextColor: searchTextColor ?? this.searchTextColor,
-          searchHintColor: searchHintColor ?? this.searchHintColor);
+          searchHintColor: searchHintColor ?? this.searchHintColor,
+          searchBorderColor: searchBorderColor ?? this.searchBorderColor);

  @override
  PickerTheme lerp(ThemeExtension<PickerTheme>? other, double t) {
@ -36,19 +39,14 @@ class PickerTheme extends ThemeExtension<PickerTheme> {
    }

    return PickerTheme(
-        dividerColor:
-            Color.lerp(dividerColor, other.dividerColor, t) ?? dividerColor,
-        searchIconColor:
-            Color.lerp(searchIconColor, other.searchIconColor, t) ??
-                searchIconColor,
-        searchBackgroundFillColor: Color.lerp(searchBackgroundFillColor,
-                other.searchBackgroundFillColor, t) ??
-            searchBackgroundFillColor,
-        searchTextColor:
-            Color.lerp(searchTextColor, other.searchTextColor, t) ??
-                searchTextColor,
-        searchHintColor:
-            Color.lerp(searchHintColor, other.searchHintColor, t) ??
-                searchHintColor);
+        dividerColor: Color.lerp(dividerColor, other.dividerColor, t) ?? dividerColor,
+        searchIconColor: Color.lerp(searchIconColor, other.searchIconColor, t) ?? searchIconColor,
+        searchBackgroundFillColor:
+            Color.lerp(searchBackgroundFillColor, other.searchBackgroundFillColor, t) ??
+                searchBackgroundFillColor,
+        searchTextColor: Color.lerp(searchTextColor, other.searchTextColor, t) ?? searchTextColor,
+        searchHintColor: Color.lerp(searchHintColor, other.searchHintColor, t) ?? searchHintColor,
+        searchBorderColor:
+            Color.lerp(searchBorderColor, other.searchBorderColor, t) ?? searchBorderColor);
  }
 }
--- a/lib/themes/high_contrast_theme.dart
+++ b/lib/themes/high_contrast_theme.dart
@ -39,14 +39,12 @@ class HighContrastTheme extends MoneroLightTheme {

  @override
  CakeTextTheme get cakeTextTheme => super.cakeTextTheme.copyWith(
-      buttonTextColor: Colors.white,
-      buttonSecondaryTextColor: Colors.white.withOpacity(0.5));
+      buttonTextColor: Colors.white, buttonSecondaryTextColor: Colors.white.withOpacity(0.5));

  @override
-  SyncIndicatorTheme get syncIndicatorStyle =>
-      super.syncIndicatorStyle.copyWith(
-          textColor: colorScheme.background,
-          syncedBackgroundColor: containerColor);
+  SyncIndicatorTheme get syncIndicatorStyle => super
+      .syncIndicatorStyle
+      .copyWith(textColor: colorScheme.background, syncedBackgroundColor: containerColor);

  @override
  BalancePageTheme get balancePageTheme => super.balancePageTheme.copyWith(
@ -56,32 +54,28 @@ class HighContrastTheme extends MoneroLightTheme {
      balanceAmountColor: Colors.white);

  @override
-  DashboardPageTheme get dashboardPageTheme =>
-      super.dashboardPageTheme.copyWith(
-          textColor: Colors.black,
-          cardTextColor: Colors.white,
-          mainActionsIconColor: Colors.white,
-          indicatorDotTheme: IndicatorDotTheme(
-              indicatorColor: Colors.grey, activeIndicatorColor: Colors.black));
+  DashboardPageTheme get dashboardPageTheme => super.dashboardPageTheme.copyWith(
+      textColor: Colors.black,
+      cardTextColor: Colors.white,
+      mainActionsIconColor: Colors.white,
+      indicatorDotTheme:
+          IndicatorDotTheme(indicatorColor: Colors.grey, activeIndicatorColor: Colors.black));

  @override
-  ExchangePageTheme get exchangePageTheme => super
-      .exchangePageTheme
-      .copyWith(firstGradientTopPanelColor: containerColor);
+  ExchangePageTheme get exchangePageTheme => super.exchangePageTheme.copyWith(
+      firstGradientTopPanelColor: primaryColor, firstGradientBottomPanelColor: containerColor);

  @override
  SendPageTheme get sendPageTheme => super.sendPageTheme.copyWith(
      templateTitleColor: Colors.white,
      templateBackgroundColor: Colors.black,
-      firstGradientColor: containerColor);
+      firstGradientColor: primaryColor);

  @override
-  AddressTheme get addressTheme =>
-      super.addressTheme.copyWith(actionButtonColor: Colors.grey);
+  AddressTheme get addressTheme => super.addressTheme.copyWith(actionButtonColor: Colors.grey);

  @override
-  FilterTheme get filterTheme =>
-      super.filterTheme.copyWith(iconColor: Colors.white);
+  FilterTheme get filterTheme => super.filterTheme.copyWith(iconColor: Colors.white);

  @override
  CakeMenuTheme get menuTheme => super.menuTheme.copyWith(
@ -91,10 +85,11 @@ class HighContrastTheme extends MoneroLightTheme {

  @override
  PickerTheme get pickerTheme => super.pickerTheme.copyWith(
-      searchIconColor: Colors.white,
-      searchHintColor: Colors.white,
-      searchTextColor: Colors.white,
-      searchBackgroundFillColor: Colors.grey);
+      searchIconColor: primaryColor,
+      searchHintColor: primaryColor,
+      searchTextColor: primaryColor,
+      searchBackgroundFillColor: Colors.white,
+      searchBorderColor: primaryColor);

  @override
  AccountListTheme get accountListTheme => super.accountListTheme.copyWith(
@ -106,13 +101,10 @@ class HighContrastTheme extends MoneroLightTheme {

  @override
  ReceivePageTheme get receivePageTheme => super.receivePageTheme.copyWith(
-      tilesTextColor: Colors.white,
-      iconsBackgroundColor: Colors.grey,
-      iconsColor: Colors.black);
+      tilesTextColor: Colors.white, iconsBackgroundColor: Colors.grey, iconsColor: Colors.black);

  @override
  ThemeData get themeData => super.themeData.copyWith(
      disabledColor: Colors.grey,
-      dialogTheme:
-          super.themeData.dialogTheme.copyWith(backgroundColor: Colors.white));
+      dialogTheme: super.themeData.dialogTheme.copyWith(backgroundColor: Colors.white));
 }
--- a/lib/themes/theme_base.dart
+++ b/lib/themes/theme_base.dart
@ -26,7 +26,7 @@ import 'package:cake_wallet/themes/extensions/transaction_trade_theme.dart';
 import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
 import 'package:flutter/material.dart';

-enum ThemeType { bright, light, dark }
+enum ThemeType { light, bright, dark }

 abstract class ThemeBase {
  ThemeBase({required this.raw}) {
--- a/lib/view_model/set_up_2fa_viewmodel.dart
+++ b/lib/view_model/set_up_2fa_viewmodel.dart
@ -96,9 +96,7 @@ abstract class Setup2FAViewModelBase with Store {

  @action
  void _setBase32SecretKey(String value) {
-    if (_settingsStore.totpSecretKey == '') {
-      _settingsStore.totpSecretKey = value;
-    }
+    _settingsStore.totpSecretKey = value;
  }

  @action
--- a/res/values/strings_ar.arb
+++ b/res/values/strings_ar.arb
@ -686,5 +686,7 @@
  "support_title_other_links": "روابط دعم أخرى",
  "support_description_other_links": "انضم إلى مجتمعاتنا أو تصل إلينا شركائنا من خلال أساليب أخرى",
  "choose_derivation": "اختر اشتقاق المحفظة",
-  "new_first_wallet_text": "حافظ بسهولة على أمان العملة المشفرة"
+  "new_first_wallet_text": "حافظ بسهولة على أمان العملة المشفرة",
+  "select_destination": ".ﻲﻃﺎﻴﺘﺣﻻﺍ ﺦﺴﻨﻟﺍ ﻒﻠﻣ ﺔﻬﺟﻭ ﺪﻳﺪﺤﺗ ءﺎﺟﺮﻟﺍ",
+  "save_to_downloads": "ﺕﻼﻳﺰﻨﺘﻟﺍ ﻲﻓ ﻆﻔﺣ"
 }
--- a/res/values/strings_bg.arb
+++ b/res/values/strings_bg.arb
@ -682,5 +682,7 @@
  "support_title_other_links": "Други връзки за поддръжка",
  "support_description_other_links": "Присъединете се към нашите общности или се свържете с нас нашите партньори чрез други методи",
  "choose_derivation": "Изберете производно на портфейла",
-  "new_first_wallet_text": "Лесно пазете криптовалутата си в безопасност"
-}
+  "new_first_wallet_text": "Лесно пазете криптовалутата си в безопасност",
+  "select_destination": "Моля, изберете дестинация за архивния файл.",
+  "save_to_downloads": "Запазване в Изтегляния"
+}
--- a/res/values/strings_cs.arb
+++ b/res/values/strings_cs.arb
@ -682,5 +682,7 @@
  "support_title_other_links": "Další odkazy na podporu",
  "support_description_other_links": "Připojte se k našim komunitám nebo se k nám oslovte další metody",
  "choose_derivation": "Vyberte derivaci peněženky",
-  "new_first_wallet_text": "Snadno udržujte svou kryptoměnu v bezpečí"
-}
+  "new_first_wallet_text": "Snadno udržujte svou kryptoměnu v bezpečí",
+  "select_destination": "Vyberte cíl pro záložní soubor.",
+  "save_to_downloads": "Uložit do Stažených souborů"
+}
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@ -690,5 +690,7 @@
  "support_title_other_links": "Andere Support-Links",
  "support_description_other_links": "Treten Sie unseren Communities bei oder erreichen Sie uns oder unsere Partner über andere Methoden",
  "choose_derivation": "Wählen Sie Brieftaschenableitung",
-  "new_first_wallet_text": "Bewahren Sie Ihre Kryptowährung einfach sicher auf"
-}
+  "new_first_wallet_text": "Bewahren Sie Ihre Kryptowährung einfach sicher auf",
+  "select_destination": "Bitte wählen Sie das Ziel für die Sicherungsdatei aus.",
+  "save_to_downloads": "Unter „Downloads“ speichern"
+}
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@ -690,5 +690,7 @@
  "support_title_other_links": "Other support links",
  "support_description_other_links": "Join our communities or reach us our our partners through other methods",
  "choose_derivation": "Choose Wallet Derivation",
-  "new_first_wallet_text": "Keep your crypto safe, piece of cake"
-}
+  "new_first_wallet_text": "Keep your crypto safe, piece of cake",
+  "select_destination": "Please select destination for the backup file.",
+  "save_to_downloads": "Save to Downloads"
+}
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@ -690,5 +690,7 @@
  "support_title_other_links": "Otros enlaces de soporte",
  "support_description_other_links": "Únase a nuestras comunidades o comuníquese con nosotros nuestros socios a través de otros métodos",
  "choose_derivation": "Elija la derivación de la billetera",
-  "new_first_wallet_text": "Mantenga fácilmente su criptomoneda segura"
-}
+  "new_first_wallet_text": "Mantenga fácilmente su criptomoneda segura",
+  "select_destination": "Seleccione el destino del archivo de copia de seguridad.",
+  "save_to_downloads": "Guardar en Descargas"
+}
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@ -690,5 +690,7 @@
  "support_title_other_links": "Autres liens d'assistance",
  "support_description_other_links": "Rejoignez nos communautés ou contactez-nous nos partenaires à travers d'autres méthodes",
  "choose_derivation": "Choisissez la dérivation du portefeuille",
-  "new_first_wallet_text": "Gardez facilement votre crypto-monnaie en sécurité"
-}
+  "new_first_wallet_text": "Gardez facilement votre crypto-monnaie en sécurité",
+  "select_destination": "Veuillez sélectionner la destination du fichier de sauvegarde.",
+  "save_to_downloads": "Enregistrer dans les téléchargements"
+}
--- a/res/values/strings_ha.arb
+++ b/res/values/strings_ha.arb
@ -668,5 +668,7 @@
  "support_title_other_links": "Sauran hanyoyin tallafi",
  "support_description_other_links": "Kasance tare da al'ummominmu ko kuma ka kai mu abokanmu ta hanyar wasu hanyoyi",
  "choose_derivation": "Zaɓi walatawa",
-  "new_first_wallet_text": "A sauƙaƙe kiyaye kuzarin ku"
-}
+  "new_first_wallet_text": "A sauƙaƙe kiyaye kuzarin ku",
+  "select_destination": "Da fatan za a zaɓi wurin da za a yi wa madadin fayil ɗin.",
+  "save_to_downloads": "Ajiye zuwa Zazzagewa"
+}
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@ -690,5 +690,7 @@
  "support_title_other_links": "अन्य समर्थन लिंक",
  "support_description_other_links": "हमारे समुदायों में शामिल हों या अन्य तरीकों के माध्यम से हमारे साथी तक पहुंचें",
  "choose_derivation": "वॉलेट व्युत्पत्ति चुनें",
-  "new_first_wallet_text": "आसानी से अपनी क्रिप्टोक्यूरेंसी को सुरक्षित रखें"
-}
+  "new_first_wallet_text": "आसानी से अपनी क्रिप्टोक्यूरेंसी को सुरक्षित रखें",
+  "select_destination": "कृपया बैकअप फ़ाइल के लिए गंतव्य का चयन करें।",
+  "save_to_downloads": "डाउनलोड में सहेजें"
+}
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@ -688,5 +688,7 @@
  "support_title_other_links": "Ostale veze za podršku",
  "support_description_other_links": "Pridružite se našim zajednicama ili nam dosegnu naše partnere drugim metodama",
  "choose_derivation": "Odaberite izvedbu novčanika",
-  "new_first_wallet_text": "Jednostavno čuvajte svoju kripto valutu"
-}
+  "new_first_wallet_text": "Jednostavno čuvajte svoju kripto valutu",
+  "select_destination": "Odaberite odredište za datoteku sigurnosne kopije.",
+  "save_to_downloads": "Spremi u Preuzimanja"
+}
--- a/res/values/strings_id.arb
+++ b/res/values/strings_id.arb
@ -678,5 +678,7 @@
  "support_title_other_links": "Tautan dukungan lainnya",
  "support_description_other_links": "Bergabunglah dengan komunitas kami atau hubungi kami mitra kami melalui metode lain",
  "choose_derivation": "Pilih dompet dompet",
-  "new_first_wallet_text": "Dengan mudah menjaga cryptocurrency Anda aman"
+  "new_first_wallet_text": "Dengan mudah menjaga cryptocurrency Anda aman",
+  "select_destination": "Silakan pilih tujuan untuk file cadangan.",
+  "save_to_downloads": "Simpan ke Unduhan"
 }
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@ -690,5 +690,7 @@
  "support_title_other_links": "Altri collegamenti di supporto",
  "support_description_other_links": "Unisciti alle nostre comunità o raggiungici i nostri partner attraverso altri metodi",
  "choose_derivation": "Scegli la derivazione del portafoglio",
-  "new_first_wallet_text": "Mantieni facilmente la tua criptovaluta al sicuro"
-}
+  "new_first_wallet_text": "Mantieni facilmente la tua criptovaluta al sicuro",
+  "select_destination": "Seleziona la destinazione per il file di backup.",
+  "save_to_downloads": "Salva in Download"
+}
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@ -690,5 +690,7 @@
  "support_title_other_links": "その他のサポートリンク",
  "support_description_other_links": "私たちのコミュニティに参加するか、他の方法を通して私たちのパートナーに連絡してください",
  "choose_derivation": "ウォレット派生を選択します",
-  "new_first_wallet_text": "暗号通貨を簡単に安全に保ちます"
+  "new_first_wallet_text": "暗号通貨を簡単に安全に保ちます",
+  "select_destination": "バックアップファイルの保存先を選択してください。",
+  "save_to_downloads": "ダウンロードに保存"
 }
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@ -688,5 +688,7 @@
  "support_title_other_links": "다른 지원 링크",
  "support_description_other_links": "다른 방법을 통해 커뮤니티에 가입하거나 파트너에게 연락하십시오.",
  "choose_derivation": "지갑 파생을 선택하십시오",
-  "new_first_wallet_text": "cryptocurrency를 쉽게 안전하게 유지하십시오"
+  "new_first_wallet_text": "cryptocurrency를 쉽게 안전하게 유지하십시오",
+  "select_destination": "백업 파일의 대상을 선택하십시오.",
+  "save_to_downloads": "다운로드에 저장"
 }
--- a/res/values/strings_my.arb
+++ b/res/values/strings_my.arb
@ -688,5 +688,7 @@
  "support_title_other_links": "အခြားအထောက်အပံ့လင့်များ",
  "support_description_other_links": "ကျွန်ုပ်တို့၏လူမှုအသိုင်းအဝိုင်းများသို့ 0 င်ရောက်ပါ",
  "choose_derivation": "ပိုက်ဆံအိတ်ကိုရွေးချယ်ပါ",
-  "new_first_wallet_text": "သင့်ရဲ့ cryptocurrencrencres ကိုအလွယ်တကူလုံခြုံစွာထားရှိပါ"
+  "new_first_wallet_text": "သင့်ရဲ့ cryptocurrencrencres ကိုအလွယ်တကူလုံခြုံစွာထားရှိပါ",
+  "select_destination": "အရန်ဖိုင်အတွက် ဦးတည်ရာကို ရွေးပါ။",
+  "save_to_downloads": "ဒေါင်းလုဒ်များထံ သိမ်းဆည်းပါ။"
 }
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@ -690,5 +690,7 @@
  "support_title_other_links": "Andere ondersteuningslinks",
  "support_description_other_links": "Word lid van onze gemeenschappen of bereik ons onze partners via andere methoden",
  "choose_derivation": "Kies portemonnee -afleiding",
-  "new_first_wallet_text": "Houd uw cryptocurrency gemakkelijk veilig"
-}
+  "new_first_wallet_text": "Houd uw cryptocurrency gemakkelijk veilig",
+  "select_destination": "Selecteer de bestemming voor het back-upbestand.",
+  "save_to_downloads": "Opslaan in downloads"
+}
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@ -690,5 +690,7 @@
  "support_title_other_links": "Inne linki wsparcia",
  "support_description_other_links": "Dołącz do naszych społeczności lub skontaktuj się z nami naszymi partnerami za pomocą innych metod",
  "choose_derivation": "Wybierz wyprowadzenie portfela",
-  "new_first_wallet_text": "Łatwo zapewnić bezpieczeństwo kryptowalut"
-}
+  "new_first_wallet_text": "Łatwo zapewnić bezpieczeństwo kryptowalut",
+  "select_destination": "Wybierz miejsce docelowe dla pliku kopii zapasowej.",
+  "save_to_downloads": "Zapisz w Pobranych"
+}
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@ -689,5 +689,7 @@
  "support_title_other_links": "Outros links de suporte",
  "support_description_other_links": "Junte -se às nossas comunidades ou chegue a nós nossos parceiros por meio de outros métodos",
  "choose_derivation": "Escolha a derivação da carteira",
-  "new_first_wallet_text": "Mantenha sua criptomoeda facilmente segura"
-}
+  "new_first_wallet_text": "Mantenha sua criptomoeda facilmente segura",
+  "select_destination": "Selecione o destino para o arquivo de backup.",
+  "save_to_downloads": "Salvar em Downloads"
+}
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@ -690,5 +690,7 @@
  "support_title_other_links": "Другие ссылки на поддержку",
  "support_description_other_links": "Присоединяйтесь к нашим сообществам или охватите нас наших партнеров с помощью других методов",
  "choose_derivation": "Выберите вывод кошелька",
-  "new_first_wallet_text": "Легко сохранить свою криптовалюту в безопасности"
+  "new_first_wallet_text": "Легко сохранить свою криптовалюту в безопасности",
+  "select_destination": "Пожалуйста, выберите место для файла резервной копии.",
+  "save_to_downloads": "Сохранить в загрузках"
 }
--- a/res/values/strings_th.arb
+++ b/res/values/strings_th.arb
@ -688,5 +688,7 @@
  "support_title_other_links": "ลิงค์สนับสนุนอื่น ๆ",
  "support_description_other_links": "เข้าร่วมชุมชนของเราหรือเข้าถึงเราพันธมิตรของเราผ่านวิธีการอื่น ๆ",
  "choose_derivation": "เลือก Wallet Derivation",
-  "new_first_wallet_text": "ทำให้สกุลเงินดิจิตอลของคุณปลอดภัยได้อย่างง่ายดาย"
+  "new_first_wallet_text": "ทำให้สกุลเงินดิจิตอลของคุณปลอดภัยได้อย่างง่ายดาย",
+  "select_destination": "โปรดเลือกปลายทางสำหรับไฟล์สำรอง",
+  "save_to_downloads": "บันทึกลงดาวน์โหลด"
 }
--- a/res/values/strings_tr.arb
+++ b/res/values/strings_tr.arb
@ -688,5 +688,7 @@
  "support_title_other_links": "Diğer destek bağlantıları",
  "support_description_other_links": "Topluluklarımıza katılın veya ortaklarımıza diğer yöntemlerle bize ulaşın",
  "choose_derivation": "Cüzdan türevini seçin",
-  "new_first_wallet_text": "Kripto para biriminizi kolayca güvende tutun"
-}
+  "new_first_wallet_text": "Kripto para biriminizi kolayca güvende tutun",
+  "select_destination": "Lütfen yedekleme dosyası için hedef seçin.",
+  "save_to_downloads": "İndirilenlere Kaydet"
+}
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@ -690,5 +690,7 @@
  "support_title_other_links": "Інші посилання на підтримку",
  "support_description_other_links": "Приєднуйтесь до наших спільнот або досягайте нас нашими партнерами іншими методами",
  "choose_derivation": "Виберіть деривацію гаманця",
-  "new_first_wallet_text": "Легко зберігайте свою криптовалюту в безпеці"
-}
+  "new_first_wallet_text": "Легко зберігайте свою криптовалюту в безпеці",
+  "select_destination": "Виберіть місце призначення для файлу резервної копії.",
+  "save_to_downloads": "Зберегти до завантажень"
+}
--- a/res/values/strings_ur.arb
+++ b/res/values/strings_ur.arb
@ -682,5 +682,7 @@
  "support_title_other_links": "دوسرے سپورٹ لنکس",
  "support_description_other_links": "ہماری برادریوں میں شامل ہوں یا دوسرے طریقوں سے ہمارے شراکت داروں تک پہنچیں",
  "choose_derivation": "پرس سے ماخوذ منتخب کریں",
-  "new_first_wallet_text": "آسانی سے اپنے cryptocurrency محفوظ رکھیں"
+  "new_first_wallet_text": "آسانی سے اپنے cryptocurrency محفوظ رکھیں",
+  "select_destination": "۔ﮟﯾﺮﮐ ﺏﺎﺨﺘﻧﺍ ﺎﮐ ﻝﺰﻨﻣ ﮯﯿﻟ ﮯﮐ ﻞﺋﺎﻓ ﭖﺍ ﮏﯿﺑ ﻡﺮﮐ ﮦﺍﺮﺑ",
+  "save_to_downloads": "۔ﮟﯾﺮﮐ ﻅﻮﻔﺤﻣ ﮟﯿﻣ ﺯﮈﻮﻟ ﻥﺅﺍﮈ"
 }
--- a/res/values/strings_yo.arb
+++ b/res/values/strings_yo.arb
@ -684,5 +684,7 @@
  "bitcoin_light_theme": "Bitcoin Light Akori",
  "high_contrast_theme": "Akori Iyatọ giga",
  "matrix_green_dark_theme": "Matrix Green Dark Akori",
-  "monero_light_theme": "Monero Light Akori"
+  "monero_light_theme": "Monero Light Akori",
+  "select_destination": "Jọwọ yan ibi ti o nlo fun faili afẹyinti.",
+  "save_to_downloads": "Fipamọ si Awọn igbasilẹ"
 }
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@ -689,5 +689,7 @@
  "bitcoin_light_theme": "比特币浅色主题",
  "high_contrast_theme": "高对比度主题",
  "matrix_green_dark_theme": "矩阵绿暗主题",
-  "monero_light_theme": "门罗币浅色主题"
+  "monero_light_theme": "门罗币浅色主题",
+  "select_destination": "请选择备份文件的目的地。",
+  "save_to_downloads": "保存到下载"
 }