MetaMask · sethkfman · May 5, 2023 · Apr 28, 2023 · Apr 28, 2023 · Apr 28, 2023
diff --git a/.github/workflows/bump-version-name.yml b/.github/workflows/bump-version-name.yml
@@ -7,7 +7,7 @@ on:
     types: [opened]
 jobs:
   bump-version-name:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: "contains(github.head_ref, 'release/')"
     permissions:
       contents: write  

diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   CLABot:
     if: github.event_name == 'pull_request_target' || contains(github.event.comment.html_url, '/pull/')
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       pull-requests: write
       contents: write

diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml
@@ -15,7 +15,7 @@ on:
 
 jobs:
   create-release-pr:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write

diff --git a/.github/workflows/crowdin_action.yml b/.github/workflows/crowdin_action.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   synchronize-with-crowdin:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     steps:
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,33 @@
 
 ## Current Main Branch
 
+## 6.5.0 - May 4, 2023
+- [#5743](https://github.com/MetaMask/metamask-mobile/pull/5743): [FEATURE] On-ramp: Add buy-crypto deeplink
+- [#6201](https://github.com/MetaMask/metamask-mobile/pull/6201): [FIX] [SDK] Missing redirect breaking backward compatibility
+- [#6232](https://github.com/MetaMask/metamask-mobile/pull/6232): [FIX] bottom margin for detecting end of the page
+- [#6166](https://github.com/MetaMask/metamask-mobile/pull/6166): [FEATURE] trigger walletconnect modal using approval controller
+- [#6223](https://github.com/MetaMask/metamask-mobile/pull/6223): [IMPROVEMENT] Update to Node.js v16
+- [#6051](https://github.com/MetaMask/metamask-mobile/pull/6051): [FEATURE] Total balance and portfolio button changed
+- [#6156](https://github.com/MetaMask/metamask-mobile/pull/6156): [IMPROVEMENT] On-ramp: Use dynamic list of networks
+- [#6145](https://github.com/MetaMask/metamask-mobile/pull/6145): [IMPROVEMENT] Synced and optimized icons
+- [#6138](https://github.com/MetaMask/metamask-mobile/pull/6138): [FEATURE] On-ramp: Add orderProcessor exponential backoff for orders
+- [#6139](https://github.com/MetaMask/metamask-mobile/pull/6139): [FEATURE] On-ramp: Add same amount rendering as the order details to the order list
+- [#6189](https://github.com/MetaMask/metamask-mobile/pull/6189): [FEATURE] On-ramp: Remove hiding the provider modal when quotes refresh
+- [#6216](https://github.com/MetaMask/metamask-mobile/pull/6216): [IMPROVEMENT] account icon matches user's preferred identicon
+- [#5956](https://github.com/MetaMask/metamask-mobile/pull/5956): [IMPROVEMENT] Show token symbol in verify contract details
+- [#5458](https://github.com/MetaMask/metamask-mobile/pull/5458): [IMPROVEMENT] Support sepolia network
+- [#6185](https://github.com/MetaMask/metamask-mobile/pull/6185): [FIX] remove pubnub package and associated sync with extension code
+- [#6181](https://github.com/MetaMask/metamask-mobile/pull/6181): [IMPROVEMENT] Componentize Header Component
+- [#6153](https://github.com/MetaMask/metamask-mobile/pull/6153): [IMPROVEMENT] On-ramp: Refactor order selector by id
+- [#6044](https://github.com/MetaMask/metamask-mobile/pull/6044): [IMPROVEMENT] Componentize Badge and Badge Wrapper
+- [#6180](https://github.com/MetaMask/metamask-mobile/pull/6180): [IMPROVEMENT] Componentized Overlay Component
+- [#6173](https://github.com/MetaMask/metamask-mobile/pull/6173): [REFACTOR] Auto Lock section
+- [#6174](https://github.com/MetaMask/metamask-mobile/pull/6174): [IMPROVEMENT] Update Tab bar styles
+- [#6056](https://github.com/MetaMask/metamask-mobile/pull/6056): [IMPROVEMENT] Show Identicon for unknown token and if token icon is unknown
+- [#6076](https://github.com/MetaMask/metamask-mobile/pull/6076): [BUGFIX] Fixes WalletConnect deep links (wc:// schema) not working properly
+- [#6157](https://github.com/MetaMask/metamask-mobile/pull/6157): [REFACTOR] Change Password setting
+- [#5718](https://github.com/MetaMask/metamask-mobile/pull/5718): [FIX] Nonce Too Low for Approve Transaction
+
 ## 6.4.0 - Apr 20, 2023
 - [#6144](https://github.com/MetaMask/metamask-mobile/pull/6144): [FEATURE] New Crowdin translations by Github Action
 - [#6143](https://github.com/MetaMask/metamask-mobile/pull/6143): [UPDATE] Crowdin token to use METAMASKBOT_CROWDIN_TOKEN

diff --git a/README.md b/README.md
@@ -217,7 +217,7 @@ For local testing, the wallet is created using the secret recovery phrase from t
 ##### iOS
 All tests live within the e2e/specs folder.  
 
-Prequisites for running tests:
+Prerequisites for running tests:
 - Make sure to install `detox-cli` by referring to the instructions mentioned [here](https://wix.github.io/Detox/docs/introduction/getting-started/#detox-prerequisites). 
 - Additionally, install `applesimutils` by following the guidelines provided [here](https://github.com/wix/AppleSimulatorUtils). 
 - Before running any tests, it's recommended to refer to the `iOS section` above and check the latest simulator device specified under `Install the correct simulator`.
@@ -246,7 +246,12 @@ If you have already built the application for Detox and want to run a specific t
 ```bash
 yarn test:e2e:ios:debug:single e2e/specs/TEST_NAME.spec.js
 ```
+To run tests associated with a certain tag, you can do so using the `--testNamePattern` flag. For example: 
 
+```bash
+yarn test:e2e:ios:debug --testNamePattern="Smoke"
+```
+This runs all tests that are tagged "Smoke" 
 ##### Android
 All android tests live within the wdio/feature folder. 
 
@@ -286,7 +291,7 @@ To get a better understanding of the internal architecture of this app take a lo
 
 ### Storybook
 
-We have begun documenting our components using storybook please read the [Documentation Guidelines](./storybook/DOCUMENTATION_GUIDELINES.md) to get up and running.
+We have begun documenting our components using Storybook. Please read the [Documentation Guidelines](./storybook/DOCUMENTATION_GUIDELINES.md) to get up and running.
 
 ### Other Docs
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -98,7 +98,7 @@ def enableSeparateBuildPerCPUArchitecture = false
 /**
  * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
  */
-def enableProguardInReleaseBuilds = false
+def enableProguardInReleaseBuilds = true
 
 /**
  * The preferred build flavor of JavaScriptCore (JSC)
@@ -123,6 +123,14 @@ def reactNativeArchitectures() {
     return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
+/**
+* Adding function that will retuen the Bitrise ndkPath if it is a QA or Production Build
+*/
+def ndkPath() {
+    return System.getenv('METAMASK_ENVIRONMENT') == 'qa' || System.getenv('METAMASK_ENVIRONMENT') == 'production' ? rootProject.ext.bitriseNdkPath : ""
+}
+
+
 android {
     ndkVersion rootProject.ext.ndkVersion
 
@@ -148,24 +156,24 @@ android {
 	  }
 
 	  signingConfigs {
-		  release {
-			  storeFile file('../keystores/release.keystore')
-			  storePassword System.getenv("BITRISEIO_ANDROID_KEYSTORE_PASSWORD")
-			  keyAlias System.getenv("BITRISEIO_ANDROID_KEYSTORE_ALIAS")
-			  keyPassword System.getenv("BITRISEIO_ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD")
-		  }
-      qa {
-        storeFile file('../keystores/internalRelease.keystore')
-        storePassword System.getenv("BITRISEIO_ANDROID_QA_KEYSTORE_PASSWORD")
-        keyAlias System.getenv("BITRISEIO_ANDROID_QA_KEYSTORE_ALIAS")
-        keyPassword System.getenv("BITRISEIO_ANDROID_QA_KEYSTORE_PRIVATE_KEY_PASSWORD")
-      }
-		  debug {
-        storeFile file('debug.keystore')
-        storePassword 'android'
-        keyAlias 'androiddebugkey'
-        keyPassword 'android'
-      }
+		release {
+            storeFile file('../keystores/release.keystore')
+            storePassword System.getenv("BITRISEIO_ANDROID_KEYSTORE_PASSWORD")
+            keyAlias System.getenv("BITRISEIO_ANDROID_KEYSTORE_ALIAS")
+            keyPassword System.getenv("BITRISEIO_ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD")
+		}
+        qa {
+            storeFile file('../keystores/internalRelease.keystore')
+            storePassword System.getenv("BITRISEIO_ANDROID_QA_KEYSTORE_PASSWORD")
+            keyAlias System.getenv("BITRISEIO_ANDROID_QA_KEYSTORE_ALIAS")
+            keyPassword System.getenv("BITRISEIO_ANDROID_QA_KEYSTORE_PRIVATE_KEY_PASSWORD")
+        }
+	    debug {
+            storeFile file('debug.keystore')
+            storePassword 'android'
+            keyAlias 'androiddebugkey'
+            keyPassword 'android'
+        }
 	  }
 
     splits {
@@ -184,9 +192,6 @@ android {
         }
         release {
             manifestPlaceholders.isDebug = false
-            // Caution! In production, you need to generate your own keystore file.
-            // see https://reactnative.dev/docs/signed-apk-android.
-            signingConfig signingConfigs.debug
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }

diff --git a/android/build.gradle b/android/build.gradle
@@ -8,7 +8,8 @@ buildscript {
 		compileSdkVersion = 33
 		targetSdkVersion = 33
 		// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
-		ndkVersion = "23.1.7779620"
+		ndkVersion = "24.0.8215888"
+		bitriseNdkPath = "/usr/local/share/android-sdk/ndk-bundle"
 		kotlin_version = "1.7.0"
 		kotlinVersion = "$kotlin_version"
 		supportLibVersion = "28.0.0"

diff --git a/app/component-library/components/Modals/ModalMandatory/ModalMandatory.tsx b/app/component-library/components/Modals/ModalMandatory/ModalMandatory.tsx
@@ -234,7 +234,7 @@ const ModalMandatory = ({ route }: MandatoryModalProps) => {
           activeOpacity={1}
           {...generateTestId(Platform, TERMS_OF_USE_CHECKBOX_ICON_ID)}
         >
-          <Checkbox isChecked={isCheckboxSelected} />
+          <Checkbox onPress={handleSelect} isChecked={isCheckboxSelected} />
           <Text style={styles.checkboxText}>{checkboxText}</Text>
         </TouchableOpacity>
         <ButtonPrimary

diff --git a/app/components/Nav/App/index.js b/app/components/Nav/App/index.js
@@ -80,6 +80,7 @@ import SDKLoadingModal from '../../Views/SDKLoadingModal/SDKLoadingModal';
 import SDKFeedbackModal from '../../Views/SDKFeedbackModal/SDKFeedbackModal';
 import AccountActions from '../../../components/Views/AccountActions';
 import WalletActions from '../../Views/WalletActions';
+import EditAccountName from '../../Views/EditAccountName/EditAccountName';
 
 const clearStackNavigatorOptions = {
   headerShown: false,
@@ -550,6 +551,12 @@ const App = ({ userLoggedIn }) => {
     </Stack.Navigator>
   );
 
+  const EditAccountNameFlow = () => (
+    <Stack.Navigator>
+      <Stack.Screen name="EditAccountName" component={EditAccountName} />
+    </Stack.Navigator>
+  );
+
   return (
     // do not render unless a route is defined
     (route && (
@@ -612,6 +619,10 @@ const App = ({ userLoggedIn }) => {
               component={ConnectQRHardwareFlow}
               options={{ animationEnabled: true }}
             />
+            <Stack.Screen
+              name="EditAccountName"
+              component={EditAccountNameFlow}
+            />
           </Stack.Navigator>
         </NavigationContainer>
         {renderSplash()}

diff --git a/app/components/UI/ApproveTransactionReview/index.js b/app/components/UI/ApproveTransactionReview/index.js
@@ -1,10 +1,5 @@
 import React, { PureComponent } from 'react';
-import {
-  View,
-  TouchableOpacity,
-  InteractionManager,
-  Linking,
-} from 'react-native';
+import { View, TouchableOpacity, InteractionManager } from 'react-native';
 import Eth from 'ethjs-query';
 import ActionView from '../../UI/ActionView';
 import PropTypes from 'prop-types';
@@ -45,13 +40,11 @@ import { WALLET_CONNECT_ORIGIN } from '../../../util/walletconnect';
 import { withNavigation } from '@react-navigation/compat';
 import {
   isTestNet,
-  isMainnetByChainId,
   isMultiLayerFeeNetwork,
   fetchEstimatedMultiLayerL1Fee,
 } from '../../../util/networks';
 import EditPermission from './EditPermission';
 import Logger from '../../../util/Logger';
-import InfoModal from '../Swaps/components/InfoModal';
 import ButtonLink from '../../../component-library/components/Buttons/Button/variants/ButtonLink';
 import { getTokenList } from '../../../reducers/tokens';
 import TransactionReview from '../../UI/TransactionReview/TransactionReviewEIP1559Update';
@@ -258,7 +251,6 @@ class ApproveTransactionReview extends PureComponent {
     spenderAddress: '0x...',
     transaction: this.props.transaction,
     token: {},
-    showGasTooltip: false,
     gasTransactionObject: {},
     multiLayerL1FeeTotal: '0x0',
     fetchingUpdateDone: false,
@@ -560,46 +552,6 @@ class ApproveTransactionReview extends PureComponent {
     );
   };
 
-  openLinkAboutGas = () =>
-    Linking.openURL(
-      'https://community.metamask.io/t/what-is-gas-why-do-transactions-take-so-long/3172',
-    );
-
-  toggleGasTooltip = () =>
-    this.setState((state) => ({ showGasTooltip: !state.showGasTooltip }));
-
-  renderGasTooltip = () => {
-    const isMainnet = isMainnetByChainId(this.props.chainId);
-    return (
-      <InfoModal
-        isVisible={this.state.showGasTooltip}
-        title={strings(
-          `transaction.gas_education_title${isMainnet ? '_ethereum' : ''}`,
-        )}
-        toggleModal={this.toggleGasTooltip}
-        body={
-          <View>
-            <Text grey infoModal>
-              {strings('transaction.gas_education_1')}
-              {strings(
-                `transaction.gas_education_2${isMainnet ? '_ethereum' : ''}`,
-              )}{' '}
-              <Text bold>{strings('transaction.gas_education_3')}</Text>
-            </Text>
-            <Text grey infoModal>
-              {strings('transaction.gas_education_4')}
-            </Text>
-            <TouchableOpacity onPress={this.openLinkAboutGas}>
-              <Text grey link infoModal>
-                {strings('transaction.gas_education_learn_more')}
-              </Text>
-            </TouchableOpacity>
-          </View>
-        }
-      />
-    );
-  };
-
   renderEditPermission = () => {
     const {
       host,
@@ -863,7 +815,6 @@ class ApproveTransactionReview extends PureComponent {
             </ActionView>
           </View>
         </View>
-        {this.renderGasTooltip()}
       </>
     );
   };
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ on: @@
     jobs:
       synchronize-with-crowdin:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
         steps:
@@ Expand Down @@