From 4de0ff016cf2c30889d114266e983eef2ab7c5d5 Mon Sep 17 00:00:00 2001 From: Ivan Vershigora Date: Sat, 24 Oct 2020 11:03:01 +0300 Subject: [PATCH] FIX: copy balance on wallet/transactions screen --- BlueComponents.js | 38 ++++++++++++++++++++++++++++++-------- loc/en.json | 2 ++ 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/BlueComponents.js b/BlueComponents.js index 634e7acf3..be95c9fb0 100644 --- a/BlueComponents.js +++ b/BlueComponents.js @@ -285,7 +285,7 @@ export class BlueWalletNavigationHeader extends Component { }; handleToolTipSelection = item => { - if (item === loc.transactions.details_copy || item.id === loc.transactions.details.copy) { + if (item === 'balanceCopy' || item.id === 'balanceCopy') { this.handleCopyPress(); } else if (item === 'balancePrivacy' || item.id === 'balancePrivacy') { this.handleBalanceVisibility(); @@ -296,14 +296,25 @@ export class BlueWalletNavigationHeader extends Component { return Platform.select({ // NOT WORKING ATM. // ios: [ - // { text: this.state.wallet.hideBalance ? 'Show Balance' : 'Hide Balance', onPress: this.handleBalanceVisibility }, + // { text: this.state.wallet.hideBalance ? loc.transactions.details_balance_show : loc.transactions.details_balance_hide, onPress: this.handleBalanceVisibility }, // { text: loc.transactions.details_copy, onPress: this.handleCopyPress }, // ], android: this.state.wallet.hideBalance - ? [{ id: 'balancePrivacy', label: this.state.wallet.hideBalance ? 'Show Balance' : 'Hide Balance' }] + ? [ + { + id: 'balancePrivacy', + label: this.state.wallet.hideBalance ? loc.transactions.details_balance_show : loc.transactions.details_balance_hide, + }, + ] : [ - { id: 'balancePrivacy', label: this.state.wallet.hideBalance ? 'Show Balance' : 'Hide Balance' }, - { id: loc.transactions.details_copy, label: loc.transactions.details.copy }, + { + id: 'balancePrivacy', + label: this.state.wallet.hideBalance ? loc.transactions.details_balance_show : loc.transactions.details_balance_hide, + }, + { + id: 'balanceCopy', + label: loc.transactions.details_copy, + }, ], }); } @@ -375,10 +386,21 @@ export class BlueWalletNavigationHeader extends Component { ref={tooltip => (this.tooltip = tooltip)} actions={ this.state.wallet.hideBalance - ? [{ text: this.state.wallet.hideBalance ? 'Show Balance' : 'Hide Balance', onPress: this.handleBalanceVisibility }] + ? [ + { + text: this.state.wallet.hideBalance ? loc.transactions.details_balance_show : loc.transactions.details_balance_hide, + onPress: this.handleBalanceVisibility, + }, + ] : [ - { text: this.state.wallet.hideBalance ? 'Show Balance' : 'Hide Balance', onPress: this.handleBalanceVisibility }, - { text: loc.transactions.details_copy, onPress: this.handleCopyPress }, + { + text: this.state.wallet.hideBalance ? loc.transactions.details_balance_show : loc.transactions.details_balance_hide, + onPress: this.handleBalanceVisibility, + }, + { + text: loc.transactions.details_copy, + onPress: this.handleCopyPress, + }, ] } /> diff --git a/loc/en.json b/loc/en.json index b310e1bf9..fa9e9814a 100644 --- a/loc/en.json +++ b/loc/en.json @@ -295,6 +295,8 @@ "cpfp_exp": "We will create another transaction that spends your unconfirmed transaction. The total fee will be higher than the original transaction fee, so it should be mined faster. This is called CPFP - Child Pays For Parent.", "cpfp_no_bump": "This transaction is not bumpable", "cpfp_title": "Bump fee (CPFP)", + "details_balance_hide": "Hide Balance", + "details_balance_show": "Show Balance", "details_block": "Block Height", "details_copy": "Copy", "details_from": "Input",