From 9c7fc960fbc5f0370e36e43ab6fa665bfcdd52c3 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 5 Aug 2020 15:36:47 -0400 Subject: [PATCH 01/11] use hex number --- app/components/Views/SendFlow/Confirm/index.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/components/Views/SendFlow/Confirm/index.js b/app/components/Views/SendFlow/Confirm/index.js index 321d1061717..e9e62b0b69e 100644 --- a/app/components/Views/SendFlow/Confirm/index.js +++ b/app/components/Views/SendFlow/Confirm/index.js @@ -436,7 +436,7 @@ class Confirm extends PureComponent { contractBalances[address] ? contractBalances[address] : '0', decimals )} ${symbol}`; - [transactionTo, , amount] = decodeTransferData('transfer', data); + [transactionTo, amount] = decodeTransferData('transfer', data); const transferValue = renderFromTokenMinimalUnit(amount, decimals); transactionValue = `${transferValue} ${symbol}`; const exchangeRate = contractExchangeRates[address]; @@ -905,7 +905,6 @@ class Confirm extends PureComponent { transactionConfirmed, paymentChannelBalance } = this.state; - return ( From 5af58c10568e08dc45dc40d545e132dc3ba5a6a5 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 5 Aug 2020 16:12:06 -0400 Subject: [PATCH 02/11] password set --- app/components/Views/Entry/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/components/Views/Entry/index.js b/app/components/Views/Entry/index.js index 0d2035f24cc..06dac6b10f6 100644 --- a/app/components/Views/Entry/index.js +++ b/app/components/Views/Entry/index.js @@ -107,7 +107,9 @@ class Entry extends PureComponent { const deeplink = params['+non_branch_link'] || uri || null; if (deeplink) { const existingUser = await AsyncStorage.getItem('@MetaMask:existingUser'); - !existingUser ? DeeplinkManager.setDeeplink(deeplink) : DeeplinkManager.parse(deeplink); + existingUser && this.props.passwordSet + ? DeeplinkManager.setDeeplink(deeplink) + : DeeplinkManager.parse(deeplink); } }; From 7a7941cc4423d31ad947bac39788235466897314 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 5 Aug 2020 17:00:01 -0400 Subject: [PATCH 03/11] publish-pre-release-android --- .circleci/config.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 74a7a82c8cc..c4cf8806751 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -176,12 +176,14 @@ workflows: only: - master - develop + - bugfix/payment-requestss - prep-node-deps: filters: branches: ignore: - master - develop + - bugfix/payment-requestss - lint: requires: - prep-node-deps @@ -196,13 +198,16 @@ workflows: requires: - lint - test-unit + - publish-pre-release-android: + requires: + - prep-deps # - test-e2e-ios # - upload-coverage: # requires: # - test-unit - - publish-pre-release-ios: - requires: - - prep-deps - - publish-pre-release-android: - requires: - - publish-pre-release-ios + # - publish-pre-release-ios: + # requires: + # - prep-deps + # - publish-pre-release-android: + # requires: + # - publish-pre-release-ios From 303bf2efa854783e796ed6c38943bdac03627166 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 5 Aug 2020 17:42:33 -0400 Subject: [PATCH 04/11] Revert "publish-pre-release-android" This reverts commit 7a7941cc4423d31ad947bac39788235466897314. --- .circleci/config.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c4cf8806751..74a7a82c8cc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -176,14 +176,12 @@ workflows: only: - master - develop - - bugfix/payment-requestss - prep-node-deps: filters: branches: ignore: - master - develop - - bugfix/payment-requestss - lint: requires: - prep-node-deps @@ -198,16 +196,13 @@ workflows: requires: - lint - test-unit - - publish-pre-release-android: - requires: - - prep-deps # - test-e2e-ios # - upload-coverage: # requires: # - test-unit - # - publish-pre-release-ios: - # requires: - # - prep-deps - # - publish-pre-release-android: - # requires: - # - publish-pre-release-ios + - publish-pre-release-ios: + requires: + - prep-deps + - publish-pre-release-android: + requires: + - publish-pre-release-ios From 28ae8775ac0f4d93d7f7596645e18a9086b25fb7 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 5 Aug 2020 19:22:44 -0400 Subject: [PATCH 05/11] Revert "Revert "publish-pre-release-android"" This reverts commit 303bf2efa854783e796ed6c38943bdac03627166. --- .circleci/config.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 74a7a82c8cc..c4cf8806751 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -176,12 +176,14 @@ workflows: only: - master - develop + - bugfix/payment-requestss - prep-node-deps: filters: branches: ignore: - master - develop + - bugfix/payment-requestss - lint: requires: - prep-node-deps @@ -196,13 +198,16 @@ workflows: requires: - lint - test-unit + - publish-pre-release-android: + requires: + - prep-deps # - test-e2e-ios # - upload-coverage: # requires: # - test-unit - - publish-pre-release-ios: - requires: - - prep-deps - - publish-pre-release-android: - requires: - - publish-pre-release-ios + # - publish-pre-release-ios: + # requires: + # - prep-deps + # - publish-pre-release-android: + # requires: + # - publish-pre-release-ios From 5500e9753337ae8f27faa2c079ed429ed614278c Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 5 Aug 2020 19:42:19 -0400 Subject: [PATCH 06/11] KeyringController.isUnlocked --- app/components/Views/Entry/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/components/Views/Entry/index.js b/app/components/Views/Entry/index.js index 06dac6b10f6..2f2a108c7df 100644 --- a/app/components/Views/Entry/index.js +++ b/app/components/Views/Entry/index.js @@ -107,7 +107,9 @@ class Entry extends PureComponent { const deeplink = params['+non_branch_link'] || uri || null; if (deeplink) { const existingUser = await AsyncStorage.getItem('@MetaMask:existingUser'); - existingUser && this.props.passwordSet + const { KeyringController } = Engine.context; + const isUnlocked = KeyringController.isUnlocked(); + existingUser && this.props.passwordSet && !isUnlocked ? DeeplinkManager.setDeeplink(deeplink) : DeeplinkManager.parse(deeplink); } From b7c80d71a29a2b3d18e69205d406023a9e4e73f4 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 5 Aug 2020 19:57:42 -0400 Subject: [PATCH 07/11] only isUnlocked --- app/components/Views/Entry/index.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/components/Views/Entry/index.js b/app/components/Views/Entry/index.js index 2f2a108c7df..46298b98885 100644 --- a/app/components/Views/Entry/index.js +++ b/app/components/Views/Entry/index.js @@ -106,12 +106,9 @@ class Entry extends PureComponent { } const deeplink = params['+non_branch_link'] || uri || null; if (deeplink) { - const existingUser = await AsyncStorage.getItem('@MetaMask:existingUser'); const { KeyringController } = Engine.context; const isUnlocked = KeyringController.isUnlocked(); - existingUser && this.props.passwordSet && !isUnlocked - ? DeeplinkManager.setDeeplink(deeplink) - : DeeplinkManager.parse(deeplink); + isUnlocked ? DeeplinkManager.parse(deeplink) : DeeplinkManager.setDeeplink(deeplink); } }; From e5412fca919d7e4b583919e49b3f30cf7b9b0bec Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 5 Aug 2020 20:34:33 -0400 Subject: [PATCH 08/11] fromTokenMinimalUnit --- app/components/Views/Send/index.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/components/Views/Send/index.js b/app/components/Views/Send/index.js index bbbc6aea091..968067171e8 100644 --- a/app/components/Views/Send/index.js +++ b/app/components/Views/Send/index.js @@ -5,7 +5,7 @@ import { colors } from '../../../styles/common'; import Engine from '../../../core/Engine'; import EditAmount from '../../Views/SendFlow/Amount'; import ConfirmSend from '../../Views/SendFlow/Confirm'; -import { toBN, BNToHex, hexToBN, fromWei } from '../../../util/number'; +import { toBN, BNToHex, hexToBN, fromWei, fromTokenMinimalUnit } from '../../../util/number'; import { toChecksumAddress } from 'ethereumjs-util'; import { strings } from '../../../../locales/i18n'; import { getTransactionOptionsTitle } from '../../UI/Navbar'; @@ -245,7 +245,6 @@ class Send extends PureComponent { parameters = null }) => { const { addressBook, network, identities, selectedAddress } = this.props; - if (chain_id) { this.handleNetworkSwitch(chain_id); } @@ -292,7 +291,7 @@ class Send extends PureComponent { amount: BNToHex(tokenAmount) }), value: '0x0', - readableValue: parameters.uint256 || '0' + readableValue: fromTokenMinimalUnit(parameters.uint256, selectedAsset.decimals) || '0' }; newTxMeta.transactionToName = getTransactionToName({ addressBook, From 03546c90008d3769b53e7b75679774518ed75450 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 5 Aug 2020 20:36:22 -0400 Subject: [PATCH 09/11] Revert "Revert "Revert "publish-pre-release-android""" This reverts commit 28ae8775ac0f4d93d7f7596645e18a9086b25fb7. --- .circleci/config.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c4cf8806751..74a7a82c8cc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -176,14 +176,12 @@ workflows: only: - master - develop - - bugfix/payment-requestss - prep-node-deps: filters: branches: ignore: - master - develop - - bugfix/payment-requestss - lint: requires: - prep-node-deps @@ -198,16 +196,13 @@ workflows: requires: - lint - test-unit - - publish-pre-release-android: - requires: - - prep-deps # - test-e2e-ios # - upload-coverage: # requires: # - test-unit - # - publish-pre-release-ios: - # requires: - # - prep-deps - # - publish-pre-release-android: - # requires: - # - publish-pre-release-ios + - publish-pre-release-ios: + requires: + - prep-deps + - publish-pre-release-android: + requires: + - publish-pre-release-ios From 26cdd224be6943741412762a18f5993cb21d67e3 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 5 Aug 2020 20:48:47 -0400 Subject: [PATCH 10/11] || '0' --- app/components/Views/Send/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/Views/Send/index.js b/app/components/Views/Send/index.js index 968067171e8..a80d02e6bf6 100644 --- a/app/components/Views/Send/index.js +++ b/app/components/Views/Send/index.js @@ -291,7 +291,7 @@ class Send extends PureComponent { amount: BNToHex(tokenAmount) }), value: '0x0', - readableValue: fromTokenMinimalUnit(parameters.uint256, selectedAsset.decimals) || '0' + readableValue: fromTokenMinimalUnit(parameters.uint256 || '0', selectedAsset.decimals) || '0' }; newTxMeta.transactionToName = getTransactionToName({ addressBook, From dee5a255410b6b8288c92550651f1d631d936c74 Mon Sep 17 00:00:00 2001 From: Esteban Mino Date: Wed, 5 Aug 2020 20:59:57 -0400 Subject: [PATCH 11/11] changelog --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22cefe32a48..453286b5f03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,13 @@ ## Current Develop Branch -## v0.2.20 - Jul 31 2020 +## v0.2.20 - Aug 6 2020 +- [#1751](https://github.com/MetaMask/metamask-mobile/pull/1751): bugfix/payment requests & deeplinks (#1751) +- [#1732](https://github.com/MetaMask/metamask-mobile/pull/1732): Copy edits (#1732) +- [#1750](https://github.com/MetaMask/metamask-mobile/pull/1750): Don't allow for zero in custom gas price (#1750) +- [#1744](https://github.com/MetaMask/metamask-mobile/pull/1744): bugix/v0.2.20 (#1744) +- [#1730](https://github.com/MetaMask/metamask-mobile/pull/1730): Check for pods first, don't double up on yarn install(s) (#1730) +- [#1734](https://github.com/MetaMask/metamask-mobile/pull/1734): Use elliptic@6.5.3 (#1734) - [#1741](https://github.com/MetaMask/metamask-mobile/pull/1741): Bugfix/skipping going to next step before (#1741) - [#1737](https://github.com/MetaMask/metamask-mobile/pull/1737): Fix scroll and button text and secure now goes to next step (#1737) - [#1740](https://github.com/MetaMask/metamask-mobile/pull/1740): check previousScreen and change lading message (#1740)