Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Instapay deposit navbar cancel #1582

Merged
merged 5 commits into from
May 14, 2020
Merged

Instapay deposit navbar cancel #1582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de11d57
fix
estebanmino May 14, 2020
297beda
works
estebanmino May 14, 2020
b2bd947
rm log
estebanmino May 14, 2020
b75455e
add this to changelog and update date
estebanmino May 14, 2020
328d56a
amount title
estebanmino May 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions app/components/UI/Navbar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: <NavbarTitle title={title} disableNetwork />,
headerLeft:
Expand All @@ -355,7 +355,7 @@ export function getTransactionOptionsTitle(_title, navigation) {
<View />
),
headerRight:
routeName === 'Send' ? (
routeName === 'Send' || routeName === 'PaymentChannelDeposit' ? (
// eslint-disable-next-line react/jsx-no-bind
<TouchableOpacity onPress={rightAction} style={styles.closeButton} testID={'send-back-button'}>
<Text style={styles.closeButtonText}>{rightText}</Text>
Expand Down
1 change: 0 additions & 1 deletion app/components/Views/PaymentChannel/PaymentChannelDeposit/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion app/components/Views/SendFlow/Amount/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
/**
Expand Down