Merge branch 'main' into bkirby/returningUserTest

MetaMask · Oct 22, 2024 · c6e3865 · c6e3865
2 parents 277ed03 + ffec4fd
commit c6e3865
Show file tree

Hide file tree

Showing 46 changed files with 1,960 additions and 917 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -51,6 +51,12 @@ module.exports = {
       rules: {
         // under discussion
         'no-unused-vars': 'off',
+        'react/no-unstable-nested-components': [
+          'warn',
+          {
+            allowAsProps: true,
+          },
+        ],
       },
     },
     {

diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml
@@ -43,14 +43,10 @@ jobs:
           cache: yarn
       - name: Install dependencies
         run: yarn --immutable
-      - name: Set Versions
-        id: set-versions
-        shell: bash
-        run: SEMVER_VERSION=${{ github.event.inputs.semver-version }} VERSION_NUMBER=${{ github.event.inputs.version-number }} yarn set-version
-      - name: Create Release PR
-        id: create-release-pr
+      - name: Create Release & Changelog PR
+        id: create-release-changelog-pr
         shell: bash
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          ./scripts/create-release-pr.sh ${{ github.event.inputs.previous-version-tag }} ${{ github.event.inputs.semver-version }}
+          ./scripts/create-release-pr.sh ${{ github.event.inputs.previous-version-tag }} ${{ github.event.inputs.semver-version }} ${{ github.event.inputs.version-number }}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,5 +6,7 @@
   "cucumberautocomplete.steps": ["wdio/step-definitions/**/*.js"],
   "cucumberautocomplete.syncfeatures": "wdio/to/features/*.feature",
   "cucumberautocomplete.strictGherkinCompletion": true,
-  "typescript.tsdk": "node_modules/typescript/lib"
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "javascript.preferences.importModuleSpecifier": "relative",
+  "typescript.preferences.importModuleSpecifier": "relative"
 }
diff --git a/app/actions/onboarding/index.ts b/app/actions/onboarding/index.ts
@@ -25,4 +25,4 @@ export function clearOnboardingEvents(): ClearEventsAction {
   return {
     type: CLEAR_EVENTS,
   };
-}
+}
diff --git a/app/component-library/components-temp/Contracts/ContractBoxBase/ContractBoxBase.tsx b/app/component-library/components-temp/Contracts/ContractBoxBase/ContractBoxBase.tsx
@@ -39,7 +39,7 @@ const ContractBoxBase = ({
     theme: { colors },
   } = useStyles(styleSheet, {});
 
-  const IconView = ({ onPress, name, size, testID }: IconViewProps) => (
+  const renderIconView = ({ onPress, name, size, testID }: IconViewProps) => (
     <Pressable style={styles.icon} onPress={onPress} testID={testID}>
       <Icon color={colors.icon.alternative} name={name} size={size} />
     </Pressable>
@@ -78,20 +78,19 @@ const ContractBoxBase = ({
         )}
       </View>
       <View style={styles.iconContainer}>
-        <IconView
-          onPress={onCopyAddress}
-          name={IconName.Copy}
-          size={IconSize.Lg}
-          testID={COPY_ICON_TEST_ID}
-        />
-        {hasBlockExplorer && (
-          <IconView
-            name={IconName.Export}
-            onPress={onExportAddress}
-            size={IconSize.Md}
-            testID={EXPORT_ICON_TEST_ID}
-          />
-        )}
+        {renderIconView({
+          onPress: onCopyAddress,
+          name: IconName.Copy,
+          size: IconSize.Lg,
+          testID: COPY_ICON_TEST_ID,
+        })}
+        {hasBlockExplorer &&
+          renderIconView({
+            onPress: onExportAddress,
+            name: IconName.Export,
+            size: IconSize.Md,
+            testID: EXPORT_ICON_TEST_ID,
+          })}
       </View>
     </View>
   );

diff --git a/...ary/components-temp/Contracts/ContractBoxBase/__snapshots__/ContractBoxBase.test.tsx.snap b/...ary/components-temp/Contracts/ContractBoxBase/__snapshots__/ContractBoxBase.test.tsx.snap
@@ -65,12 +65,21 @@ exports[`Component ContractBoxBase should render correctly 1`] = `
       }
     }
   >
-    <IconView
-      name="Copy"
+    <Component
       onPress={[Function]}
-      size="24"
+      style={
+        {
+          "paddingHorizontal": 6,
+        }
+      }
       testID="copy-icon"
-    />
+    >
+      <Icon
+        color="#6a737d"
+        name="Copy"
+        size="24"
+      />
+    </Component>
   </View>
 </View>
 `;
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,4 +25,4 @@ export function clearOnboardingEvents(): ClearEventsAction { @@
       return {
         type: CLEAR_EVENTS,
       };
-    }
+    }