mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-02-22 06:52:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

FIX: copy balance on wallet/transactions screen

Browse source
This commit is contained in:
Ivan Vershigora 2020-10-24 11:03:01 +03:00 • committed by Overtorment
parent 3ca8da5ea2
commit 4de0ff016c
2 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
BlueComponents.js
View file

@ -285,7 +285,7 @@ export class BlueWalletNavigationHeader extends Component {
}; };
handleToolTipSelection = item => { handleToolTipSelection = item => {
if (item === loc.transactions.details_copy || item.id === loc.transactions.details.copy) { if (item === 'balanceCopy' || item.id === 'balanceCopy') {
this.handleCopyPress(); this.handleCopyPress();
} else if (item === 'balancePrivacy' || item.id === 'balancePrivacy') { } else if (item === 'balancePrivacy' || item.id === 'balancePrivacy') {
this.handleBalanceVisibility(); this.handleBalanceVisibility();
@ -296,14 +296,25 @@ export class BlueWalletNavigationHeader extends Component {
return Platform.select({ return Platform.select({
// NOT WORKING ATM. // NOT WORKING ATM.
// ios: [ // 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 }, // { text: loc.transactions.details_copy, onPress: this.handleCopyPress },
// ], // ],
android: this.state.wallet.hideBalance 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)} ref={tooltip => (this.tooltip = tooltip)}
actions={ actions={
this.state.wallet.hideBalance 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,
},
] ]
} }
/> />

2
loc/en.json
View file

@ -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_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_no_bump": "This transaction is not bumpable",
"cpfp_title": "Bump fee (CPFP)", "cpfp_title": "Bump fee (CPFP)",
"details_balance_hide": "Hide Balance",
"details_balance_show": "Show Balance",
"details_block": "Block Height", "details_block": "Block Height",
"details_copy": "Copy", "details_copy": "Copy",
"details_from": "Input", "details_from": "Input",