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) diff --git a/app/components/Views/Entry/index.js b/app/components/Views/Entry/index.js index 0d2035f24cc..46298b98885 100644 --- a/app/components/Views/Entry/index.js +++ b/app/components/Views/Entry/index.js @@ -106,8 +106,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); + const { KeyringController } = Engine.context; + const isUnlocked = KeyringController.isUnlocked(); + isUnlocked ? DeeplinkManager.parse(deeplink) : DeeplinkManager.setDeeplink(deeplink); } }; diff --git a/app/components/Views/Send/index.js b/app/components/Views/Send/index.js index bbbc6aea091..a80d02e6bf6 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 || '0', selectedAsset.decimals) || '0' }; newTxMeta.transactionToName = getTransactionToName({ addressBook, 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 (