Merge branch 'main' into chore/eslint-update

CHANGELOG.md

@@ -2,6 +2,103 @@
 
 ## Current Main Branch
 
+## 7.30.0 - Sep 6, 2024
+### Added
+- [#10748](https://github.com/MetaMask/metamask-mobile/pull/10748): feat: Add yarn flipper script (#10748)
+- [#10739](https://github.com/MetaMask/metamask-mobile/pull/10739): feat: Feat/add redux debugger (#10739)
+- [#10589](https://github.com/MetaMask/metamask-mobile/pull/10589): feat: Feat/10521 react-native-performance mvp for measuring app start + JS bundle load times (#10589)
+- [#10696](https://github.com/MetaMask/metamask-mobile/pull/10696): feat: Update @blockaid/ppom_release to release 1.5.2 (#10696)
+- [#10718](https://github.com/MetaMask/metamask-mobile/pull/10718): feat: update add team label workflow (#10718)
+- [#10682](https://github.com/MetaMask/metamask-mobile/pull/10682): feat: 2794 account edit permission multichain bottomsheet UI changes only (#10682)
+- [#10542](https://github.com/MetaMask/metamask-mobile/pull/10542): feat: add warning banner to custom network bottom sheet (#10542)
+- [#10519](https://github.com/MetaMask/metamask-mobile/pull/10519): feat: multichain popular network dapp connection confirmation bottomsheet (#10519)
+- [#10393](https://github.com/MetaMask/metamask-mobile/pull/10393): feat(ramp): add property to provider selected event (#10393)
+- [#10395](https://github.com/MetaMask/metamask-mobile/pull/10395): feat(ramp): add amounts to quotes received event (#10395)
+- [#10596](https://github.com/MetaMask/metamask-mobile/pull/10596): feat: select multi rpc UI (#10596)
+- [#10123](https://github.com/MetaMask/metamask-mobile/pull/10123): feat: improve add network fields checkers (#10123)
+- [#9950](https://github.com/MetaMask/metamask-mobile/pull/9950): feat: QR-based add NGRAVE ZERO Hardware (#9950)
+
+### Changed
+- [#10746](https://github.com/MetaMask/metamask-mobile/pull/10746): chore: fix another batch of TS errors (#10746)
+- [#10735](https://github.com/MetaMask/metamask-mobile/pull/10735): chore: Add E2E folders to sonar exclusion list (#10735)
+- [#10697](https://github.com/MetaMask/metamask-mobile/pull/10697): chore: Add more typescript fixes (#10697)
+- [#10549](https://github.com/MetaMask/metamask-mobile/pull/10549): chore: New Crowdin translations by Github Action (#10549)
+- [#10732](https://github.com/MetaMask/metamask-mobile/pull/10732): chore: ignore errors that are fixed on TS v5 (#10732)
+- [#10710](https://github.com/MetaMask/metamask-mobile/pull/10710): chore: remove tsc issues of node_modules (#10710)
+- [#10670](https://github.com/MetaMask/metamask-mobile/pull/10670): chore: Implement TypeScript for Ramp folder (#10670)
+- [#10285](https://github.com/MetaMask/metamask-mobile/pull/10285): chore: enable webview debugging for all builds but prod (#10285)
+- [#10698](https://github.com/MetaMask/metamask-mobile/pull/10698): chore: Ignore TS issues on snaps directory (#10698)
+- [#10636](https://github.com/MetaMask/metamask-mobile/pull/10636): test: Update ios simulator to iphone 15 (#10636)
+- [#10707](https://github.com/MetaMask/metamask-mobile/pull/10707): chore: Fix TS errors in batch of components/UI folder (#10707)
+- [#10720](https://github.com/MetaMask/metamask-mobile/pull/10720): test: disable sonar on E2E folder (#10720)
+- [#10603](https://github.com/MetaMask/metamask-mobile/pull/10603): chore: reverting chainID 1338 (#10603)
+- [#10709](https://github.com/MetaMask/metamask-mobile/pull/10709): chore: Bump version 1398 RC3 (#10709)
+- [#10700](https://github.com/MetaMask/metamask-mobile/pull/10700): chore: removing unused component (#10700)
+- [#10690](https://github.com/MetaMask/metamask-mobile/pull/10690): chore: Prevent crash when engine is not initialized (#10690)
+- [#10587](https://github.com/MetaMask/metamask-mobile/pull/10587): chore: Typescript Views folder part 3 - 1 (#10587)
+- [#10672](https://github.com/MetaMask/metamask-mobile/pull/10672): chore: TS coverage on views folder part 3 - 2 (#10672)
+- [#10665](https://github.com/MetaMask/metamask-mobile/pull/10665): chore: Views directory ts coverage - part 1 (#10665)
+- [#10675](https://github.com/MetaMask/metamask-mobile/pull/10675): chore: typescript no check on notifications directory (#10675)
+- [#10594](https://github.com/MetaMask/metamask-mobile/pull/10594): chore: Typescript Views folder part 3 - 3 (#10594)
+- [#10681](https://github.com/MetaMask/metamask-mobile/pull/10681): chore: blockaid and fav icon test files ts errors (#10681)
+- [#10561](https://github.com/MetaMask/metamask-mobile/pull/10561): chore: 10311 transactions simulation dir (#10561)
+- [#10663](https://github.com/MetaMask/metamask-mobile/pull/10663): chore: Update axios to v1.7.4 (#10663)
+- [#10645](https://github.com/MetaMask/metamask-mobile/pull/10645): chore: confirmations directory ts coverage (#10645)
+- [#10653](https://github.com/MetaMask/metamask-mobile/pull/10653): chore: skip flakey test (#10653)
+- [#10557](https://github.com/MetaMask/metamask-mobile/pull/10557): test: Bump Detox version from v20.20.3 to v20.23.1 (#10557)
+- [#10609](https://github.com/MetaMask/metamask-mobile/pull/10609): chore: Cherry pick new terms of use (#10609)
+- [#10537](https://github.com/MetaMask/metamask-mobile/pull/10537): chore: TS coverage UI folder part 1 (#10537)
+- [#10538](https://github.com/MetaMask/metamask-mobile/pull/10538): chore: Update terms of use modal (#10538)
+- [#10559](https://github.com/MetaMask/metamask-mobile/pull/10559): chore: Create app launch times pipeline (#10559)
+- [#10575](https://github.com/MetaMask/metamask-mobile/pull/10575): chore: enable sonar on E2E (#10575)
+- [#10307](https://github.com/MetaMask/metamask-mobile/pull/10307): chore: Fix some TS errors in component library (#10307)
+- [#10578](https://github.com/MetaMask/metamask-mobile/pull/10578): chore: audit override (#10578)
+- [#10576](https://github.com/MetaMask/metamask-mobile/pull/10576): chore: merge 7.28.0 (#10576)
+- [#10510](https://github.com/MetaMask/metamask-mobile/pull/10510): chore: update Android SDK to API Level 34 (#10510)
+- [#10553](https://github.com/MetaMask/metamask-mobile/pull/10553): chore: move detox setup into its own script (#10553)
+- [#10354](https://github.com/MetaMask/metamask-mobile/pull/10354): chore: New Crowdin translations by Github Action (#10354)
+- [#10546](https://github.com/MetaMask/metamask-mobile/pull/10546): chore: add runway bot to CLA allow list (#10546)
+- [#10535](https://github.com/MetaMask/metamask-mobile/pull/10535): chore: Optimize/10528 remove generated svgs (#10535)
+- [#10534](https://github.com/MetaMask/metamask-mobile/pull/10534): chore: chore/7.29.0-Changelog (#10534)
+- [#10712](https://github.com/MetaMask/metamask-mobile/pull/10712): test: Refactor AdvancedView.js (#10712)
+- [#10536](https://github.com/MetaMask/metamask-mobile/pull/10536): test: Refactor RequestPaymentView page object (#10536)
+- [#10647](https://github.com/MetaMask/metamask-mobile/pull/10647): chore: updated in-app review to comply with SDK 14 on Android (#10647)
+- [#10437](https://github.com/MetaMask/metamask-mobile/pull/10437): chore: Bump @metamask/smart-transactions-controller from 10.1.1 to 11.0.0 (#10437)
+- [#10565](https://github.com/MetaMask/metamask-mobile/pull/10565): chore: Enable smart transactions only for ETH mainnet in production and for ETH mainnet and Sepolia in non-prod (#10565)
+- [#10608](https://github.com/MetaMask/metamask-mobile/pull/10608): chore: add test variant for credential reveal (#10608)
+- [#10262](https://github.com/MetaMask/metamask-mobile/pull/10262): chore(ramp): upgrade sdk to 1.28.3 and remove chainId casting (#10262)
+- [#10680](https://github.com/MetaMask/metamask-mobile/pull/10680): refactor(notification types): fix notification types (#10680)
+- [#10639](https://github.com/MetaMask/metamask-mobile/pull/10639): chore: chery pick fix for harmony network image (#10639)
+- [#10490](https://github.com/MetaMask/metamask-mobile/pull/10490): chore: Add primary currency to user object in MetaMetrics (#10490)
+- [#10457](https://github.com/MetaMask/metamask-mobile/pull/10457): chore: Notifications Settings Polishing (#10457)
+- [#10692](https://github.com/MetaMask/metamask-mobile/pull/10692): perf: add parallel fetching for the network fee dropdown (#10692)
+- [#10539](https://github.com/MetaMask/metamask-mobile/pull/10539): chore: enhance Source Detection Logic in Analytics Parameters (#10539)
+
+### Fixed
+- [#10649](https://github.com/MetaMask/metamask-mobile/pull/10649): fix: Update test dapp favorite selector (#10649)
+- [#10641](https://github.com/MetaMask/metamask-mobile/pull/10641): fix: Add missing pod lock changes (#10641)
+- [#10613](https://github.com/MetaMask/metamask-mobile/pull/10613): fix: useBlockExplorer hook (#10613)
+- [#10598](https://github.com/MetaMask/metamask-mobile/pull/10598): fix: App crashes when deleting browser favorites on android devices (#10598)
+- [#10489](https://github.com/MetaMask/metamask-mobile/pull/10489): fix: url change bug (#10489)
+- [#10733](https://github.com/MetaMask/metamask-mobile/pull/10733): fix: remove duplicate origin validation in transaction controller (#10733)
+- [#10658](https://github.com/MetaMask/metamask-mobile/pull/10658): fix: issue in blockaid spinner for batched confirmations (#10658)
+- [#10588](https://github.com/MetaMask/metamask-mobile/pull/10588): fix: disabled what's new modal (#10588)
+- [#10547](https://github.com/MetaMask/metamask-mobile/pull/10547): fix: settings toggle extra large paddings when biometrics hidden (#10547)
+- [#10154](https://github.com/MetaMask/metamask-mobile/pull/10154): fix: sets data marketing to false in case of non-selection (#10154)
+- [#10532](https://github.com/MetaMask/metamask-mobile/pull/10532): fix: replaced incorrect icons on wallet bottom sheet with correct icons (#10532)
+- [#10548](https://github.com/MetaMask/metamask-mobile/pull/10548): fix: replaced incorrect export icon with correct icon (#10548)
+- [#10607](https://github.com/MetaMask/metamask-mobile/pull/10607): fix: hold to reveal UI/UX (#10607)
+- [#10683](https://github.com/MetaMask/metamask-mobile/pull/10683): fix: remove snap webview flag (#10683)
+- [#10600](https://github.com/MetaMask/metamask-mobile/pull/10600): fix: harmony network image (#10600)
+- [#10404](https://github.com/MetaMask/metamask-mobile/pull/10404): fix: aggregated balance calculation (#10404)
+- [#10394](https://github.com/MetaMask/metamask-mobile/pull/10394): fix: switch chain with walletconnect (#10394)
+- [#10637](https://github.com/MetaMask/metamask-mobile/pull/10637): fix: swap button blocked by SwapsController polling issue (#10637)
+- [#10361](https://github.com/MetaMask/metamask-mobile/pull/10361): fix: fix alignment issues in onboarding success (#10361)
+- [#10741](https://github.com/MetaMask/metamask-mobile/pull/10741): fix: bump micromatch to 4.0.7 (#10741)
+- [#10668](https://github.com/MetaMask/metamask-mobile/pull/10668): fix: notifications first round of tests (#10668)
+- [#10640](https://github.com/MetaMask/metamask-mobile/pull/10640): fix: notification small fixes (#10640)
+- [#10693](https://github.com/MetaMask/metamask-mobile/pull/10693): fix: notification second round fixes (#10693)
+
 ## 7.29.2 - Sep 2, 2024
 ### Fixed
 - [#10965](https://github.com/MetaMask/metamask-mobile/pull/10965): fix: gas never loading during send + high gas fee after deep link (#10965)
@@ -75,6 +172,10 @@
 - [#10383](https://github.com/MetaMask/metamask-mobile/pull/10383): fix: race condition issues when doing batch-rpc calls in the DeeplinkProtocolService (#10383)
 - [#10365](https://github.com/MetaMask/metamask-mobile/pull/10365): fix: attribution link (#10365)
 - [#10303](https://github.com/MetaMask/metamask-mobile/pull/10303): fix: page navigation during QR accounts selection (#10303)
+<<<<<<< HEAD
+
+=======
+>>>>>>> main
 ## 7.28.1 - Aug 15, 2024
 ### Fixed
 - [#10637](https://github.com/MetaMask/metamask-mobile/pull/10637): fix: swap button blocked by SwapsController polling issue (#10637)

android/app/build.gradle

@@ -173,8 +173,8 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1409
-        versionName "7.29.2"
+        versionCode 1410
+        versionName "7.30.0"
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy 'react-native-camera', 'general'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/components/Approvals/SignatureApproval/SignatureApproval.tsx

@@ -9,7 +9,6 @@ const SignatureApproval = () => {
   const onSignConfirm = useCallback(async () => {
     await onConfirm({
       waitForResult: true,
-      //@ts-expect-error - this is added via patch of approval controller
       deleteAfterResult: true,
       handleErrors: false,
     });

app/components/UI/AccountInfoCard/index.js

@@ -135,7 +135,6 @@ class AccountInfoCard extends PureComponent {
      */
     ticker: PropTypes.string,
     transaction: PropTypes.object,
-    activeTabUrl: PropTypes.string,
     origin: PropTypes.string,
   };
 
@@ -150,7 +149,6 @@ class AccountInfoCard extends PureComponent {
       showFiatBalance = true,
       fromAddress: rawFromAddress,
       transaction,
-      activeTabUrl,
       origin,
     } = this.props;
 
@@ -180,16 +178,14 @@ class AccountInfoCard extends PureComponent {
       url: isOriginUrl ? origin : originatorInfo?.url ?? strings('sdk.unknown'),
       icon: originatorInfo?.icon,
     };
+    const actualOriginUrl = isOriginUrl
+      ? origin
+      : originatorInfo?.url ?? strings('sdk.unknown');
 
     return operation === 'signing' && transaction !== undefined ? (
       <ApproveTransactionHeader
-        origin={
-          (isOriginUrl
-            ? origin
-            : originatorInfo?.url ?? strings('sdk.unknown')) ||
-          transaction.origin
-        }
-        url={activeTabUrl}
+        origin={actualOriginUrl}
+        url={actualOriginUrl}
         from={rawFromAddress}
         sdkDappMetadata={sdkDappMetadata}
       />

app/components/UI/BasicFunctionality/BasicFunctionalityModal/BasicFunctionalityModal.tsx

@@ -30,7 +30,9 @@ import {
   asyncAlert,
   requestPushNotificationsPermission,
 } from '../../../../util/notifications';
+import { MetaMetricsEvents } from '../../../../core/Analytics';
 import { useEnableNotifications } from '../../../../util/notifications/hooks/useNotifications';
+import { useMetrics } from '../../../hooks/useMetrics';
 
 interface Props {
   route: {
@@ -41,6 +43,7 @@ interface Props {
 }
 
 const BasicFunctionalityModal = ({ route }: Props) => {
+  const { trackEvent } = useMetrics();
   const { colors } = useTheme();
   const styles = createStyles(colors);
   const bottomSheetRef = useRef<BottomSheetRef>(null);
@@ -68,9 +71,14 @@ const BasicFunctionalityModal = ({ route }: Props) => {
   }, [enableNotifications]);
 
   const closeBottomSheet = async () => {
-    bottomSheetRef.current?.onCloseBottomSheet(() =>
-      dispatch(toggleBasicFunctionality(!isEnabled)),
-    );
+    bottomSheetRef.current?.onCloseBottomSheet(() => {
+      dispatch(toggleBasicFunctionality(!isEnabled));
+      trackEvent(
+        !isEnabled
+          ? MetaMetricsEvents.BASIC_FUNCTIONALITY_ENABLED
+          : MetaMetricsEvents.BASIC_FUNCTIONALITY_DISABLED,
+      );
+    });
 
     if (
       route.params.caller === Routes.SETTINGS.NOTIFICATIONS ||

app/components/UI/HardwareWallet/AccountSelector/index.tsx

@@ -28,8 +28,6 @@ interface ISelectQRAccountsProps {
   onUnlock: (accountIndex: number[]) => void;
   onForget: () => void;
   title: string;
-  warningMsg?: string;
-  subMsg?: string;
 }
 
 const AccountSelector = (props: ISelectQRAccountsProps) => {
@@ -42,8 +40,6 @@ const AccountSelector = (props: ISelectQRAccountsProps) => {
     onForget,
     onUnlock,
     title,
-    warningMsg,
-    subMsg,
   } = props;
 
   const { colors } = useTheme();
@@ -89,8 +85,6 @@ const AccountSelector = (props: ISelectQRAccountsProps) => {
   return (
     <View style={styles.container}>
       <Text style={styles.title}>{title}</Text>
-      {warningMsg && <Text style={styles.warning}>{warningMsg}</Text>}
-      {subMsg && <Text style={styles.subMsg}>{subMsg}</Text>}
       <FlatList
         data={formattedAccounts}
         keyExtractor={(item) => `address-${item.index}`}

app/components/UI/Notification/List/__snapshots__/index.test.tsx.snap

@@ -6,7 +6,6 @@ exports[`NotificationsList should render correctly 1`] = `
     {
       "backgroundColor": "#ffffff",
       "flex": 1,
-      "marginHorizontal": 8,
     }
   }
 >

app/components/UI/Notification/List/index.tsx

@@ -105,7 +105,6 @@ function NotificationsListItem(props: NotificationsListItemProps) {
         isRead={props.notification.isRead}
         {...menuItemState}
       />
-      <NotificationMenuItem.Icon {...menuItemState} />
       <NotificationMenuItem.Content {...menuItemState} />
     </NotificationMenuItem.Root>
   );

app/components/UI/Notification/List/styles.ts

@@ -9,23 +9,22 @@ export const createStyles = ({ colors, typography }: Theme) =>
     container: {
       flex: 1,
       backgroundColor: colors.background.default,
-      marginHorizontal: 8,
     },
     itemContainer: {
       flex: 1,
       paddingVertical: 10,
-      paddingHorizontal: 8,
+      paddingHorizontal: 32,
     },
     unreadItemContainer: {
       flex: 1,
       paddingVertical: 10,
-      paddingHorizontal: 8,
+      paddingHorizontal: 32,
       backgroundColor: colors.info.muted,
     },
     readItemContainer: {
       flex: 1,
       paddingVertical: 10,
-      paddingHorizontal: 8,
+      paddingHorizontal: 32,
       backgroundColor: colors.background.default,
     },
     unreadDot: {
@@ -98,6 +97,7 @@ export const createStyles = ({ colors, typography }: Theme) =>
     itemLogoSize: {
       width: 32,
       height: 32,
+      marginLeft: 4,
     },
     containerFill: { flex: 1 },
     badgeWrapper: {

app/components/UI/Notification/NotificationMenuItem/__snapshots__/Icon.test.tsx.snap

@@ -6,6 +6,7 @@ exports[`NotificationIcon matches snapshot when icon is provided 1`] = `
     style={
       {
         "height": 32,
+        "marginLeft": 4,
         "width": 32,
       }
     }