Merge branch 'main' into CW-122-Rework-filter-on-the-transactions-list-screen

2024-11-16 17:27:37 +00:00 · 2022-11-28 22:33:54 +02:00 · 2022-11-28 22:33:54 +02:00 · ab499c9069
commit ab499c9069
parent 269b4c25ab 4d91ef6af8
30 changed files with 268 additions and 109 deletions
--- a/.github/workflows/pr_test_build.yml
+++ b/.github/workflows/pr_test_build.yml
@ -0,0 +1,116 @@
+name: PR Test Build
+
+on:
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-18.04
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v1
+        with:
+          java-version: '8.x'
+
+      - name: Flutter action
+        uses: subosito/flutter-action@v1
+        with:
+          flutter-version: '3.3.x'
+          channel: stable
+
+      - name: Install package dependencies
+        run: sudo apt-get install -y curl unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake clang
+
+      - name: Execute Build and Setup Commands
+        run: |
+          sudo mkdir -p /opt/android
+          sudo chown $USER /opt/android
+          cd /opt/android
+          git clone https://github.com/cake-tech/cake_wallet.git --branch $GITHUB_HEAD_REF
+          cd cake_wallet/scripts/android/
+          ./install_ndk.sh
+          source ./app_env.sh cakewallet
+          ./app_config.sh
+          ./build_all.sh
+          ./copy_monero_deps.sh
+
+      - name: Install Flutter dependencies
+        run: |
+          cd /opt/android/cake_wallet
+          flutter pub get
+
+      - name: Generate KeyStore
+        run: |
+          cd /opt/android/cake_wallet/android/app
+          keytool -genkey -v -keystore key.jks -keyalg RSA -keysize 2048 -validity 10000 -alias testKey -noprompt -dname "CN=CakeWallet, OU=CakeWallet, O=CakeWallet, L=Florida, S=America, C=USA" -storepass ${{ secrets.STORE_PASS }} -keypass ${{ secrets.KEY_PASS }}
+
+      - name: Generate key properties
+        run: |
+          cd /opt/android/cake_wallet
+          flutter packages pub run tool/generate_android_key_properties.dart keyAlias=testKey storeFile=key.jks storePassword=${{ secrets.STORE_PASS }} keyPassword=${{ secrets.KEY_PASS }}
+
+      - name: Generate localization
+        run: |
+          cd /opt/android/cake_wallet
+          flutter packages pub run tool/generate_localization.dart
+
+      - name: Build generated code
+        run: |
+          cd /opt/android/cake_wallet
+          cd cw_core && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+          cd cw_monero && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+          cd cw_bitcoin && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+          cd cw_haven && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..
+          flutter packages pub run build_runner build --delete-conflicting-outputs
+
+      - name: Add secrets
+        run: |
+          cd /opt/android/cake_wallet
+          touch lib/.secrets.g.dart
+          echo "const salt = '${{ secrets.SALT }}';" > lib/.secrets.g.dart
+          echo "const keychainSalt = '${{ secrets.KEY_CHAIN_SALT }}';" >> lib/.secrets.g.dart
+          echo "const key = '${{ secrets.KEY }}';" >> lib/.secrets.g.dart
+          echo "const walletSalt = '${{ secrets.WALLET_SALT }}';" >> lib/.secrets.g.dart
+          echo "const shortKey = '${{ secrets.SHORT_KEY }}';" >> lib/.secrets.g.dart
+          echo "const backupSalt = '${{ secrets.BACKUP_SALT }}';" >> lib/.secrets.g.dart
+          echo "const backupKeychainSalt = '${{ secrets.BACKUP_KEY_CHAIN_SALT }}';" >> lib/.secrets.g.dart
+          echo "const changeNowApiKey = '${{ secrets.CHANGE_NOW_API_KEY }}';" >> lib/.secrets.g.dart
+          echo "const wyreSecretKey = '${{ secrets.WYRE_SECRET_KEY }}';" >> lib/.secrets.g.dart
+          echo "const wyreApiKey = '${{ secrets.WYRE_API_KEY }}';" >> lib/.secrets.g.dart
+          echo "const wyreAccountId = '${{ secrets.WYRE_ACCOUNT_ID }}';" >> lib/.secrets.g.dart
+          echo "const moonPayApiKey = '${{ secrets.MOON_PAY_API_KEY }}';" >> lib/.secrets.g.dart
+          echo "const moonPaySecretKey = '${{ secrets.MOON_PAY_SECRET_KEY }}';" >> lib/.secrets.g.dart
+          echo "const sideShiftAffiliateId = '${{ secrets.SIDE_SHIFT_AFFILIATE_ID }}';" >> lib/.secrets.g.dart
+          echo "const sideShiftApiKey = '${{ secrets.SIDE_SHIFT_API_KEY }}';" >> lib/.secrets.g.dart
+          echo "const simpleSwapApiKey = '${{ secrets.SIMPLE_SWAP_API_KEY }}';" >> lib/.secrets.g.dart
+          echo "const onramperApiKey = '${{ secrets.ONRAMPER_API_KEY }}';" >> lib/.secrets.g.dart
+          echo "const anypayToken = '${{ secrets.ANY_PAY_TOKEN }}';" >> lib/.secrets.g.dart
+          echo "const ioniaClientId = '${{ secrets.IONIA_CLIENT_ID }}';" >> lib/.secrets.g.dart
+
+      - name: Build
+        run: |
+          cd /opt/android/cake_wallet
+          flutter build apk --release
+
+#      - name: Push to App Center
+#        run: |
+#          echo 'Installing App Center CLI tools'
+#          npm install -g appcenter-cli
+#          echo "Publishing test to App Center"
+#          appcenter distribute release \
+#              --group "Testers" \
+#              --file "/opt/android/cake_wallet/build/app/outputs/apk/release/app-release.apk" \
+#              --release-notes ${GITHUB_HEAD_REF} \
+#              --app Cake-Labs/Cake-Wallet \
+#              --token ${{ secrets.APP_CENTER_TOKEN }} \
+#              --quiet
+
+      - name: Send Test APK
+        run: |
+          cd /opt/android/cake_wallet
+          var=$(curl --upload-file build/app/outputs/apk/release/app-release.apk https://transfer.sh/app-release.apk)
+          curl ${{ secrets.SLACK_WEB_HOOK }} -H "Content-Type: application/json" -d '{"apk_link": "'"$var"'","ticket": "'"$GITHUB_HEAD_REF"'"}'
+
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -46,7 +46,7 @@ android {
    defaultConfig {
        applicationId appProperties['id']
        minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
        versionCode flutterVersionCode.toInteger()
        versionName flutterVersionName
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
--- a/android/app/src/main/AndroidManifestBase.xml
+++ b/android/app/src/main/AndroidManifestBase.xml
@ -21,7 +21,8 @@
            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
            android:hardwareAccelerated="true"
            android:windowSoftInputMode="adjustResize"
-            android:screenOrientation="portrait">
+            android:screenOrientation="portrait"
+            android:exported="true">
            <meta-data
                    android:name="io.flutter.embedding.android.SplashScreenDrawable"
                    android:resource="@drawable/launch_background"
--- a/howto-build-android.md
+++ b/howto-build-android.md
@ -55,7 +55,7 @@ You may download and install the latest version of Android Studio [here](https:/

 ### 3. Installing Flutter

-Need to install flutter with version `2.0.4`. For this please check section [Install Flutter manually](https://docs.flutter.dev/get-started/install/linux#install-flutter-manually). When flutter repository is downloaded please open it with `cd <flutter-path>` and checkout version 2.0.4 by `git checkout 2.0.4`.
+Need to install flutter with version `3.x.x`. For this please check section [Install Flutter manually](https://docs.flutter.dev/get-started/install/linux#install-flutter-manually).

 ### 4. Verify Installations

@ -66,7 +66,7 @@ Verify that the Android toolchain, Flutter, and Android Studio have been correct
 The output of this command will appear like this, indicating successful installations. If there are problems with your installation, they **must** be corrected before proceeding.
 ```
 Doctor summary (to see all details, run flutter doctor -v):
-[✓] Flutter (Channel stable, 2.0.4, on Linux, locale en_US.UTF-8)
+[✓] Flutter (Channel stable, 3.x.x, on Linux, locale en_US.UTF-8)
 [✓] Android toolchain - develop for Android devices (Android SDK version 28)
 [✓] Android Studio (version 4.0)
 ```
@ -156,6 +156,10 @@ Generate mobx models for `cw_bitcoin`:

 `cd cw_bitcoin && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..`

+Generate mobx models for `cw_haven`:
+
+`cd cw_haven && flutter pub get && flutter packages pub run build_runner build --delete-conflicting-outputs && cd ..`
+
 Finally build mobx models for the app:

 `$ flutter packages pub run build_runner build --delete-conflicting-outputs`
--- a/lib/entities/preferences_key.dart
+++ b/lib/entities/preferences_key.dart
@ -11,6 +11,7 @@ class PreferencesKey {
  static const shouldSaveRecipientAddressKey = 'save_recipient_address';
  static const allowBiometricalAuthenticationKey =
      'allow_biometrical_authentication';
+  static const disableExchangeKey = 'disable_exchange';
  static const currentTheme = 'current_theme';
  static const isDarkThemeLegacy = 'dark_theme';
  static const displayActionListModeKey = 'display_list_mode';
--- a/lib/src/screens/dashboard/dashboard_page.dart
+++ b/lib/src/screens/dashboard/dashboard_page.dart
@ -315,6 +315,8 @@ class DashboardPage extends BasePage {
  }

  Future<void> _onClickExchangeButton(BuildContext context) async {
-    await Navigator.of(context).pushNamed(Routes.exchange);
+    if (walletViewModel.isEnabledExchangeAction) {
+      await Navigator.of(context).pushNamed(Routes.exchange);
+    }
  }
 }
--- a/lib/src/screens/receive/widgets/qr_painter.dart
+++ b/lib/src/screens/receive/widgets/qr_painter.dart
@ -9,7 +9,6 @@ class QrPainter extends CustomPainter {
    this.errorCorrectionLevel,
  ) : this._qr = QrCode(version, errorCorrectionLevel)..addData(data) {
    _p.color = this.color;
-    _qr.addData(data);
    _qrImage = QrImage(_qr);
  }

--- a/lib/store/settings_store.dart
+++ b/lib/store/settings_store.dart
@ -30,6 +30,7 @@ abstract class SettingsStoreBase with Store {
      required BalanceDisplayMode initialBalanceDisplayMode,
      required bool initialSaveRecipientAddress,
      required bool initialAllowBiometricalAuthentication,
+      required bool initialExchangeEnabled,
      required ThemeBase initialTheme,
      required int initialPinLength,
      required String initialLanguageCode,
@ -47,6 +48,7 @@ abstract class SettingsStoreBase with Store {
    balanceDisplayMode = initialBalanceDisplayMode,
    shouldSaveRecipientAddress = initialSaveRecipientAddress,
    allowBiometricalAuthentication = initialAllowBiometricalAuthentication,
+    disableExchange = initialExchangeEnabled,
    currentTheme = initialTheme,
    pinCodeLength = initialPinLength,
    languageCode = initialLanguageCode,
@ -143,6 +145,9 @@ abstract class SettingsStoreBase with Store {
  @observable
  bool allowBiometricalAuthentication;

+  @observable
+  bool disableExchange;
+
  @observable
  ThemeBase currentTheme;

@ -221,6 +226,8 @@ abstract class SettingsStoreBase with Store {
    final allowBiometricalAuthentication = sharedPreferences
            .getBool(PreferencesKey.allowBiometricalAuthenticationKey) ??
        false;
+    final disableExchange = sharedPreferences
+            .getBool(PreferencesKey.disableExchangeKey) ?? false;
    final legacyTheme =
        (sharedPreferences.getBool(PreferencesKey.isDarkThemeLegacy) ?? false)
            ? ThemeType.dark.index
@ -284,6 +291,7 @@ abstract class SettingsStoreBase with Store {
        initialBalanceDisplayMode: currentBalanceDisplayMode,
        initialSaveRecipientAddress: shouldSaveRecipientAddress,
        initialAllowBiometricalAuthentication: allowBiometricalAuthentication,
+        initialExchangeEnabled: disableExchange,
        initialTheme: savedTheme,
        actionlistDisplayMode: actionListDisplayMode,
        initialPinLength: pinLength,
--- a/lib/view_model/dashboard/dashboard_view_model.dart
+++ b/lib/view_model/dashboard/dashboard_view_model.dart
@ -53,7 +53,6 @@ abstract class DashboardViewModelBase with Store {
    hasBuyAction = false,
    isEnabledBuyAction = false,
    hasExchangeAction = false,
-    isEnabledExchangeAction = false,
    isShowFirstYatIntroduction = false,
    isShowSecondYatIntroduction = false,
    isShowThirdYatIntroduction = false,
@ -263,8 +262,8 @@ abstract class DashboardViewModelBase with Store {
  void furtherShowYatPopup(bool shouldShow) =>
      settingsStore.shouldShowYatPopup = shouldShow;

-  @observable
-  bool isEnabledExchangeAction;
+  @computed
+  bool get isEnabledExchangeAction => !settingsStore.disableExchange;

  @observable
  bool hasExchangeAction;
@ -379,7 +378,6 @@ abstract class DashboardViewModelBase with Store {
  }

  void updateActions() {
-    isEnabledExchangeAction = true;
    hasExchangeAction = !isHaven;
    isEnabledBuyAction = wallet.type != WalletType.haven
      && wallet.type != WalletType.monero;
--- a/lib/view_model/exchange/exchange_view_model.dart
+++ b/lib/view_model/exchange/exchange_view_model.dart
@ -7,7 +7,6 @@ import 'package:cake_wallet/exchange/sideshift/sideshift_exchange_provider.dart'
 import 'package:cake_wallet/exchange/sideshift/sideshift_request.dart';
 import 'package:cake_wallet/exchange/simpleswap/simpleswap_exchange_provider.dart';
 import 'package:cake_wallet/view_model/settings/settings_view_model.dart';
-import 'package:cw_core/transaction_priority.dart';
 import 'package:cake_wallet/exchange/simpleswap/simpleswap_request.dart';
 import 'package:cw_core/wallet_base.dart';
 import 'package:cw_core/crypto_currency.dart';
@ -375,96 +374,105 @@ abstract class ExchangeViewModelBase with Store {
    TradeRequest? request;
    String amount = '';

-    for (var provider in _sortedAvailableProviders.values) {
-      if (!(await provider.checkIsAvailable())) {
-        continue;
-      }
+    try {
+      for (var provider in _sortedAvailableProviders.values) {
+        if (!(await provider.checkIsAvailable())) {
+          continue;
+        }

-      if (provider is SideShiftExchangeProvider) {
-        request = SideShiftRequest(
-          depositMethod: depositCurrency,
-          settleMethod: receiveCurrency,
-          depositAmount: depositAmount.replaceAll(',', '.'),
-          settleAddress: receiveAddress,
-          refundAddress: depositAddress,
-        );
-        amount = depositAmount;
-      }
+        if (provider is SideShiftExchangeProvider) {
+          request = SideShiftRequest(
+            depositMethod: depositCurrency,
+            settleMethod: receiveCurrency,
+            depositAmount: depositAmount.replaceAll(',', '.'),
+            settleAddress: receiveAddress,
+            refundAddress: depositAddress,
+          );
+          amount = depositAmount;
+        }

-      if (provider is SimpleSwapExchangeProvider) {
-        request = SimpleSwapRequest(
-          from: depositCurrency,
-          to: receiveCurrency,
-          amount: depositAmount.replaceAll(',', '.'),
-          address: receiveAddress,
-          refundAddress: depositAddress,
-        );
-        amount = depositAmount;
-      }
-
-      if (provider is XMRTOExchangeProvider) {
-        request = XMRTOTradeRequest(
+        if (provider is SimpleSwapExchangeProvider) {
+          request = SimpleSwapRequest(
            from: depositCurrency,
            to: receiveCurrency,
            amount: depositAmount.replaceAll(',', '.'),
-            receiveAmount: receiveAmount.replaceAll(',', '.'),
            address: receiveAddress,
            refundAddress: depositAddress,
-            isBTCRequest: isReceiveAmountEntered);
-        amount = depositAmount;
-      }
+          );
+          amount = depositAmount;
+        }

-      if (provider is ChangeNowExchangeProvider) {
-        request = ChangeNowRequest(
-            from: depositCurrency,
-            to: receiveCurrency,
-            fromAmount: depositAmount.replaceAll(',', '.'),
-            toAmount: receiveAmount.replaceAll(',', '.'),
-            refundAddress: depositAddress,
-            address: receiveAddress,
-            isReverse: isReverse);
-        amount = isReverse ? receiveAmount : depositAmount;
-      }
+        if (provider is XMRTOExchangeProvider) {
+          request = XMRTOTradeRequest(
+              from: depositCurrency,
+              to: receiveCurrency,
+              amount: depositAmount.replaceAll(',', '.'),
+              receiveAmount: receiveAmount.replaceAll(',', '.'),
+              address: receiveAddress,
+              refundAddress: depositAddress,
+              isBTCRequest: isReceiveAmountEntered);
+          amount = depositAmount;
+        }

-      if (provider is MorphTokenExchangeProvider) {
-        request = MorphTokenRequest(
-            from: depositCurrency,
-            to: receiveCurrency,
-            amount: depositAmount.replaceAll(',', '.'),
-            refundAddress: depositAddress,
-            address: receiveAddress);
-        amount = depositAmount;
-      }
+        if (provider is ChangeNowExchangeProvider) {
+          request = ChangeNowRequest(
+              from: depositCurrency,
+              to: receiveCurrency,
+              fromAmount: depositAmount.replaceAll(',', '.'),
+              toAmount: receiveAmount.replaceAll(',', '.'),
+              refundAddress: depositAddress,
+              address: receiveAddress,
+              isReverse: isReverse);
+          amount = isReverse ? receiveAmount : depositAmount;
+        }

-      amount = amount.replaceAll(',', '.');
+        if (provider is MorphTokenExchangeProvider) {
+          request = MorphTokenRequest(
+              from: depositCurrency,
+              to: receiveCurrency,
+              amount: depositAmount.replaceAll(',', '.'),
+              refundAddress: depositAddress,
+              address: receiveAddress);
+          amount = depositAmount;
+        }

-      if (limitsState is LimitsLoadedSuccessfully) {
-        if (double.parse(amount) < limits.min!) {
-          continue;
-        } else if (limits.max != null && double.parse(amount) > limits.max!) {
-          continue;
-        } else {
-          try {
-            tradeState = TradeIsCreating();
-            final trade = await provider.createTrade(
-                request: request!, isFixedRateMode: isFixedRateMode);
-            trade.walletId = wallet.id;
-            tradesStore.setTrade(trade);
-            await trades.add(trade);
-            tradeState = TradeIsCreatedSuccessfully(trade: trade);
-            /// return after the first successful trade
-            return;
-          } catch (e) {
+        amount = amount.replaceAll(',', '.');
+
+        if (limitsState is LimitsLoadedSuccessfully) {
+          if (double.parse(amount) < limits.min!) {
            continue;
+          } else if (limits.max != null && double.parse(amount) > limits.max!) {
+            continue;
+          } else {
+            try {
+              tradeState = TradeIsCreating();
+              final trade = await provider.createTrade(
+                  request: request!, isFixedRateMode: isFixedRateMode);
+              trade.walletId = wallet.id;
+              tradesStore.setTrade(trade);
+              await trades.add(trade);
+              tradeState = TradeIsCreatedSuccessfully(trade: trade);
+              /// return after the first successful trade
+              return;
+            } catch (e) {
+              continue;
+            }
          }
        }
      }
-    }

-    /// if the code reached here then none of the providers succeeded
-    tradeState = TradeIsCreatedFailure(
-        title: S.current.trade_not_created,
-        error: S.current.none_of_selected_providers_can_exchange);
+      /// if the code reached here then none of the providers succeeded
+      tradeState = TradeIsCreatedFailure(
+          title: S.current.trade_not_created,
+          error: S.current.none_of_selected_providers_can_exchange);
+    } on ConcurrentModificationError {
+      /// if create trade happened at the exact same time of the scheduled rate update
+      /// then delay the create trade a bit and try again
+      ///
+      /// this is because the limitation of the SplayTreeMap that
+      /// you can't modify it while iterating through it
+      Future.delayed(Duration(milliseconds: 500), createTrade);
+    }
  }

  @action
--- a/lib/view_model/settings/settings_view_model.dart
+++ b/lib/view_model/settings/settings_view_model.dart
@ -208,6 +208,12 @@ abstract class SettingsViewModelBase with Store {
                setAllowBiometricalAuthentication(value);
              }
            }),
+        SwitcherListItem(
+            title: S.current.disable_exchange,
+            value: () => _settingsStore.disableExchange,
+            onValueChange: (BuildContext context, bool value) {
+              _settingsStore.disableExchange = value;
+            }),
        ChoicesListItem(
          title: S.current.color_theme,
          items: ThemeList.all,
--- a/pubspec_base.yaml
+++ b/pubspec_base.yaml
@ -34,7 +34,7 @@ dependencies:
  local_auth: ^2.1.0
  package_info: ^2.0.0
  #package_info_plus: ^1.4.2
-  devicelocale: ^0.5.4
+  devicelocale: ^0.4.3
  auto_size_text: ^3.0.0
  dotted_border: ^2.0.0+2
  smooth_page_indicator: ^1.0.0+2
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@ -653,5 +653,6 @@
  "do_not_share_warning_text" : "Teilen Sie diese nicht mit anderen, einschließlich des Supports.\n\nSie werden Ihr Geld stehlen!",
  "help": "hilfe",
  "all_transactions": "Alle Transaktionen",
-  "all_trades": "Alle Gewerke"
+  "all_trades": "Alle Gewerke",
+  "disable_exchange": "Exchange deaktivieren"
 }
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@ -653,5 +653,6 @@
  "do_not_share_warning_text" : "Do not share these with anyone else, including support.\n\nThey will steal your money!",
  "help": "help",
  "all_transactions": "All transactions",
-  "all_trades": "All trades"
+  "all_trades": "All trades",
+  "disable_exchange": "Disable exchange"
 }
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@ -653,5 +653,6 @@
  "do_not_share_warning_text" : "No comparta estos con nadie más, incluido el soporte.\n\n¡Te robarán tu dinero!",
  "help": "ayuda",
  "all_transactions": "Todas las transacciones",
-  "all_trades": "Todos los oficios"
+  "all_trades": "Todos los oficios",
+  "disable_exchange": "Deshabilitar intercambio"
 }
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@ -651,5 +651,6 @@
  "do_not_share_warning_text" : "Ne les partagez avec personne d'autre, y compris avec l'assistance.\n\nIls vont voler votre argent!",
  "help": "aider",
  "all_transactions": "Toutes transactions",
-  "all_trades": "Tous métiers"
+  "all_trades": "Tous métiers",
+  "disable_exchange": "Désactiver l'échange"
 }
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@ -653,5 +653,6 @@
  "do_not_share_warning_text" : "इन्हें समर्थन सहित किसी और के साथ साझा न करें।\n\nवे आपका पैसा चुरा लेंगे!",
  "help": "मदद करना",
  "all_transactions": "सभी लेन - देन",
-  "all_trades": "सभी व्यापार"
+  "all_trades": "सभी व्यापार",
+  "disable_exchange": "एक्सचेंज अक्षम करें"
 }
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@ -653,5 +653,6 @@
  "do_not_share_warning_text" : "Nemojte ih dijeliti ni s kim, uključujući podršku.\n\nUkrast će vam novac!",
  "help": "pomozite",
  "all_transactions": "Sve transakcije",
-  "all_trades": "Svi obrti"
+  "all_trades": "Svi obrti",
+  "disable_exchange": "Onemogući exchange"
 }
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@ -653,5 +653,6 @@
  "do_not_share_warning_text" : "Non condividerli con nessun altro, incluso il supporto.\n\nTi ruberanno i soldi!",
  "help": "aiuto",
  "all_transactions": "Sve transakcije",
-  "all_trades": "Svi obrti"
+  "all_trades": "Svi obrti",
+  "disable_exchange": "Disabilita scambio"
 }
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@ -653,5 +653,6 @@
  "do_not_share_warning_text" : "サポートを含め、これらを他の誰とも共有しないでください。\n\n彼らはあなたのお金を盗みます！",
  "help": "ヘルプ",
  "all_transactions": "全取引",
-  "all_trades": "すべての取引"
+  "all_trades": "すべての取引",
+  "disable_exchange": "交換を無効にする"
 }
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@ -653,5 +653,6 @@
  "do_not_share_warning_text" : "지원을 포함하여 다른 사람과 이러한 정보를 공유하지 마십시오.\n\n그들은 당신의 돈을 훔칠 것입니다!",
  "help": "돕다",
  "all_transactions": "모든 거래 창구",
-  "all_trades": "A모든 거래"
+  "all_trades": "A모든 거래",
+  "disable_exchange": "교환 비활성화"
 }
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@ -653,5 +653,6 @@
  "do_not_share_warning_text" : "Deel deze met niemand anders, ook niet met support.\n\nZe zullen je geld stelen!",
  "help": "helpen",
  "all_transactions": "Alle transacties",
-  "all_trades": "Alle transacties"
+  "all_trades": "Alle transacties",
+  "disable_exchange": "Uitwisseling uitschakelen"
 }
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@ -653,5 +653,6 @@
  "do_not_share_warning_text" : "Nie udostępniaj ich nikomu innemu, w tym wsparcia.\n\nUkradną twoje pieniądze!",
  "help": "pomoc",
  "all_transactions": "Wszystkie transakcje",
-  "all_trades": "Wszystkie operacje"
+  "all_trades": "Wszystkie operacje",
+  "disable_exchange": "Wyłącz wymianę"
 }
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@ -653,5 +653,6 @@
  "do_not_share_warning_text" : "Não os compartilhe com mais ninguém, incluindo suporte.\n\nEles vão roubar seu dinheiro!",
  "help": "ajuda",
  "all_transactions": "Todas as transacções",
-  "all_trades": "Todas as negociações"
+  "all_trades": "Todas as negociações",
+  "disable_exchange": "Desativar troca"
 }
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@ -653,5 +653,6 @@
  "do_not_share_warning_text" : "Не делитесь ими с кем-либо еще, в том числе со службой поддержки.\n\nОни украдут ваши деньги!",
  "help": "помощь",
  "all_transactions": "Все транзакции",
-  "all_trades": "Все сделки"
+  "all_trades": "Все сделки",
+  "disable_exchange": "Отключить обмен"
 }
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@ -652,5 +652,6 @@
  "do_not_share_warning_text" : "Не повідомляйте їх нікому, включно зі службою підтримки.\n\nВони вкрадуть ваші гроші!",
  "help": "допомога",
  "all_transactions": "Всі транзакції",
-  "all_trades": "Всі операції"
+  "all_trades": "Всі операції",
+  "disable_exchange": "Вимкнути exchange"
 }
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@ -651,5 +651,6 @@
  "do_not_share_warning_text" : "不要與其他任何人分享這些內容，包括支持。\n\n他們會偷你的錢！",
  "help": "帮助",
  "all_transactions": "所有交易",
-  "all_trades": "所有的变化"
+  "all_trades": "所有的变化",
+  "disable_exchange": "禁用交换"
 }
--- a/scripts/android/app_env.sh
+++ b/scripts/android/app_env.sh
@ -14,14 +14,14 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
 APP_ANDROID_TYPE=$1

 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.2.0"
-MONERO_COM_BUILD_NUMBER=28
+MONERO_COM_VERSION="1.2.1"
+MONERO_COM_BUILD_NUMBER=32
 MONERO_COM_BUNDLE_ID="com.monero.app"
 MONERO_COM_PACKAGE="com.monero.app"

 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.5.0"
-CAKEWALLET_BUILD_NUMBER=132
+CAKEWALLET_VERSION="4.5.1"
+CAKEWALLET_BUILD_NUMBER=136
 CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
 CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"

--- a/scripts/ios/app_env.sh
+++ b/scripts/ios/app_env.sh
@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
 APP_IOS_TYPE=$1

 MONERO_COM_NAME="Monero.com"
-MONERO_COM_VERSION="1.2.0"
-MONERO_COM_BUILD_NUMBER=28
+MONERO_COM_VERSION="1.2.1"
+MONERO_COM_BUILD_NUMBER=29
 MONERO_COM_BUNDLE_ID="com.cakewallet.monero"

 CAKEWALLET_NAME="Cake Wallet"
-CAKEWALLET_VERSION="4.5.0"
-CAKEWALLET_BUILD_NUMBER=132
+CAKEWALLET_VERSION="4.5.1"
+CAKEWALLET_BUILD_NUMBER=133
 CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"

 HAVEN_NAME="Haven"
--- a/tool/utils/secret_key.dart
+++ b/tool/utils/secret_key.dart
@ -28,6 +28,7 @@ class SecretKey {
    SecretKey('simpleSwapApiKey', () => ''),
    SecretKey('anypayToken', () => ''),
    SecretKey('onramperApiKey', () => ''),
+    SecretKey('ioniaClientId', () => ''),
  ];

  final String name;