mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-01-19 09:15:11 +00:00
Merge branch 'mweb' of https://github.com/cake-tech/cake_wallet into mweb-bg-sync-2
This commit is contained in:
commit
352865fa98
1 changed files with 14 additions and 6 deletions
|
@ -248,6 +248,11 @@ abstract class DashboardViewModelBase with Store {
|
||||||
|
|
||||||
if (hasMweb) {
|
if (hasMweb) {
|
||||||
mwebScanningActive = bitcoin!.getMwebEnabled(wallet);
|
mwebScanningActive = bitcoin!.getMwebEnabled(wallet);
|
||||||
|
reaction((_) => settingsStore.mwebAlwaysScan, (bool alwaysScan) {
|
||||||
|
if (alwaysScan) {
|
||||||
|
mwebScanningActive = true;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -376,12 +381,15 @@ abstract class DashboardViewModelBase with Store {
|
||||||
// to not cause work duplication, this will do the job as well, it will be slightly less precise
|
// to not cause work duplication, this will do the job as well, it will be slightly less precise
|
||||||
// about what happened - but still enough.
|
// about what happened - but still enough.
|
||||||
// if (keys['privateSpendKey'] == List.generate(64, (index) => "0").join("")) "Private spend key is 0",
|
// if (keys['privateSpendKey'] == List.generate(64, (index) => "0").join("")) "Private spend key is 0",
|
||||||
if (keys['privateViewKey'] == List.generate(64, (index) => "0").join("")) "private view key is 0",
|
if (keys['privateViewKey'] == List.generate(64, (index) => "0").join(""))
|
||||||
|
"private view key is 0",
|
||||||
// if (keys['publicSpendKey'] == List.generate(64, (index) => "0").join("")) "public spend key is 0",
|
// if (keys['publicSpendKey'] == List.generate(64, (index) => "0").join("")) "public spend key is 0",
|
||||||
if (keys['publicViewKey'] == List.generate(64, (index) => "0").join("")) "public view key is 0",
|
if (keys['publicViewKey'] == List.generate(64, (index) => "0").join(""))
|
||||||
|
"public view key is 0",
|
||||||
// if (wallet.seed == null) "wallet seed is null",
|
// if (wallet.seed == null) "wallet seed is null",
|
||||||
// if (wallet.seed == "") "wallet seed is empty",
|
// if (wallet.seed == "") "wallet seed is empty",
|
||||||
if (monero!.getSubaddressList(wallet).getAll(wallet)[0].address == "41d7FXjswpK1111111111111111111111111111111111111111111111111111111111111111111111111111112KhNi4")
|
if (monero!.getSubaddressList(wallet).getAll(wallet)[0].address ==
|
||||||
|
"41d7FXjswpK1111111111111111111111111111111111111111111111111111111111111111111111111111112KhNi4")
|
||||||
"primary address is invalid, you won't be able to receive / spend funds",
|
"primary address is invalid, you won't be able to receive / spend funds",
|
||||||
];
|
];
|
||||||
return errors;
|
return errors;
|
||||||
|
@ -414,8 +422,8 @@ abstract class DashboardViewModelBase with Store {
|
||||||
@computed
|
@computed
|
||||||
bool get showMwebCard => hasMweb && settingsStore.mwebCardDisplay;
|
bool get showMwebCard => hasMweb && settingsStore.mwebCardDisplay;
|
||||||
|
|
||||||
@computed
|
@observable
|
||||||
bool get mwebScanningActive => settingsStore.mwebEnabled;
|
bool mwebScanningActive = false;
|
||||||
|
|
||||||
@computed
|
@computed
|
||||||
bool get hasEnabledMwebBefore => settingsStore.hasEnabledMwebBefore;
|
bool get hasEnabledMwebBefore => settingsStore.hasEnabledMwebBefore;
|
||||||
|
@ -430,7 +438,7 @@ abstract class DashboardViewModelBase with Store {
|
||||||
settingsStore.hasEnabledMwebBefore = true;
|
settingsStore.hasEnabledMwebBefore = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
settingsStore.mwebEnabled = active;
|
mwebScanningActive = active;
|
||||||
bitcoin!.setMwebEnabled(wallet, active);
|
bitcoin!.setMwebEnabled(wallet, active);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue