merge main and solve conflicts

MetaMask · Oct 18, 2024 · fc2e6a1 · fc2e6a1
2 parents 5790121 + 6d6c420
commit fc2e6a1
Show file tree

Hide file tree

Showing 164 changed files with 11,978 additions and 3,172 deletions.
diff --git a/.depcheckrc.yml b/.depcheckrc.yml
@@ -2,6 +2,7 @@
 ignores:
   - '@metamask/oss-attribution-generator'
   - 'webpack-cli'
+  - '@react-native-community/datetimepicker'
   - '@react-native-community/slider'
   - 'patch-package'
   - '@lavamoat/allow-scripts'

diff --git a/.detoxrc.js b/.detoxrc.js
@@ -26,7 +26,7 @@ module.exports = {
   configurations: {
     'ios.sim.apiSpecs': {
       device: 'ios.simulator',
-      app: 'ios.qa',
+      app: process.env.CI ? 'ios.qa' :'ios.debug',
       testRunner: {
         args: {
           "$0": "node e2e/api-specs/run-api-spec-tests.js",

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
           cache: yarn
       - uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 #v1
         with:
-          ruby-version: '3.1.5'
+          ruby-version: '3.1.6'
           bundler-cache: true
         env:
           BUNDLE_GEMFILE: ios/Gemfile

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.1.5
+3.1.6
diff --git a/app/component-library/components-temp/Accounts/AccountBase/AccountBase.styles.ts b/app/component-library/components-temp/Accounts/AccountBase/AccountBase.styles.ts
@@ -29,7 +29,6 @@ const styleSheet = StyleSheet.create({
     justifyContent: 'flex-start',
   },
   accountNameLabelText: {
-    marginLeft: 4,
     paddingHorizontal: 8,
     borderWidth: 1,
     borderRadius: 8,

diff --git a/app/component-library/components-temp/Accounts/AccountBase/AccountBase.tsx b/app/component-library/components-temp/Accounts/AccountBase/AccountBase.tsx
@@ -49,15 +49,17 @@ const AccountBase = ({
 
         <View style={styles.accountNameLabel}>
           <Text variant={TextVariant.BodyMDBold}>{accountName}</Text>
-          {accountTypeLabel && (
+        </View>
+        {accountTypeLabel && (
+          <View style={styles.accountNameLabel}>
             <Text
-              variant={TextVariant.BodySM}
+              variant={TextVariant.BodyMDBold}
               style={styles.accountNameLabelText}
             >
               {strings(accountTypeLabel)}
             </Text>
-          )}
         </View>
+        )}
       </View>
     </View>
     <View>

diff --git a/app/components/Base/Title/Title.tsx b/app/components/Base/Title/Title.tsx
@@ -18,12 +18,12 @@ const Title: React.FC<TitleProps> = ({
 
   return (
     <Text
-      style={[
-        style.text,
-        centered && style.centered,
-        hero && style.hero,
-        externalStyle,
-      ]}
+      style={{
+        ...style.text,
+        ...(centered ? style.centered : {}),
+        ...(hero ? style.hero : {}),
+        ...(typeof externalStyle === 'object' ? externalStyle : {}),
+      }}
       {...props}
     />
   );

diff --git a/app/components/Nav/App/index.js b/app/components/Nav/App/index.js
@@ -131,6 +131,7 @@ import OptionsSheet from '../../UI/SelectOptionSheet/OptionsSheet';
 import FoxLoader from '../../../components/UI/FoxLoader';
 import { AppStateEventProcessor } from '../../../core/AppStateEventListener';
 import MultiRpcModal from '../../../components/Views/MultiRpcModal/MultiRpcModal';
+import { trace, TraceName, TraceOperation } from '../../../util/trace';
 
 const clearStackNavigatorOptions = {
   headerShown: false,
@@ -354,7 +355,15 @@ const App = (props) => {
       setOnboarded(!!existingUser);
       try {
         if (existingUser) {
-          await Authentication.appTriggeredAuth();
+          await trace(
+            {
+              name: TraceName.BiometricAuthentication,
+              op: TraceOperation.BiometricAuthentication,
+            },
+            async () => {
+              await Authentication.appTriggeredAuth();
+            },
+          );
           // we need to reset the navigator here so that the user cannot go back to the login screen
           navigator.reset({ routes: [{ name: Routes.ONBOARDING.HOME_NAV }] });
         } else {

diff --git a/app/components/UI/CollectibleContracts/index.test.tsx b/app/components/UI/CollectibleContracts/index.test.tsx
@@ -99,7 +99,7 @@ describe('CollectibleContracts', () => {
           AccountsController: MOCK_ACCOUNTS_CONTROLLER_STATE,
           NftController: {
             allNfts: {
-              [MOCK_ADDRESS]: {
+              [MOCK_ADDRESS.toLowerCase()]: {
                 '0x1': [
                   {
                     address: '0x72b1FDb6443338A158DeC2FbF411B71aeB157A42',
@@ -131,7 +131,7 @@ describe('CollectibleContracts', () => {
               },
             },
             allNftContracts: {
-              [MOCK_ADDRESS]: {
+              [MOCK_ADDRESS.toLowerCase()]: {
                 '0x1': [
                   {
                     address: '0x72b1FDb6443338A158DeC2FbF411B71aeB157A42',

diff --git a/app/components/UI/LedgerModals/LedgerConfirmationModal.test.tsx b/app/components/UI/LedgerModals/LedgerConfirmationModal.test.tsx
@@ -407,24 +407,10 @@ describe('LedgerConfirmationModal', () => {
   });
 
   it('calls onRejection when user refuses confirmation', async () => {
-    const onRejection = jest.fn();
-    (useLedgerBluetooth as jest.Mock).mockReturnValue({
-      isSendingLedgerCommands: true,
-      isAppLaunchConfirmationNeeded: false,
-      ledgerLogicToRun: jest.fn(),
-      error: LedgerCommunicationErrors.UserRefusedConfirmation,
-    });
-
-    renderWithProvider(
-      <LedgerConfirmationModal
-        onConfirmation={jest.fn()}
-        onRejection={onRejection}
-        deviceId={'test'}
-      />,
+    checkLedgerCommunicationErrorFlow(
+      LedgerCommunicationErrors.UserRefusedConfirmation,
+      strings('ledger.user_reject_transaction'),
+      strings('ledger.user_reject_transaction_message'),
     );
-    // eslint-disable-next-line no-empty-function
-    await act(async () => {});
-
-    expect(onRejection).toHaveBeenCalled();
   });
 });
diff --git a/app/components/UI/LedgerModals/LedgerConfirmationModal.tsx b/app/components/UI/LedgerModals/LedgerConfirmationModal.tsx
@@ -160,7 +160,10 @@ const LedgerConfirmationModal = ({
           });
           break;
         case LedgerCommunicationErrors.UserRefusedConfirmation:
-          onReject();
+          setErrorDetails({
+            title: strings('ledger.user_reject_transaction'),
+            subtitle: strings('ledger.user_reject_transaction_message'),
+          });
           break;
         case LedgerCommunicationErrors.LedgerHasPendingConfirmation:
           setErrorDetails({
@@ -275,7 +278,9 @@ const LedgerConfirmationModal = ({
             isRetryHide={
               ledgerError === LedgerCommunicationErrors.UnknownError ||
               ledgerError === LedgerCommunicationErrors.NonceTooLow ||
-              ledgerError === LedgerCommunicationErrors.NotSupported
+              ledgerError === LedgerCommunicationErrors.NotSupported ||
+              ledgerError === LedgerCommunicationErrors.BlindSignError ||
+              ledgerError === LedgerCommunicationErrors.UserRefusedConfirmation
             }
           />
         </View>

diff --git a/app/components/UI/Navbar/index.js b/app/components/UI/Navbar/index.js
@@ -1824,34 +1824,61 @@ export const getSettingsNavigationOptions = (title, themeColors) => {
   };
 };
 
-export function getStakingNavbar(title, navigation, themeColors) {
+/**
+ *
+ * @param {String} title - Navbar Title.
+ * @param {NavigationProp<ParamListBase>} navigation Navigation object returned from useNavigation hook.
+ * @param {ThemeColors} themeColors theme.colors returned from useStyles hook.
+ * @param {{ backgroundColor?: string, hasCancelButton?: boolean, hasBackButton?: boolean }} [options] - Optional options for navbar.
+ * @returns Staking Navbar Component.
+ */
+export function getStakingNavbar(title, navigation, themeColors, options) {
+  const { hasBackButton = true, hasCancelButton = true } = options ?? {};
+
   const innerStyles = StyleSheet.create({
+    headerStyle: {
+      backgroundColor:
+        options?.backgroundColor ?? themeColors.background.default,
+      shadowOffset: null,
+    },
+    headerLeft: {
+      marginHorizontal: 16,
+    },
     headerButtonText: {
       color: themeColors.primary.default,
       fontSize: 14,
       ...fontStyles.normal,
     },
-    headerStyle: {
-      backgroundColor: themeColors.background.default,
-      shadowColor: importedColors.transparent,
-      elevation: 0,
-    },
   });
+
+  function navigationPop() {
+    navigation.goBack();
+  }
+
   return {
     headerTitle: () => (
-      <NavbarTitle title={title} disableNetwork translate={false} />
-    ),
-    headerLeft: () => <View />,
-    headerRight: () => (
-      <TouchableOpacity
-        onPress={() => navigation.dangerouslyGetParent()?.pop()}
-        style={styles.closeButton}
-      >
-        <Text style={innerStyles.headerButtonText}>
-          {strings('navigation.cancel')}
-        </Text>
-      </TouchableOpacity>
+      <MorphText variant={TextVariant.HeadingMD}>{title}</MorphText>
     ),
     headerStyle: innerStyles.headerStyle,
+    headerLeft: () =>
+      hasBackButton ? (
+        <ButtonIcon
+          size={ButtonIconSizes.Lg}
+          iconName={IconName.ArrowLeft}
+          onPress={navigationPop}
+          style={innerStyles.headerLeft}
+        />
+      ) : null,
+    headerRight: () =>
+      hasCancelButton ? (
+        <TouchableOpacity
+          onPress={() => navigation.dangerouslyGetParent()?.pop()}
+          style={styles.closeButton}
+        >
+          <Text style={innerStyles.headerButtonText}>
+            {strings('navigation.cancel')}
+          </Text>
+        </TouchableOpacity>
+      ) : null,
   };
 }