mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2024-11-19 18:00:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:BlueWallet/BlueWallet

Browse Source
This commit is contained in:
Overtorment 2021-09-20 14:13:30 +01:00
commit d5b643eae8
No known key found for this signature in database
GPG Key ID: AB15F43F78CCBC06
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
class/app-storage.js
View File

@ -426,7 +426,8 @@ export class AppStorage {
}
// done
if (!this.wallets.some(wallet => wallet.getSecret() === unserializedWallet.secret)) {
const ID = unserializedWallet.getID();
if (!this.wallets.some(wallet => wallet.getID() === ID)) {
this.wallets.push(unserializedWallet);
this.tx_metadata = data.tx_metadata;
}
@ -445,7 +446,7 @@ export class AppStorage {
* @param wallet {AbstractWallet}
*/
deleteWallet = wallet => {
const secret = wallet.getSecret();
const ID = wallet.getID();
const tempWallets = [];
if (wallet.type === LightningLdkWallet.type) {
@ -457,7 +458,7 @@ export class AppStorage {
for (const value of this.wallets) {
if (value.type === PlaceholderWallet.type) {
continue;
} else if (value.getSecret() === secret) {
} else if (value.getID() === ID) {
// the one we should delete
// nop
} else {

2
package.json
View File

@ -125,7 +125,7 @@
"coinselect": "3.1.12",
"crypto-js": "4.1.1",
"dayjs": "1.10.7",
"detox": "18.20.3",
"detox": "18.20.4",
"ecurve": "1.0.6",
"electrum-client": "https://github.com/BlueWallet/rn-electrum-client#99ebcc649d91a8dc39bea7964b02dd9ead464aa4",
"electrum-mnemonic": "2.0.0",

3
screen/receive/details.js
View File

@ -29,7 +29,6 @@ import {
} from '../../BlueComponents';
import navigationStyle from '../../components/navigationStyle';
import BottomModal from '../../components/BottomModal';
import Privacy from '../../blue_modules/Privacy';
import { Chain, BitcoinUnit } from '../../models/bitcoinUnits';
import HandoffComponent from '../../components/handoff';
import AmountInput from '../../components/AmountInput';
@ -341,7 +340,6 @@ const ReceiveDetails = () => {
};
const obtainWalletAddress = useCallback(async () => {
Privacy.enableBlur();
console.log('receive/details - componentDidMount');
wallet.setUserHasSavedExport(true);
await saveToDisk();
@ -413,7 +411,6 @@ const ReceiveDetails = () => {
});
return () => {
task.cancel();
Privacy.disableBlur();
};
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [wallet]),