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

FIX: When having multiple wallets, I was unable to see my transactions description from the main screen

Browse source
This commit is contained in:
Marcos Rodriguez Vélez 2019-01-09 15:03:20 -05:00
parent 3035747af3
commit 8b5f68b083
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
class/lightning-custodian-wallet.js
View file

@ -144,7 +144,6 @@ export class LightningCustodianWallet extends LegacyWallet {
if (json && json.error) {
throw new Error('API error: ' + json.message + ' (code ' + json.code + ')');
}
this.user_invoices_raw = json;
return json;
@ -323,6 +322,7 @@ export class LightningCustodianWallet extends LegacyWallet {
txs = txs.concat(this.pending_transactions_raw.slice(), this.transactions_raw.slice().reverse(), this.user_invoices_raw.slice()); // slice so array is cloned
// transforming to how wallets/list screen expects it
for (let tx of txs) {
tx.fromWallet = this.secret;
if (tx.amount) {
// pending tx
tx.amt = tx.amount * -100000000;

2
ios/BlueWallet/Info.plist
View file

@ -33,7 +33,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>229</string>
<string>230</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>

19
screen/wallets/list.js
View file

@ -19,7 +19,6 @@ import { Icon } from 'react-native-elements';
import { NavigationEvents } from 'react-navigation';
import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
import PropTypes from 'prop-types';
import { LightningCustodianWallet } from '../../class';
let EV = require('../../events');
let A = require('../../analytics');
/** @type {AppStorage} */
@ -421,15 +420,17 @@ export default class WalletsList extends Component {
rowData.item.type === 'payment_request' ||
rowData.item.type === 'paid_invoice'
) {
const lightningWallet = this.state.wallets.filter(wallet => wallet.type === LightningCustodianWallet.type);
if (typeof lightningWallet === 'object') {
if (lightningWallet.length === 1) {
this.props.navigation.navigate('LNDViewInvoice', {
invoice: rowData.item,
fromWallet: lightningWallet[0],
});
const lightningWallet = this.state.wallets.filter(wallet => {
if (typeof wallet === 'object') {
if (wallet.hasOwnProperty('secret')) {
return wallet.getSecret() === rowData.item.fromWallet;
}
}
}
});
this.props.navigation.navigate('LNDViewInvoice', {
invoice: rowData.item,
fromWallet: lightningWallet[0],
});
}
}}
badge={{