mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2025-06-28 12:29:51 +00:00
v4.28.0 Release Candidate (#2260)
* v4.28.0 Release Candidate * Fix Android deeplinking * minor [skip ci] * update app versions [skip ci] * merge main * - Re-enable SwapTrade - Hide Keyboard on opening fee selection * handle old backups import * - Fix seed type UI - Temp fix for Deleting Monero wallet * update build number [skip ci] * minor nullability handling * disable payjoin for SP
This commit is contained in:
parent
c12daced40
commit
914561716d
25 changed files with 113 additions and 109 deletions
|
@ -25,8 +25,8 @@ bool isUpdating = false;
|
|||
void refreshAccounts() {
|
||||
try {
|
||||
isUpdating = true;
|
||||
subaddressAccount = currentWallet!.subaddressAccount();
|
||||
subaddressAccount!.refresh();
|
||||
subaddressAccount = currentWallet?.subaddressAccount();
|
||||
subaddressAccount?.refresh();
|
||||
isUpdating = false;
|
||||
} catch (e) {
|
||||
isUpdating = false;
|
||||
|
|
|
@ -34,12 +34,12 @@ import 'package:cw_monero/monero_transaction_history.dart';
|
|||
import 'package:cw_monero/monero_transaction_info.dart';
|
||||
import 'package:cw_monero/monero_unspent.dart';
|
||||
import 'package:cw_monero/monero_wallet_addresses.dart';
|
||||
import 'package:cw_monero/monero_wallet_service.dart';
|
||||
import 'package:cw_monero/pending_monero_transaction.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:hive/hive.dart';
|
||||
import 'package:ledger_flutter_plus/ledger_flutter_plus.dart';
|
||||
import 'package:mobx/mobx.dart';
|
||||
import 'package:monero/src/monero.dart' as m;
|
||||
import 'package:monero/monero.dart' as monero;
|
||||
|
||||
part 'monero_wallet.g.dart';
|
||||
|
@ -193,19 +193,7 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
|
|||
final wmaddr = wmPtr.ffiAddress();
|
||||
final waddr = openedWalletsByPath["$currentWalletDirPath/$name"]!.ffiAddress();
|
||||
openedWalletsByPath.remove("$currentWalletDirPath/$name");
|
||||
if (Platform.isWindows) {
|
||||
await Isolate.run(() {
|
||||
monero.WalletManager_closeWallet(
|
||||
Pointer.fromAddress(wmaddr), Pointer.fromAddress(waddr), true);
|
||||
monero.WalletManager_errorString(Pointer.fromAddress(wmaddr));
|
||||
});
|
||||
} else {
|
||||
unawaited(Isolate.run(() {
|
||||
monero.WalletManager_closeWallet(
|
||||
Pointer.fromAddress(wmaddr), Pointer.fromAddress(waddr), true);
|
||||
monero.WalletManager_errorString(Pointer.fromAddress(wmaddr));
|
||||
}));
|
||||
}
|
||||
closeWalletAwaitIfShould(wmaddr, waddr);
|
||||
currentWallet = null;
|
||||
printV("wallet closed");
|
||||
}
|
||||
|
|
|
@ -978,4 +978,4 @@ packages:
|
|||
version: "3.1.3"
|
||||
sdks:
|
||||
dart: ">=3.6.0 <4.0.0"
|
||||
flutter: ">=3.27.4"
|
||||
flutter: ">=3.24.0"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue