Merge branch 'main' into chore/10309-selectors-confirmations-dir

MetaMask · Jul 31, 2024 · 7b2addd · 7b2addd
2 parents cd46edf + dc06751
commit 7b2addd
Show file tree

Hide file tree

Showing 18 changed files with 738 additions and 46 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,11 @@
 
 ## Current Main Branch
 
-## 7.27.0 - Jul 5, 2024
+## 7.27.1 - Jul 25, 2024
+### Fixed
+- [#10438](https://github.com/MetaMask/metamask-mobile/pull/10438): cherry-pick: update @blockaid/ppom_release package to version 1.5.1 (#10435) #10438
+
+## 7.27.0 - Jul 19, 2024
 ### Added
 - [#7759](https://github.com/MetaMask/metamask-mobile/pull/7759): feat: upgrade react-native-webview (#7759)
 - [#10000](https://github.com/MetaMask/metamask-mobile/pull/10000): feat: support security alerts API (#10000)

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -173,8 +173,8 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1364
-        versionName "7.27.0"
+        versionCode 1369
+        versionName "7.27.1"
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy 'react-native-camera', 'general'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/components/UI/HardwareWallet/AccountSelector/index.tsx b/app/components/UI/HardwareWallet/AccountSelector/index.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useState, useMemo } from 'react';
-import { View, Text, FlatList, TouchableOpacity } from 'react-native';
+import { View, Text, FlatList, TouchableOpacity, Platform } from 'react-native';
 import Icon from 'react-native-vector-icons/FontAwesome';
 import CheckBox from '@react-native-community/checkbox';
 import { useSelector } from 'react-redux';
@@ -13,6 +13,11 @@ import { createStyle } from './styles';
 import AccountDetails from '../AccountDetails';
 import StyledButton from '../../../UI/StyledButton';
 import { selectProviderConfig } from '../../../../selectors/networkController';
+import generateTestId from '../../../../../wdio/utils/generateTestId';
+import {
+  ACCOUNT_SELECTOR_NEXT_BUTTON,
+  ACCOUNT_SELECTOR_PREVIOUS_BUTTON,
+} from '../../../../../wdio/screen-objects/testIDs/Components/AccountSelector.testIds';
 
 interface ISelectQRAccountsProps {
   accounts: IAccount[];
@@ -110,13 +115,21 @@ const AccountSelector = (props: ISelectQRAccountsProps) => {
         )}
       />
       <View style={styles.pagination}>
-        <TouchableOpacity style={styles.paginationItem} onPress={prevPage}>
+        <TouchableOpacity
+          style={styles.paginationItem}
+          onPress={prevPage}
+          {...generateTestId(Platform, ACCOUNT_SELECTOR_PREVIOUS_BUTTON)}
+        >
           <Icon name={'chevron-left'} color={colors.primary.default} />
           <Text style={styles.paginationText}>
             {strings('account_selector.prev')}
           </Text>
         </TouchableOpacity>
-        <TouchableOpacity style={styles.paginationItem} onPress={nextPage}>
+        <TouchableOpacity
+          style={styles.paginationItem}
+          onPress={nextPage}
+          {...generateTestId(Platform, ACCOUNT_SELECTOR_NEXT_BUTTON)}
+        >
           <Text style={styles.paginationText}>
             {strings('account_selector.next')}
           </Text>

diff --git a/app/components/Views/ConnectQRHardware/Instruction/index.tsx b/app/components/Views/ConnectQRHardware/Instruction/index.tsx
@@ -2,7 +2,7 @@
 /* eslint @typescript-eslint/no-require-imports: "off" */
 
 import React from 'react';
-import { View, Text, Image, ScrollView } from 'react-native';
+import { View, Text, Image, ScrollView, Platform } from 'react-native';
 import { strings } from '../../../../../locales/i18n';
 import {
   KEYSTONE_LEARN_MORE,
@@ -12,6 +12,8 @@ import {
 import { useTheme } from '../../../../util/theme';
 import { createStyles } from './styles';
 import StyledButton from '../../../UI/StyledButton';
+import generateTestId from '../../../../../wdio/utils/generateTestId';
+import { QR_CONTINUE_BUTTON } from '../../../../../wdio/screen-objects/testIDs/Components/ConnectQRHardware.testIds';
 
 interface IConnectQRInstructionProps {
   // TODO: Replace "any" with type
@@ -109,6 +111,7 @@ const ConnectQRInstruction = (props: IConnectQRInstructionProps) => {
           type={'confirm'}
           onPress={onConnect}
           style={styles.button}
+          {...generateTestId(Platform, QR_CONTINUE_BUTTON)}
         >
           {strings('connect_qr_hardware.button_continue')}
         </StyledButton>