diff --git a/CHANGELOG.md b/CHANGELOG.md index 524a38a187d..4cc1843efed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,8 @@ ## Current Develop Branch -## v0.2.16 - May 13 2020 +## v0.2.16 - May 15 2020 +- [#1582](https://github.com/MetaMask/metamask-mobile/pull/1582): Instapay deposit navbar cancel (#1582) - [#1570](https://github.com/MetaMask/metamask-mobile/pull/1570): Disable confirm screen edit button when no tokens of a payment request (#1570) - [#1574](https://github.com/MetaMask/metamask-mobile/pull/1574): Ensure collectibles that use 'transfer' method show a fee in tx history list (#1574) - [#1565](https://github.com/MetaMask/metamask-mobile/pull/1565): Fix validating of amount when sending a collectible (#1565) diff --git a/app/components/UI/Navbar/index.js b/app/components/UI/Navbar/index.js index 62c58b541c3..70e85da6fe7 100644 --- a/app/components/UI/Navbar/index.js +++ b/app/components/UI/Navbar/index.js @@ -333,7 +333,7 @@ export function getTransactionOptionsTitle(_title, navigation) { const leftAction = () => modeChange('edit'); const rightAction = () => navigation.pop(); const rightText = strings('transaction.cancel'); - const title = transactionMode === 'edit' ? 'transaction.edit' : _title; + const title = transactionMode === 'edit' && routeName !== 'PaymentChannelDeposit' ? 'transaction.edit' : _title; return { headerTitle: , headerLeft: @@ -355,7 +355,7 @@ export function getTransactionOptionsTitle(_title, navigation) { ), headerRight: - routeName === 'Send' ? ( + routeName === 'Send' || routeName === 'PaymentChannelDeposit' ? ( // eslint-disable-next-line react/jsx-no-bind {rightText} diff --git a/app/components/Views/PaymentChannel/PaymentChannelDeposit/index.js b/app/components/Views/PaymentChannel/PaymentChannelDeposit/index.js index 39c45ff484a..47b3528f18c 100644 --- a/app/components/Views/PaymentChannel/PaymentChannelDeposit/index.js +++ b/app/components/Views/PaymentChannel/PaymentChannelDeposit/index.js @@ -242,7 +242,6 @@ class Deposit extends PureComponent { componentDidMount = () => { const { navigation } = this.props; navigation && navigation.setParams({ mode: 'edit' }); - if (this.amountInput) { setTimeout(() => { const { current } = this.amountInput; diff --git a/app/components/Views/SendFlow/Amount/index.js b/app/components/Views/SendFlow/Amount/index.js index 40540d9403c..645bcb4c925 100644 --- a/app/components/Views/SendFlow/Amount/index.js +++ b/app/components/Views/SendFlow/Amount/index.js @@ -285,7 +285,7 @@ const styles = StyleSheet.create({ */ class Amount extends PureComponent { static navigationOptions = ({ navigation, screenProps }) => - getSendFlowTitle('send.confirm', navigation, screenProps); + getSendFlowTitle('send.amount', navigation, screenProps); static propTypes = { /**