Skip to content

Commit

Permalink
feat(release): 7.1.0 (#6480)
Browse files Browse the repository at this point in the history
* 7.1.0

* feat(release): 7.0.0 (#6465)

* 6.6.0

* notify appium server test is done (#6349)

* add tags and simplify feature description (#6353)

* [FIX] Appium: remove duplicate step onboarding (#6356)

* remove duplicated step

* configure smoke test for bitrise

* [FEAT] wallet connect v2 (#6355)

* feat: wc2 integration

* chore: remove unnecessary console logs

* chore: cleanup

* refactor: move WalletConnect.js to WalletConnect folder

* feat: restore comm layer to 0.2.2

* fix: import path

* fix: unit tests for wc1

* feat: default session value to id

* feat: prevent display loading modal until unlocked

* feat: improve url/title display to occupy all space

* feat: use originator platforminfo

* feat: update comm layer to 0.2.4

* feat: force bigint big-integer polyfill on android

* feat: force hide loading state function

* feat: add request_source to views approval and senflow confirm

* Revert "[FEAT] wallet connect v2 (#6355)" (#6379)

This reverts commit 3911d7c.

* User can not longer edit account name to be an empty string (#6389)

* [FIX] [6.6.0] Block explorer name on Account Actions (#6390)

* block explorer name now it is correct on account actions sheet

* block explorer option only visible when it is defined

* Force Bitrise to build with intel medium stack machine (#6412)

* [FIX] - Fix input display when editing account name (#6413)

* remove height from input component

* update edit account name snapshot

* adding padding vertical 0 instead of removing height

* [FIX] [6.6.0] - Onboarding wizard misaligned (#6395)

* improvement on oboarding wizard to be more dynamic

* fix snapshot and fix unused import

* update text alignment

* onboarding more dynamic

* fix bug on android

* remove unused import

* New Crowdin translations by Github Action

* update translations

* update Animated Transaction Modal test

* update snapshot

---------

Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: Cal Leung <cleun007@gmail.com>
Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>

* [FIX] [6.6.0] - Import tokens and NFTs button now visible  (#6431)

* import tokens and nfts visible

* nfts tab on wallet view with import NFTs visible

* [FIX] Send ETH displays Collectible as predefault value in the Amount screen and undefined balance (#6446)

* fix Send ETH displays as predefault value in the screen and balance

* added snapshot

* RC2 build 1113 (#6448)

* RC2 build 1113

* resolve yarn audit for socket.io-parser

---------

Co-authored-by: sethkfman <Seth.Kaufman@consensys.net>

* Fix ENS name displayed on confirm send page (#6350) (#6456)

* build version bump to 1114 (#6460)

* 7.0.0

* [FEATURE] WalletConnect v2 Integration (#6380)

* feat: wc2 integration

* chore: remove unnecessary console logs

* chore: cleanup

* refactor: move WalletConnect.js to WalletConnect folder

* feat: restore comm layer to 0.2.2

* fix: import path

* fix: unit tests for wc1

* feat: default session value to id

* feat: prevent display loading modal until unlocked

* feat: improve url/title display to occupy all space

* feat: use originator platforminfo

* feat: update comm layer to 0.2.4

* feat: force bigint big-integer polyfill on android

* feat: force hide loading state function

* feat: add request_source to views approval and senflow confirm

* bumps build number and adds Bitrise Intel force build fix

* feat: add big-integer dependency to avoid linting error

* feat: improve logging

* feat: handle dangling promises

* feat improve wc2 url parsing

* feat: store in env custom sdk env server

* feat: store in env custom sdk env server

* feat: use promise to get walletconnect instance

* feat: update to latest wc se-sdk

* feat: update to latest wc se-sdk

* chore: linting

* feat(CI): Convert Bitrise Workflows to Pipelines (#6366)

* add qa build pipeline

* update stage names

* removed utility workflow on slack notification

* removed utility workflow on slack notification

* add release build pipeline

* commented out RC trigger

* commented out triggers

* fix typo

* added comments and updated workflows

* formatting error for release announcement

* adding gradle caching

* added notes for QA test setup

* update deploy path

* add pulling pipeline files

* update artifact sources

* added E2E pipelines

* update notification to use pipeline title

* update view build pipeline

* updated deploy paths

* added pipeline deploy for intermediate files

* added intermediate files

* bumped machines

* format change

* disabled android for test

* updated artifact archives

* update deploy path for iOS

* updated deploy paths and machines

* updated deploy and release stages

* remove git info in notifies

* intermeidate files fix

* intermeidate files fix for iOS QA

* update trigger

* updated deploy xarchive

* removed symbol files from intermmediate builds

* removed symbol files from intermmediate builds

* added caching and optimize machine build times

* update failure slack notification

* removed unused get workflow info because of pipeline conversion

* updated triggers to use pipelines and added smoke pipeline trigger

---------

Co-authored-by: abretonc7s <arthur.breton@consensys.net>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>

* [FEAT] wc2 (#6492)

* feat: wc2 integration

* feat: prevent display loading modal until unlocked

* feat: use originator platforminfo

* feat: force bigint big-integer polyfill on android

* bumps build number and adds Bitrise Intel force build fix

* feat: store in env custom sdk env server

* feat: update to latest wc se-sdk

* feat: update to latest wc se-sdk

* chore: linting

* feat: update dependencies

* fix: issue with eth_sendTransaction

* chore: remove duplicate imports

* fix: error while rebasing

* fix: error while rebasing

* fix: error while rebasing

* fix: error while rebasing

* fix: error while rebasing

* chore: edit js env

* docs: add wallet connect project id info

---------

Co-authored-by: Andrea Salvatore <andrea.salvatore@consensys.net>

* build 1117 RC3 (#6501)

* [FIX] wc2 integration with eth_sendTransaction (#6528)

* feat: wc2 integration

* feat: prevent display loading modal until unlocked

* feat: use originator platforminfo

* feat: force bigint big-integer polyfill on android

* bumps build number and adds Bitrise Intel force build fix

* feat: store in env custom sdk env server

* feat: update to latest wc se-sdk

* feat: update to latest wc se-sdk

* chore: linting

* feat: update dependencies

* fix: issue with eth_sendTransaction

* chore: remove duplicate imports

* fix: error while rebasing

* fix: error while rebasing

* fix: error while rebasing

* fix: error while rebasing

* fix: error while rebasing

* chore: edit js env

* docs: add wallet connect project id info

* fix: not waiting for transaction hash promise result

---------

Co-authored-by: Andrea Salvatore <andrea.salvatore@consensys.net>

* build version bump to 1119 (#6531)

* adds try/catch to catch error in case of missing WCv2 missing ID (#6536)

* update changelog

* removed conflict tags

---------

Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
Co-authored-by: Chris Wilcox <chris.wilcox@consensys.net>
Co-authored-by: abretonc7s <107169956+abretonc7s@users.noreply.github.com>
Co-authored-by: Andrea Salvatore <andrea.salvatore@consensys.net>
Co-authored-by: tommasini <46944231+tommasini@users.noreply.github.com>
Co-authored-by: Cal Leung <cleun007@gmail.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: Sylva Elendu <iamsylvaelendu@gmail.com>
Co-authored-by: sethkfman <Seth.Kaufman@consensys.net>
Co-authored-by: Jyoti Puri <jyotipuri@gmail.com>
Co-authored-by: abretonc7s <arthur.breton@consensys.net>

* ci(bitrise): fix pod install step (#6543)

* remove sourcemaps from QA builds

* bump ruby version update and recreated podfile.lock

* bump cocoapods version

* remove cocoapods caching

* Revert "remove sourcemaps from QA builds"

This reverts commit 09a63f6.

* Revert "bump cocoapods version"

This reverts commit 6a2890c.

* revert podfile.lock changes

* upgrade to cocoapods 1.12.0 (#6512) (#6538)

fixes issue while building iOS, see facebook/react-native#34673 (comment)

Co-authored-by: Nicolas MASSART <NicolasMassart@users.noreply.github.com>

* fix: [7.1.0] remove unicode chars from utf8 token symbol (#6508)

* patch to fix unicode on utf8 of token symbol

* Revert "patch to fix unicode on utf8 of token symbol"

This reverts commit 05dfee8.

* unicode path to assets contract controller

* Fix bug domain not shown on signature (#6464)

* Make sure origin is shown on SignatureRequest

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* if asset is undefined, show balance of selected account.

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* update snapshot

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* lint fix

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* Test get balance if address is null

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* test show origin header

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* Lint fixes

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* Podfile fix

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* Fix PR comment: Combine the ifs

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

---------

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>

* bugfix: fix for swaps button displaying on unsupported networks (#6473) (#6553)

Co-authored-by: Nicolas Ferro <nicolaspatricioferro@gmail.com>

* feat(release): 7.0.1 (#6556)

* 6.6.0

* notify appium server test is done (#6349)

* add tags and simplify feature description (#6353)

* [FIX] Appium: remove duplicate step onboarding (#6356)

* remove duplicated step

* configure smoke test for bitrise

* [FEAT] wallet connect v2 (#6355)

* feat: wc2 integration

* chore: remove unnecessary console logs

* chore: cleanup

* refactor: move WalletConnect.js to WalletConnect folder

* feat: restore comm layer to 0.2.2

* fix: import path

* fix: unit tests for wc1

* feat: default session value to id

* feat: prevent display loading modal until unlocked

* feat: improve url/title display to occupy all space

* feat: use originator platforminfo

* feat: update comm layer to 0.2.4

* feat: force bigint big-integer polyfill on android

* feat: force hide loading state function

* feat: add request_source to views approval and senflow confirm

* Revert "[FEAT] wallet connect v2 (#6355)" (#6379)

This reverts commit 3911d7c.

* User can not longer edit account name to be an empty string (#6389)

* [FIX] [6.6.0] Block explorer name on Account Actions (#6390)

* block explorer name now it is correct on account actions sheet

* block explorer option only visible when it is defined

* Force Bitrise to build with intel medium stack machine (#6412)

* [FIX] - Fix input display when editing account name (#6413)

* remove height from input component

* update edit account name snapshot

* adding padding vertical 0 instead of removing height

* [FIX] [6.6.0] - Onboarding wizard misaligned (#6395)

* improvement on oboarding wizard to be more dynamic

* fix snapshot and fix unused import

* update text alignment

* onboarding more dynamic

* fix bug on android

* remove unused import

* New Crowdin translations by Github Action

* update translations

* update Animated Transaction Modal test

* update snapshot

---------

Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: Cal Leung <cleun007@gmail.com>
Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>

* [FIX] [6.6.0] - Import tokens and NFTs button now visible  (#6431)

* import tokens and nfts visible

* nfts tab on wallet view with import NFTs visible

* [FIX] Send ETH displays Collectible as predefault value in the Amount screen and undefined balance (#6446)

* fix Send ETH displays as predefault value in the screen and balance

* added snapshot

* RC2 build 1113 (#6448)

* RC2 build 1113

* resolve yarn audit for socket.io-parser

---------

Co-authored-by: sethkfman <Seth.Kaufman@consensys.net>

* Fix ENS name displayed on confirm send page (#6350) (#6456)

* build version bump to 1114 (#6460)

* 7.0.0

* [FEATURE] WalletConnect v2 Integration (#6380)

* feat: wc2 integration

* chore: remove unnecessary console logs

* chore: cleanup

* refactor: move WalletConnect.js to WalletConnect folder

* feat: restore comm layer to 0.2.2

* fix: import path

* fix: unit tests for wc1

* feat: default session value to id

* feat: prevent display loading modal until unlocked

* feat: improve url/title display to occupy all space

* feat: use originator platforminfo

* feat: update comm layer to 0.2.4

* feat: force bigint big-integer polyfill on android

* feat: force hide loading state function

* feat: add request_source to views approval and senflow confirm

* bumps build number and adds Bitrise Intel force build fix

* feat: add big-integer dependency to avoid linting error

* feat: improve logging

* feat: handle dangling promises

* feat improve wc2 url parsing

* feat: store in env custom sdk env server

* feat: store in env custom sdk env server

* feat: use promise to get walletconnect instance

* feat: update to latest wc se-sdk

* feat: update to latest wc se-sdk

* chore: linting

* feat(CI): Convert Bitrise Workflows to Pipelines (#6366)

* add qa build pipeline

* update stage names

* removed utility workflow on slack notification

* removed utility workflow on slack notification

* add release build pipeline

* commented out RC trigger

* commented out triggers

* fix typo

* added comments and updated workflows

* formatting error for release announcement

* adding gradle caching

* added notes for QA test setup

* update deploy path

* add pulling pipeline files

* update artifact sources

* added E2E pipelines

* update notification to use pipeline title

* update view build pipeline

* updated deploy paths

* added pipeline deploy for intermediate files

* added intermediate files

* bumped machines

* format change

* disabled android for test

* updated artifact archives

* update deploy path for iOS

* updated deploy paths and machines

* updated deploy and release stages

* remove git info in notifies

* intermeidate files fix

* intermeidate files fix for iOS QA

* update trigger

* updated deploy xarchive

* removed symbol files from intermmediate builds

* removed symbol files from intermmediate builds

* added caching and optimize machine build times

* update failure slack notification

* removed unused get workflow info because of pipeline conversion

* updated triggers to use pipelines and added smoke pipeline trigger

---------

Co-authored-by: abretonc7s <arthur.breton@consensys.net>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>

* [FEAT] wc2 (#6492)

* feat: wc2 integration

* feat: prevent display loading modal until unlocked

* feat: use originator platforminfo

* feat: force bigint big-integer polyfill on android

* bumps build number and adds Bitrise Intel force build fix

* feat: store in env custom sdk env server

* feat: update to latest wc se-sdk

* feat: update to latest wc se-sdk

* chore: linting

* feat: update dependencies

* fix: issue with eth_sendTransaction

* chore: remove duplicate imports

* fix: error while rebasing

* fix: error while rebasing

* fix: error while rebasing

* fix: error while rebasing

* fix: error while rebasing

* chore: edit js env

* docs: add wallet connect project id info

---------

Co-authored-by: Andrea Salvatore <andrea.salvatore@consensys.net>

* build 1117 RC3 (#6501)

* [FIX] wc2 integration with eth_sendTransaction (#6528)

* feat: wc2 integration

* feat: prevent display loading modal until unlocked

* feat: use originator platforminfo

* feat: force bigint big-integer polyfill on android

* bumps build number and adds Bitrise Intel force build fix

* feat: store in env custom sdk env server

* feat: update to latest wc se-sdk

* feat: update to latest wc se-sdk

* chore: linting

* feat: update dependencies

* fix: issue with eth_sendTransaction

* chore: remove duplicate imports

* fix: error while rebasing

* fix: error while rebasing

* fix: error while rebasing

* fix: error while rebasing

* fix: error while rebasing

* chore: edit js env

* docs: add wallet connect project id info

* fix: not waiting for transaction hash promise result

---------

Co-authored-by: Andrea Salvatore <andrea.salvatore@consensys.net>

* build version bump to 1119 (#6531)

* 7.0.1

* refactor(whats-new-modal): remove onramp content (#6558)

refactor(whats-new-modal): remove onramp translations

* updated changelog

* update changelog

* fix release announcement bitrise step

* resolve merge conflicts between 7.0.1 and 7.1.0 (#6565)

* fix yarn

---------

Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
Co-authored-by: Chris Wilcox <chris.wilcox@consensys.net>
Co-authored-by: abretonc7s <107169956+abretonc7s@users.noreply.github.com>
Co-authored-by: Andrea Salvatore <andrea.salvatore@consensys.net>
Co-authored-by: tommasini <46944231+tommasini@users.noreply.github.com>
Co-authored-by: Cal Leung <cleun007@gmail.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: Sylva Elendu <iamsylvaelendu@gmail.com>
Co-authored-by: sethkfman <Seth.Kaufman@consensys.net>
Co-authored-by: Jyoti Puri <jyotipuri@gmail.com>
Co-authored-by: abretonc7s <arthur.breton@consensys.net>
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>

* fix: [7.1.0] Account incorrectly displayed on transaction review modal (#6502)

* reset transaction when leave the send flow

* Disable navigating back on send flow to force user to reset the transaction when exit the send flow

* Disabling swipe down on IOS

* build 1127 RC2 (#6572)

* chore: pending review feedback for token details related changes (#6530) (#6578)

* chore: pending review feedback for token details related changes

* chore: updating styles for footer border

* remvoe what's new modal step from feature files (#6580)

* fix: Fix upgrade logout error on 7.1.0 (#6627)

* updated migration script to check before assigning

* bump version

* added return statement to migration 16 instance

* bump version for test build

* bumped VERSION_NUMBER to 1136 (#6640)

* bumped VERSION_NUMBER in gradle and pbxproj to 1136 (#6642)

* upated change-log

* chore: merge main into release branch (#6648)

---------

Signed-off-by: Olusegun Akintayo <akintayo.segun@gmail.com>
Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Chris Wilcox <chris.wilcox@consensys.net>
Co-authored-by: abretonc7s <107169956+abretonc7s@users.noreply.github.com>
Co-authored-by: Andrea Salvatore <andrea.salvatore@consensys.net>
Co-authored-by: tommasini <46944231+tommasini@users.noreply.github.com>
Co-authored-by: Cal Leung <cleun007@gmail.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: Sylva Elendu <iamsylvaelendu@gmail.com>
Co-authored-by: sethkfman <Seth.Kaufman@consensys.net>
Co-authored-by: Jyoti Puri <jyotipuri@gmail.com>
Co-authored-by: abretonc7s <arthur.breton@consensys.net>
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Co-authored-by: Nicolas MASSART <NicolasMassart@users.noreply.github.com>
Co-authored-by: Olusegun Akintayo <trinisoftinc@gmail.com>
Co-authored-by: Curtis David <Curtis.David7@gmail.com>
Co-authored-by: Nicolas Ferro <nicolaspatricioferro@gmail.com>
Co-authored-by: yande <110056475+Andepande@users.noreply.github.com>
  • Loading branch information
18 people authored and leotm committed Jun 28, 2023
1 parent 6e6205f commit 2f35e06
Show file tree
Hide file tree
Showing 34 changed files with 134 additions and 47 deletions.
39 changes: 38 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,44 @@

## Current Main Branch

## 7.1.0 - Jun 20, 2023
- [#6334](https://github.com/MetaMask/metamask-mobile/pull/6334): feat: Aurora Token Detection
- [#6351](https://github.com/MetaMask/metamask-mobile/pull/6351): feat: use thunk to handle processed order side effects
- [#5829](https://github.com/MetaMask/metamask-mobile/pull/5829): feat: order of browser page load events
- [#6230](https://github.com/MetaMask/metamask-mobile/pull/6230): feat: Asset Overview / Token Detail view redesign
- [#6381](https://github.com/MetaMask/metamask-mobile/pull/6381): feat: add params validation to useSDKMethod hook
- [#6365](https://github.com/MetaMask/metamask-mobile/pull/6365): feat: remove hardcoded selected network name
- [#6421](https://github.com/MetaMask/metamask-mobile/pull/6421): feat: exclude legacy types from rate limiting
- [#6354](https://github.com/MetaMask/metamask-mobile/pull/6354): feat: Trigger signing modals from approval requests
- [#6432](https://github.com/MetaMask/metamask-mobile/pull/6432): ci(sonar): Configure SonarCloud Analysis on CI
- [#6441](https://github.com/MetaMask/metamask-mobile/pull/6441): feat: use screen in on-ramp views tests
- [#6442](https://github.com/MetaMask/metamask-mobile/pull/6442): fix(ci): Remove `restore-build` steps
- [#6040](https://github.com/MetaMask/metamask-mobile/pull/6040): feat: validation to send amount input box
- [#6311](https://github.com/MetaMask/metamask-mobile/pull/6311): fix: token balance displayed in approval pages
- [#6406](https://github.com/MetaMask/metamask-mobile/pull/6406): chore: Use core signature controller
- [#6439](https://github.com/MetaMask/metamask-mobile/pull/6439): fix: remove invalid accessibilityRole value
- [#6427](https://github.com/MetaMask/metamask-mobile/pull/6427): refactor: Refactor unit tests for React Native 0.71.6 upgrade
- [#6289](https://github.com/MetaMask/metamask-mobile/pull/6289): feat(ci): Sonar Action to work with SonarCloud
- [#6366](https://github.com/MetaMask/metamask-mobile/pull/6366): feat(ci): Convert Bitrise Workflows to Pipelines
- [#6350](https://github.com/MetaMask/metamask-mobile/pull/6350): fix: ENS name displayed on confirm send page
- [#6192](https://github.com/MetaMask/metamask-mobile/pull/6192): chore: Show account balance in signature screen
- [#6394](https://github.com/MetaMask/metamask-mobile/pull/6394): feat(ci): removed the matrix option from unit testing
- [#6227](https://github.com/MetaMask/metamask-mobile/pull/6227): feat: [MC 0.5] Modal network selector replace by network selector sheet
- [#6393](https://github.com/MetaMask/metamask-mobile/pull/6393): feat(ci): upgrade ruby to 3.0.0
- [#6274](https://github.com/MetaMask/metamask-mobile/pull/6274): chore: Empty SiteURL and Null TagURL in modal
- [#6137](https://github.com/MetaMask/metamask-mobile/pull/6137): chore: Clicking toAddress to add it to address book
- [#6079](https://github.com/MetaMask/metamask-mobile/pull/6079): chore: Refactor sanitization middleware
- [#6234](https://github.com/MetaMask/metamask-mobile/pull/6234): chore: Clear Privacy section
- [#6342](https://github.com/MetaMask/metamask-mobile/pull/6342): chore: Improve processing of redirection URL
- [#6374](https://github.com/MetaMask/metamask-mobile/pull/6374): chore: en.json with eth_sign
- [#6214](https://github.com/MetaMask/metamask-mobile/pull/6214): chore: core signature controller
- [#6328](https://github.com/MetaMask/metamask-mobile/pull/6328): chore(devDeps): bump webdriverio packages
- [#6362](https://github.com/MetaMask/metamask-mobile/pull/6362): chore: Added retries
- [#6125](https://github.com/MetaMask/metamask-mobile/pull/6125): chore: controller packages to match core v42
- [#6124](https://github.com/MetaMask/metamask-mobile/pull/6124): chore: controller packages to match core v40
- [#6345](https://github.com/MetaMask/metamask-mobile/pull/6345): chore: es.js file
- [#6339](https://github.com/MetaMask/metamask-mobile/pull/6339): fix: yarn watch clean

## 7.0.1 - Jun 7, 2023
- [#6558](https://github.com/MetaMask/metamask-mobile/pull/6558): refactor(whats-new-modal): remove onramp content

Expand All @@ -26,7 +64,6 @@
- [#6228](https://github.com/MetaMask/metamask-mobile/pull/6228): [UPDATE] Checkbox component
- [#6226](https://github.com/MetaMask/metamask-mobile/pull/6226): [UPDATE] Button's icon props and button org


## 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
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ android {
applicationId "io.metamask"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1126
versionName "7.0.1"
versionCode 1136
versionName "7.1.0"
multiDexEnabled true
testBuildType System.getProperty('testBuildType', 'debug')
missingDimensionStrategy "minReactNative", "minReactNative46"
Expand Down
7 changes: 6 additions & 1 deletion app/components/Nav/Main/MainNavigator.js
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,12 @@ const MainNavigator = () => (
<Stack.Screen name="Asset" component={AssetModalFlow} />
<Stack.Screen name="Webview" component={Webview} />
<Stack.Screen name="SendView" component={SendView} />
<Stack.Screen name="SendFlowView" component={SendFlowView} />
<Stack.Screen
name="SendFlowView"
component={SendFlowView}
//Disabling swipe down on IOS
options={{ gestureEnabled: false }}
/>
<Stack.Screen name="AddBookmarkView" component={AddBookmarkView} />
<Stack.Screen name="OfflineModeView" component={OfflineModeView} />
<Stack.Screen name={Routes.QR_SCANNER} component={QrScanner} />
Expand Down
9 changes: 8 additions & 1 deletion app/components/UI/Navbar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,13 @@ export function getApproveNavbar(title) {
* @param {string} title - Title in string format
* @returns {Object} - Corresponding navbar options containing title and headerTitleStyle
*/
export function getSendFlowTitle(title, navigation, route, themeColors) {
export function getSendFlowTitle(
title,
navigation,
route,
themeColors,
resetTransaction,
) {
const innerStyles = StyleSheet.create({
headerButtonText: {
color: themeColors.primary.default,
Expand All @@ -533,6 +539,7 @@ export function getSendFlowTitle(title, navigation, route, themeColors) {
view: title.split('.')[1],
network: providerType,
});
resetTransaction();
navigation.dangerouslyGetParent()?.pop();
};
const leftAction = () => navigation.pop();
Expand Down
16 changes: 14 additions & 2 deletions app/components/Views/SendFlow/Amount/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
setSelectedAsset,
prepareTransaction,
setTransactionObject,
resetTransaction,
} from '../../../../actions/transaction';
import { getSendFlowTitle } from '../../../UI/Navbar';
import StyledButton from '../../../UI/StyledButton';
Expand Down Expand Up @@ -421,6 +422,10 @@ class Amount extends PureComponent {
* Indicates whether the current transaction is a deep link transaction
*/
isPaymentRequest: PropTypes.bool,
/**
* Resets transaction state
*/
resetTransaction: PropTypes.func,
};

state = {
Expand All @@ -439,10 +444,16 @@ class Amount extends PureComponent {
collectibles = [];

updateNavBar = () => {
const { navigation, route } = this.props;
const { navigation, route, resetTransaction } = this.props;
const colors = this.context.colors || mockTheme.colors;
navigation.setOptions(
getSendFlowTitle('send.amount', navigation, route, colors),
getSendFlowTitle(
'send.amount',
navigation,
route,
colors,
resetTransaction,
),
);
};

Expand Down Expand Up @@ -1420,6 +1431,7 @@ const mapDispatchToProps = (dispatch) => ({
dispatch(prepareTransaction(transaction)),
setSelectedAsset: (selectedAsset) =>
dispatch(setSelectedAsset(selectedAsset)),
resetTransaction: () => dispatch(resetTransaction()),
});

export default connect(mapStateToProps, mapDispatchToProps)(Amount);
10 changes: 8 additions & 2 deletions app/components/Views/SendFlow/Confirm/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -290,10 +290,16 @@ class Confirm extends PureComponent {
};

updateNavBar = () => {
const { navigation, route } = this.props;
const { navigation, route, resetTransaction } = this.props;
const colors = this.context.colors || mockTheme.colors;
navigation.setOptions(
getSendFlowTitle('send.confirm', navigation, route, colors),
getSendFlowTitle(
'send.confirm',
navigation,
route,
colors,
resetTransaction,
),
);
};

Expand Down
28 changes: 26 additions & 2 deletions app/components/Views/SendFlow/SendTo/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
ScrollView,
Alert,
Platform,
BackHandler,
} from 'react-native';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
Expand Down Expand Up @@ -36,6 +37,7 @@ import { showAlert } from '../../../../actions/alert';
import addRecent from '../../../../actions/recents';
import {
newAssetTransaction,
resetTransaction,
setRecipient,
setSelectedAsset,
} from '../../../../actions/transaction';
Expand Down Expand Up @@ -146,6 +148,10 @@ class SendFlow extends PureComponent {
*/
isNativeTokenBuySupported: PropTypes.bool,
updateParentState: PropTypes.func,
/**
* Resets transaction state
*/
resetTransaction: PropTypes.func,
};

addressToInputRef = React.createRef();
Expand All @@ -164,10 +170,16 @@ class SendFlow extends PureComponent {
};

updateNavBar = () => {
const { navigation, route } = this.props;
const { navigation, route, resetTransaction } = this.props;
const colors = this.context.colors || mockTheme.colors;
navigation.setOptions(
getSendFlowTitle('send.send_to', navigation, route, colors),
getSendFlowTitle(
'send.send_to',
navigation,
route,
colors,
resetTransaction,
),
);
};

Expand Down Expand Up @@ -198,12 +210,23 @@ class SendFlow extends PureComponent {
this.props.newAssetTransaction(getEther(ticker));
this.onToSelectedAddressChange(targetAddress);
}

// Disabling back press for not be able to exit the send flow without reseting the transaction object
this.hardwareBackPress = () => true;
BackHandler.addEventListener('hardwareBackPress', this.hardwareBackPress);
};

componentDidUpdate = () => {
this.updateNavBar();
};

componentWillUnmount() {
BackHandler.removeEventListener(
'hardwareBackPress',
this.hardwareBackPress,
);
}

isAddressSaved = () => {
const { toAccount } = this.state;
const { addressBook, network, identities } = this.props;
Expand Down Expand Up @@ -649,6 +672,7 @@ const mapDispatchToProps = (dispatch) => ({
setSelectedAsset: (selectedAsset) =>
dispatch(setSelectedAsset(selectedAsset)),
showAlert: (config) => dispatch(showAlert(config)),
resetTransaction: () => dispatch(resetTransaction()),
});

export default connect(mapStateToProps, mapDispatchToProps)(SendFlow);
8 changes: 7 additions & 1 deletion app/store/migrations.js
Original file line number Diff line number Diff line change
Expand Up @@ -410,9 +410,15 @@ export const migrations = {
state.engine.backgroundState.NetworkController.properties;
delete state.engine.backgroundState.NetworkController.properties;
}
return state;
},
17: (state) => {
state.networkOnboarded.networkOnboardedState = {};
if (
state.networkOnboarded &&
state.networkOnboarded.networkOnboardedState
) {
state.networkOnboarded.networkOnboardedState = {};
}
return state;
},
18: (state) => {
Expand Down
6 changes: 3 additions & 3 deletions bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ workflows:
# Slack notification utils: we have two workflows to allow choosing when to notify: on success, on failure or both.
# A workflow for instance create_qa_builds will notify on failure for each build_android_qa or build_ios_qa
# but will only notify success if both success and create_qa_builds succeeds.

# Send a Slack message on successful release
release_announcing_stores:
before_run:
Expand Down Expand Up @@ -702,10 +702,10 @@ app:
PROJECT_LOCATION_IOS: ios
- opts:
is_expand: false
VERSION_NAME: 7.0.1
VERSION_NAME: 7.1.0
- opts:
is_expand: false
VERSION_NUMBER: 1126
VERSION_NUMBER: 1136
- opts:
is_expand: false
ANDROID_APK_LINK: ''
Expand Down
16 changes: 8 additions & 8 deletions ios/MetaMask.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1132,7 +1132,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1126;
CURRENT_PROJECT_VERSION = 1136;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1168,7 +1168,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.0.1;
MARKETING_VERSION = 7.1.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
Expand Down Expand Up @@ -1199,7 +1199,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1126;
CURRENT_PROJECT_VERSION = 1136;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -1235,7 +1235,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.0.1;
MARKETING_VERSION = 7.1.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = (
"$(inherited)",
Expand Down Expand Up @@ -1345,7 +1345,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1126;
CURRENT_PROJECT_VERSION = 1136;
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = 48XVW22RCG;
Expand Down Expand Up @@ -1381,7 +1381,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.0.1;
MARKETING_VERSION = 7.1.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = (
"$(inherited)",
Expand Down Expand Up @@ -1412,7 +1412,7 @@
CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1126;
CURRENT_PROJECT_VERSION = 1136;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 48XVW22RCG;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -1448,7 +1448,7 @@
"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
);
LLVM_LTO = YES;
MARKETING_VERSION = 7.0.1;
MARKETING_VERSION = 7.1.0;
ONLY_ACTIVE_ARCH = NO;
OTHER_CFLAGS = (
"$(inherited)",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "metamask",
"version": "7.0.1",
"version": "7.1.0",
"private": true,
"scripts": {
"audit:ci": "./scripts/yarn-audit.sh",
Expand Down
10 changes: 10 additions & 0 deletions patches/@metamask+assets-controllers+5.0.0.patch
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,16 @@ index 9ddbc28..ca00e3e 100644
if ((decoded === null || decoded === void 0 ? void 0 : decoded.length) > 0) {
return decoded;
}
@@ -83,7 +116,8 @@ class ERC20Standard {
try {
const utf8 = (0, ethereumjs_util_1.toUtf8)(result);
if (utf8.length > 0) {
- return utf8;
+ // This utf8 returns unicode characters, wee need to replace it
+ return utf8.replace(/[\u0000\u0003\u0020]/g, '');
}
}
catch (_b) {
diff --git a/node_modules/@metamask/assets-controllers/dist/TokenDetectionController.js b/node_modules/@metamask/assets-controllers/dist/TokenDetectionController.js
index 4ed4990..da18116 100644
--- a/node_modules/@metamask/assets-controllers/dist/TokenDetectionController.js
Expand Down
1 change: 0 additions & 1 deletion wdio/features/Accounts/AccountActions.feature
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Feature: Displaying account actions
And I have imported my wallet
And I tap No Thanks on the Enable security check screen
And I tap No thanks on the onboarding welcome tutorial
And I close the Whats New modal
And I open the account actions
And I press show private key
Then The Reveal Private key screen should be displayed
Expand Down
1 change: 0 additions & 1 deletion wdio/features/Accounts/CreatingWalletAccount.feature
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Feature: Create Account
And I have imported my wallet
And I tap No Thanks on the Enable security check screen
And I tap No thanks on the onboarding welcome tutorial
And I close the Whats New modal

Scenario: Creating a new wallet account
Given I am on the wallet view
Expand Down
Loading

0 comments on commit 2f35e06

Please sign in to comment.