Merge branch 'main' into yarn-1.22.22

.github/workflows/crowdin-pull-branch-pr-completed-translations.yml

@@ -40,9 +40,10 @@ jobs:
         id: get-branches
         run: |
           GITHUB_TOKEN="${{ secrets.GITHUB_TOKEN }}"
+          REPO="${{ github.repository }}"
           
           LABEL="ready-for-translation"
-          API_URL="https://api.github.com/repos/Metamask/crowdin-sandbox/pulls?state=open&per_page=100"
+          API_URL="https://api.github.com/repos/$REPO/pulls?state=open&per_page=100"
           
           # Fetch the list of open pull requests with the specified label using curl
           PRS=$(curl -sS --header "Authorization: Bearer $GITHUB_TOKEN" "$API_URL")

app/components/UI/WebviewError/index.js

@@ -4,7 +4,7 @@ import { Image, StyleSheet, View, Text, Platform } from 'react-native';
 import StyledButton from '../StyledButton';
 import { strings } from '../../../../locales/i18n';
 import { fontStyles } from '../../../styles/common';
-import AnimatedFox from 'react-native-animated-fox';
+import AnimatedFox from '@metamask/react-native-animated-fox';
 import { ThemeContext, mockTheme } from '../../../util/theme';
 import Device from '../../../util/device';
 import generateTestId from '../../../../wdio/utils/generateTestId';

app/components/Views/ChoosePassword/index.js

@@ -57,7 +57,7 @@ import { MetaMetricsEvents } from '../../../core/Analytics';
 import { Authentication } from '../../../core';
 import AUTHENTICATION_TYPE from '../../../constants/userProperties';
 import { ThemeContext, mockTheme } from '../../../util/theme';
-import AnimatedFox from 'react-native-animated-fox';
+import AnimatedFox from '@metamask/react-native-animated-fox';
 
 import { LoginOptionsSwitch } from '../../UI/LoginOptionsSwitch';
 import navigateTermsOfUse from '../../../util/termsOfUse/termsOfUse';

app/components/Views/Login/index.js

@@ -47,7 +47,7 @@ import DefaultPreference from 'react-native-default-preference';
 import { Authentication } from '../../../core';
 import AUTHENTICATION_TYPE from '../../../constants/userProperties';
 import { ThemeContext, mockTheme } from '../../../util/theme';
-import AnimatedFox from 'react-native-animated-fox';
+import AnimatedFox from '@metamask/react-native-animated-fox';
 import { LoginOptionsSwitch } from '../../UI/LoginOptionsSwitch';
 import { createRestoreWalletNavDetailsNested } from '../RestoreWallet/RestoreWallet';
 import { parseVaultValue } from '../../../util/validators';

app/components/Views/Onboarding/index.js

@@ -42,7 +42,7 @@ import { MetaMetricsEvents } from '../../../core/Analytics';
 import { withMetricsAwareness } from '../../hooks/useMetrics';
 import { Authentication } from '../../../core';
 import { ThemeContext, mockTheme } from '../../../util/theme';
-import AnimatedFox from 'react-native-animated-fox';
+import AnimatedFox from '@metamask/react-native-animated-fox';
 import { OnboardingSelectorIDs } from '../../../../e2e/selectors/Onboarding/Onboarding.selectors';
 
 import Routes from '../../../constants/navigation/Routes';

app/components/Views/ResetPassword/index.js

@@ -49,7 +49,7 @@ import {
 import { Authentication } from '../../../core';
 import AUTHENTICATION_TYPE from '../../../constants/userProperties';
 import { ThemeContext, mockTheme } from '../../../util/theme';
-import AnimatedFox from 'react-native-animated-fox';
+import AnimatedFox from '@metamask/react-native-animated-fox';
 import { LoginOptionsSwitch } from '../../UI/LoginOptionsSwitch';
 import { recreateVaultWithNewPassword } from '../../../core/Vault';
 import Logger from '../../../util/Logger';

e2e/specs/onboarding/add-custom-eth-mainnet.spec.js

@@ -6,6 +6,7 @@ import MetaMetricsOptIn from '../../pages/Onboarding/MetaMetricsOptInView';
 import DefaultNetworkView from '../../pages/Onboarding/DefaultNetworkView';
 import TermsOfUseModal from '../../pages/modals/TermsOfUseModal';
 import CreatePasswordView from '../../pages/Onboarding/CreatePasswordView';
+import OnboardingSuccessView from '../../pages/Onboarding/OnboardingSuccessView';
 import EnableAutomaticSecurityChecksView from '../../pages/EnableAutomaticSecurityChecksView';
 import SkipAccountSecurityModal from '../../pages/modals/SkipAccountSecurityModal';
 import WalletView from '../../pages/WalletView';
@@ -54,6 +55,7 @@ describe(Regression('Add custom default ETH Mainnet'), () => {
     await ProtectYourWalletView.tapOnRemindMeLaterButton();
     await SkipAccountSecurityModal.tapIUnderstandCheckBox();
     await SkipAccountSecurityModal.tapSkipButton();
+    await OnboardingSuccessView.tapDone();
     await EnableAutomaticSecurityChecksView.tapNoThanks();
     await WalletView.isNetworkNameVisible(DEFAULT_MAINNET_CUSTOM_NAME);
   });

e2e/specs/permission-systems/permission-system-delete-wallet.spec.js

@@ -18,6 +18,7 @@ import FixtureBuilder from '../../fixtures/fixture-builder';
 import { withFixtures } from '../../fixtures/fixture-helper';
 import MetaMetricsOptIn from '../../pages/Onboarding/MetaMetricsOptInView';
 import ProtectYourWalletModal from '../../pages/modals/ProtectYourWalletModal';
+import OnboardingSuccessView from '../../pages/Onboarding/OnboardingSuccessView';
 import Assertions from '../../utils/Assertions';
 import CommonView from '../../pages/CommonView';
 
@@ -85,6 +86,7 @@ describe(
           await ProtectYourWalletView.tapOnRemindMeLaterButton();
           await SkipAccountSecurityModal.tapIUnderstandCheckBox();
           await SkipAccountSecurityModal.tapSkipButton();
+          await OnboardingSuccessView.tapDone();
           await WalletView.isVisible();
           await ProtectYourWalletModal.tapRemindMeLaterButton();
           await SkipAccountSecurityModal.tapIUnderstandCheckBox();

package.json

@@ -128,7 +128,7 @@
   },
   "dependencies": {
     "@consensys/ledgerhq-metamask-keyring": "0.0.9",
-    "@consensys/on-ramp-sdk": "1.26.8",
+    "@consensys/on-ramp-sdk": "1.27.1",
     "@eth-optimism/contracts": "0.0.0-2021919175625",
     "@ethereumjs/tx": "^3.2.1",
     "@ethersproject/abi": "^5.7.0",
@@ -159,6 +159,7 @@
     "@metamask/post-message-stream": "8.0.0",
     "@metamask/ppom-validator": "0.29.0",
     "@metamask/preferences-controller": "^4.0.0",
+    "@metamask/react-native-animated-fox": "^2.1.0",
     "@metamask/react-native-button": "^3.0.0",
     "@metamask/react-native-splash-screen": "^3.2.0",
     "@metamask/rpc-errors": "^6.2.1",
@@ -258,7 +259,6 @@
     "react-native-aes-crypto": "1.3.9",
     "react-native-aes-crypto-forked": "git+https://github.com/MetaMask/react-native-aes-crypto-forked.git#397d5db5250e8e7408294807965b5b9fd4ca6a25",
     "react-native-animatable": "^1.3.3",
-    "react-native-animated-fox": "git+https://github.com/MetaMask/react-native-animated-fox.git#dbcb0fd3299a22419051da039bb9a747fc093c5b",
     "react-native-background-timer": "2.1.1",
     "react-native-ble-plx": "3.1.2",
     "react-native-blob-jsi-helper": "^0.3.1",

yarn.lock

@@ -1298,13 +1298,13 @@
     buffer "^6.0.3"
     ethereumjs-util "^7.1.5"
 
-"@consensys/on-ramp-sdk@1.26.8":
-  version "1.26.8"
-  resolved "https://registry.yarnpkg.com/@consensys/on-ramp-sdk/-/on-ramp-sdk-1.26.8.tgz#87344f42e6bced535dee9c0f7440954a6bd6955e"
-  integrity sha512-MfTJpYjXEnUc4FIN920vGHe4BzwBTuzKMaavuRYu5E2MyVEa30YUQDhAkgUQtHj/qcH3FAXiISqkGN3/PVzB8A==
+"@consensys/on-ramp-sdk@1.27.1":
+  version "1.27.1"
+  resolved "https://registry.yarnpkg.com/@consensys/on-ramp-sdk/-/on-ramp-sdk-1.27.1.tgz#a422dbfb16a23cdc53b32d9cd307d75b3a438827"
+  integrity sha512-C/ekiaPwFmWDCk0JhXopdvWJ5WuFvZmLPg4DrMEuqIi984+AwDkThU6fCiQ8FjmBIwdMiiYACQlXKjOAKy2/Ww==
   dependencies:
     async "^3.2.3"
-    axios "^0.27.0"
+    axios "^0.28.0"
     axios-retry "^3.1.2"
     crypto-js "^4.2.0"
     jsonpath-plus "^7.2.0"
@@ -4403,6 +4403,13 @@
     readable-stream "^3.6.2"
     webextension-polyfill "^0.10.0"
 
+"@metamask/react-native-animated-fox@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@metamask/react-native-animated-fox/-/react-native-animated-fox-2.1.0.tgz#504e1f68e13ad273fb193c6f6a3832f3a5242518"
+  integrity sha512-Hc+DyaEIXYa7NjzqXfgh01bsoP9WbE/ENNKZ4A65YwSBmJk5ZDvhMgTMFz+qybkUllx4kn4ENkmr0SXERZ2wmg==
+  dependencies:
+    prop-types "^15.5.10"
+
 "@metamask/react-native-button@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@metamask/react-native-button/-/react-native-button-3.0.0.tgz#4af8affd11e2b285cfc1b1752280797e1b33e62b"
@@ -11660,7 +11667,7 @@ axios-retry@^3.1.2:
     "@babel/runtime" "^7.15.4"
     is-retry-allowed "^2.2.0"
 
-[email protected], axios@^0.26.0, axios@^0.27.0, axios@^0.x, axios@^1.6.7, axios@^1.6.8:
+[email protected], axios@^0.26.0, axios@^0.28.0, axios@^0.x, axios@^1.6.7, axios@^1.6.8:
   version "1.6.8"
   resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66"
   integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==
@@ -23992,12 +23999,6 @@ [email protected], react-native-animatable@^1.3.3:
   dependencies:
     prop-types "^15.7.2"
 
-"react-native-animated-fox@git+https://github.com/MetaMask/react-native-animated-fox.git#dbcb0fd3299a22419051da039bb9a747fc093c5b":
-  version "2.0.1"
-  resolved "git+https://github.com/MetaMask/react-native-animated-fox.git#dbcb0fd3299a22419051da039bb9a747fc093c5b"
-  dependencies:
-    prop-types "^15.5.10"
-
 [email protected]:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/react-native-background-timer/-/react-native-background-timer-2.1.1.tgz#9a2489681ab2f8033c213c73272e9d4c47572cd5"