get addresses => this.collection();
@@ -59,6 +59,11 @@ const AddressSchema = CollectionSchema(
id: 7,
name: r'walletId',
type: IsarType.string,
+ ),
+ r'zSafeFrost': PropertySchema(
+ id: 8,
+ name: r'zSafeFrost',
+ type: IsarType.bool,
)
},
estimateSize: _addressEstimateSize,
@@ -124,7 +129,7 @@ const AddressSchema = CollectionSchema(
getId: _addressGetId,
getLinks: _addressGetLinks,
attach: _addressAttach,
- version: '3.0.5',
+ version: '3.1.8',
);
int _addressEstimateSize(
@@ -172,6 +177,7 @@ void _addressSerialize(
writer.writeByte(offsets[5], object.type.index);
writer.writeString(offsets[6], object.value);
writer.writeString(offsets[7], object.walletId);
+ writer.writeBool(offsets[8], object.zSafeFrost);
}
Address _addressDeserialize(
@@ -195,6 +201,7 @@ Address _addressDeserialize(
AddressType.p2pkh,
value: reader.readString(offsets[6]),
walletId: reader.readString(offsets[7]),
+ zSafeFrost: reader.readBoolOrNull(offsets[8]),
);
object.id = id;
return object;
@@ -229,6 +236,8 @@ P _addressDeserializeProp(
return (reader.readString(offset)) as P;
case 7:
return (reader.readString(offset)) as P;
+ case 8:
+ return (reader.readBoolOrNull(offset)) as P;
default:
throw IsarError('Unknown property with id $propertyId');
}
@@ -1474,6 +1483,32 @@ extension AddressQueryFilter
));
});
}
+
+ QueryBuilder zSafeFrostIsNull() {
+ return QueryBuilder.apply(this, (query) {
+ return query.addFilterCondition(const FilterCondition.isNull(
+ property: r'zSafeFrost',
+ ));
+ });
+ }
+
+ QueryBuilder zSafeFrostIsNotNull() {
+ return QueryBuilder.apply(this, (query) {
+ return query.addFilterCondition(const FilterCondition.isNotNull(
+ property: r'zSafeFrost',
+ ));
+ });
+ }
+
+ QueryBuilder zSafeFrostEqualTo(
+ bool? value) {
+ return QueryBuilder.apply(this, (query) {
+ return query.addFilterCondition(FilterCondition.equalTo(
+ property: r'zSafeFrost',
+ value: value,
+ ));
+ });
+ }
}
extension AddressQueryObject
@@ -1621,6 +1656,18 @@ extension AddressQuerySortBy on QueryBuilder {
return query.addSortBy(r'walletId', Sort.desc);
});
}
+
+ QueryBuilder sortByZSafeFrost() {
+ return QueryBuilder.apply(this, (query) {
+ return query.addSortBy(r'zSafeFrost', Sort.asc);
+ });
+ }
+
+ QueryBuilder sortByZSafeFrostDesc() {
+ return QueryBuilder.apply(this, (query) {
+ return query.addSortBy(r'zSafeFrost', Sort.desc);
+ });
+ }
}
extension AddressQuerySortThenBy
@@ -1708,6 +1755,18 @@ extension AddressQuerySortThenBy
return query.addSortBy(r'walletId', Sort.desc);
});
}
+
+ QueryBuilder thenByZSafeFrost() {
+ return QueryBuilder.apply(this, (query) {
+ return query.addSortBy(r'zSafeFrost', Sort.asc);
+ });
+ }
+
+ QueryBuilder thenByZSafeFrostDesc() {
+ return QueryBuilder.apply(this, (query) {
+ return query.addSortBy(r'zSafeFrost', Sort.desc);
+ });
+ }
}
extension AddressQueryWhereDistinct
@@ -1756,6 +1815,12 @@ extension AddressQueryWhereDistinct
return query.addDistinctBy(r'walletId', caseSensitive: caseSensitive);
});
}
+
+ QueryBuilder distinctByZSafeFrost() {
+ return QueryBuilder.apply(this, (query) {
+ return query.addDistinctBy(r'zSafeFrost');
+ });
+ }
}
extension AddressQueryProperty
@@ -1814,6 +1879,12 @@ extension AddressQueryProperty
return query.addPropertyName(r'walletId');
});
}
+
+ QueryBuilder zSafeFrostProperty() {
+ return QueryBuilder.apply(this, (query) {
+ return query.addPropertyName(r'zSafeFrost');
+ });
+ }
}
// **************************************************************************
@@ -1821,7 +1892,7 @@ extension AddressQueryProperty
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
const DerivationPathSchema = Schema(
name: r'DerivationPath',
diff --git a/lib/models/isar/models/blockchain_data/input.g.dart b/lib/models/isar/models/blockchain_data/input.g.dart
index 608446fea..a08dc7637 100644
--- a/lib/models/isar/models/blockchain_data/input.g.dart
+++ b/lib/models/isar/models/blockchain_data/input.g.dart
@@ -7,7 +7,7 @@ part of 'input.dart';
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
const InputSchema = Schema(
name: r'Input',
diff --git a/lib/models/isar/models/blockchain_data/output.g.dart b/lib/models/isar/models/blockchain_data/output.g.dart
index 5e3bbf02d..6a5812373 100644
--- a/lib/models/isar/models/blockchain_data/output.g.dart
+++ b/lib/models/isar/models/blockchain_data/output.g.dart
@@ -7,7 +7,7 @@ part of 'output.dart';
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
const OutputSchema = Schema(
name: r'Output',
diff --git a/lib/models/isar/models/blockchain_data/transaction.g.dart b/lib/models/isar/models/blockchain_data/transaction.g.dart
index 965a64870..0d34d133d 100644
--- a/lib/models/isar/models/blockchain_data/transaction.g.dart
+++ b/lib/models/isar/models/blockchain_data/transaction.g.dart
@@ -7,7 +7,7 @@ part of 'transaction.dart';
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
extension GetTransactionCollection on Isar {
IsarCollection get transactions => this.collection();
@@ -171,7 +171,7 @@ const TransactionSchema = CollectionSchema(
getId: _transactionGetId,
getLinks: _transactionGetLinks,
attach: _transactionAttach,
- version: '3.0.5',
+ version: '3.1.8',
);
int _transactionEstimateSize(
diff --git a/lib/models/isar/models/blockchain_data/utxo.dart b/lib/models/isar/models/blockchain_data/utxo.dart
index 7bbf50896..dd492d9b8 100644
--- a/lib/models/isar/models/blockchain_data/utxo.dart
+++ b/lib/models/isar/models/blockchain_data/utxo.dart
@@ -8,6 +8,7 @@
*
*/
+import 'dart:convert';
import 'dart:math';
import 'package:isar/isar.dart';
@@ -84,6 +85,20 @@ class UTXO {
return confirmations >= minimumConfirms;
}
+ @ignore
+ String? get keyImage {
+ if (otherData == null) {
+ return null;
+ }
+
+ try {
+ final map = jsonDecode(otherData!) as Map;
+ return map["keyImage"] as String;
+ } catch (_) {
+ return null;
+ }
+ }
+
UTXO copyWith({
Id? id,
String? walletId,
diff --git a/lib/models/isar/models/blockchain_data/utxo.g.dart b/lib/models/isar/models/blockchain_data/utxo.g.dart
index b12e9b470..0d2a0fcd7 100644
--- a/lib/models/isar/models/blockchain_data/utxo.g.dart
+++ b/lib/models/isar/models/blockchain_data/utxo.g.dart
@@ -7,7 +7,7 @@ part of 'utxo.dart';
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
extension GetUTXOCollection on Isar {
IsarCollection get utxos => this.collection();
@@ -149,7 +149,7 @@ const UTXOSchema = CollectionSchema(
getId: _uTXOGetId,
getLinks: _uTXOGetLinks,
attach: _uTXOAttach,
- version: '3.0.5',
+ version: '3.1.8',
);
int _uTXOEstimateSize(
diff --git a/lib/models/isar/models/blockchain_data/v2/input_v2.g.dart b/lib/models/isar/models/blockchain_data/v2/input_v2.g.dart
index c1a3b781b..fb0e9dd61 100644
--- a/lib/models/isar/models/blockchain_data/v2/input_v2.g.dart
+++ b/lib/models/isar/models/blockchain_data/v2/input_v2.g.dart
@@ -7,7 +7,7 @@ part of 'input_v2.dart';
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
const OutpointV2Schema = Schema(
name: r'OutpointV2',
@@ -330,7 +330,7 @@ extension OutpointV2QueryObject
on QueryBuilder {}
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
const InputV2Schema = Schema(
name: r'InputV2',
diff --git a/lib/models/isar/models/blockchain_data/v2/output_v2.g.dart b/lib/models/isar/models/blockchain_data/v2/output_v2.g.dart
index e26075d44..539ad6dbd 100644
--- a/lib/models/isar/models/blockchain_data/v2/output_v2.g.dart
+++ b/lib/models/isar/models/blockchain_data/v2/output_v2.g.dart
@@ -7,7 +7,7 @@ part of 'output_v2.dart';
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
const OutputV2Schema = Schema(
name: r'OutputV2',
diff --git a/lib/models/isar/models/blockchain_data/v2/transaction_v2.dart b/lib/models/isar/models/blockchain_data/v2/transaction_v2.dart
index 465dd3b13..4582ef47d 100644
--- a/lib/models/isar/models/blockchain_data/v2/transaction_v2.dart
+++ b/lib/models/isar/models/blockchain_data/v2/transaction_v2.dart
@@ -134,6 +134,14 @@ class TransactionV2 {
}
Amount getAmountReceivedInThisWallet({required int fractionDigits}) {
+ if (_isMonero()) {
+ if (type == TransactionType.incoming) {
+ return _getMoneroAmount()!;
+ } else {
+ return Amount.zeroWith(fractionDigits: fractionDigits);
+ }
+ }
+
final outSum = outputs
.where((e) => e.walletOwns)
.fold(BigInt.zero, (p, e) => p + e.value);
@@ -151,6 +159,14 @@ class TransactionV2 {
}
Amount getAmountSentFromThisWallet({required int fractionDigits}) {
+ if (_isMonero()) {
+ if (type == TransactionType.outgoing) {
+ return _getMoneroAmount()!;
+ } else {
+ return Amount.zeroWith(fractionDigits: fractionDigits);
+ }
+ }
+
final inSum = inputs
.where((e) => e.walletOwns)
.fold(BigInt.zero, (p, e) => p + e.value);
@@ -191,6 +207,21 @@ class TransactionV2 {
}
}
+ Amount? _getMoneroAmount() {
+ try {
+ return Amount.fromSerializedJsonString(
+ _getFromOtherData(key: TxV2OdKeys.moneroAmount) as String,
+ );
+ } catch (_) {
+ return null;
+ }
+ }
+
+ bool _isMonero() {
+ final value = _getFromOtherData(key: TxV2OdKeys.isMoneroTransaction);
+ return value is bool ? value : false;
+ }
+
String statusLabel({
required int currentChainHeight,
required int minConfirms,
@@ -307,4 +338,7 @@ abstract final class TxV2OdKeys {
static const contractAddress = "contractAddress";
static const nonce = "nonce";
static const overrideFee = "overrideFee";
+ static const moneroAmount = "moneroAmount";
+ static const moneroAccountIndex = "moneroAccountIndex";
+ static const isMoneroTransaction = "isMoneroTransaction";
}
diff --git a/lib/models/isar/models/blockchain_data/v2/transaction_v2.g.dart b/lib/models/isar/models/blockchain_data/v2/transaction_v2.g.dart
index 83006da89..68d8a18c5 100644
--- a/lib/models/isar/models/blockchain_data/v2/transaction_v2.g.dart
+++ b/lib/models/isar/models/blockchain_data/v2/transaction_v2.g.dart
@@ -7,7 +7,7 @@ part of 'transaction_v2.dart';
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
extension GetTransactionV2Collection on Isar {
IsarCollection get transactionV2s => this.collection();
@@ -177,7 +177,7 @@ const TransactionV2Schema = CollectionSchema(
getId: _transactionV2GetId,
getLinks: _transactionV2GetLinks,
attach: _transactionV2Attach,
- version: '3.0.5',
+ version: '3.1.8',
);
int _transactionV2EstimateSize(
diff --git a/lib/models/isar/models/contact_entry.g.dart b/lib/models/isar/models/contact_entry.g.dart
index dc1eb2b61..282112f55 100644
--- a/lib/models/isar/models/contact_entry.g.dart
+++ b/lib/models/isar/models/contact_entry.g.dart
@@ -7,7 +7,7 @@ part of 'contact_entry.dart';
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
extension GetContactEntryCollection on Isar {
IsarCollection get contactEntrys => this.collection();
@@ -69,7 +69,7 @@ const ContactEntrySchema = CollectionSchema(
getId: _contactEntryGetId,
getLinks: _contactEntryGetLinks,
attach: _contactEntryAttach,
- version: '3.0.5',
+ version: '3.1.8',
);
int _contactEntryEstimateSize(
@@ -1142,7 +1142,7 @@ extension ContactEntryQueryProperty
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
const ContactAddressEntrySchema = Schema(
name: r'ContactAddressEntry',
diff --git a/lib/models/isar/models/encrypted_string_value.g.dart b/lib/models/isar/models/encrypted_string_value.g.dart
index fdfe5527a..5b3490dcc 100644
--- a/lib/models/isar/models/encrypted_string_value.g.dart
+++ b/lib/models/isar/models/encrypted_string_value.g.dart
@@ -7,7 +7,7 @@ part of 'encrypted_string_value.dart';
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
extension GetEncryptedStringValueCollection on Isar {
IsarCollection get encryptedStringValues =>
@@ -54,7 +54,7 @@ const EncryptedStringValueSchema = CollectionSchema(
getId: _encryptedStringValueGetId,
getLinks: _encryptedStringValueGetLinks,
attach: _encryptedStringValueAttach,
- version: '3.0.5',
+ version: '3.1.8',
);
int _encryptedStringValueEstimateSize(
diff --git a/lib/models/isar/models/ethereum/eth_contract.g.dart b/lib/models/isar/models/ethereum/eth_contract.g.dart
index bc9548e8d..fcb1af11d 100644
--- a/lib/models/isar/models/ethereum/eth_contract.g.dart
+++ b/lib/models/isar/models/ethereum/eth_contract.g.dart
@@ -7,7 +7,7 @@ part of 'eth_contract.dart';
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
extension GetEthContractCollection on Isar {
IsarCollection get ethContracts => this.collection();
@@ -74,7 +74,7 @@ const EthContractSchema = CollectionSchema(
getId: _ethContractGetId,
getLinks: _ethContractGetLinks,
attach: _ethContractAttach,
- version: '3.0.5',
+ version: '3.1.8',
);
int _ethContractEstimateSize(
diff --git a/lib/models/isar/models/firo_specific/lelantus_coin.g.dart b/lib/models/isar/models/firo_specific/lelantus_coin.g.dart
index 4b9214889..1c0f4d405 100644
--- a/lib/models/isar/models/firo_specific/lelantus_coin.g.dart
+++ b/lib/models/isar/models/firo_specific/lelantus_coin.g.dart
@@ -7,7 +7,7 @@ part of 'lelantus_coin.dart';
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
extension GetLelantusCoinCollection on Isar {
IsarCollection get lelantusCoins => this.collection();
@@ -101,7 +101,7 @@ const LelantusCoinSchema = CollectionSchema(
getId: _lelantusCoinGetId,
getLinks: _lelantusCoinGetLinks,
attach: _lelantusCoinAttach,
- version: '3.0.5',
+ version: '3.1.8',
);
int _lelantusCoinEstimateSize(
diff --git a/lib/models/isar/models/log.g.dart b/lib/models/isar/models/log.g.dart
index 8a4cf22b1..ebad873f2 100644
--- a/lib/models/isar/models/log.g.dart
+++ b/lib/models/isar/models/log.g.dart
@@ -7,7 +7,7 @@ part of 'log.dart';
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
extension GetLogCollection on Isar {
IsarCollection get logs => this.collection();
@@ -59,7 +59,7 @@ const LogSchema = CollectionSchema(
getId: _logGetId,
getLinks: _logGetLinks,
attach: _logAttach,
- version: '3.0.5',
+ version: '3.1.8',
);
int _logEstimateSize(
diff --git a/lib/models/isar/models/sent_to_address.g.dart b/lib/models/isar/models/sent_to_address.g.dart
index 304d2c5fc..88153da9d 100644
--- a/lib/models/isar/models/sent_to_address.g.dart
+++ b/lib/models/isar/models/sent_to_address.g.dart
@@ -7,7 +7,7 @@ part of 'sent_to_address.dart';
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
extension GetSentToAddressCollection on Isar {
IsarCollection get sentToAddress => this.collection();
@@ -81,7 +81,7 @@ const SentToAddressSchema = CollectionSchema(
getId: _sentToAddressGetId,
getLinks: _sentToAddressGetLinks,
attach: _sentToAddressAttach,
- version: '3.0.5',
+ version: '3.1.8',
);
int _sentToAddressEstimateSize(
diff --git a/lib/models/isar/models/transaction_note.g.dart b/lib/models/isar/models/transaction_note.g.dart
index 152070328..67af8cdca 100644
--- a/lib/models/isar/models/transaction_note.g.dart
+++ b/lib/models/isar/models/transaction_note.g.dart
@@ -7,7 +7,7 @@ part of 'transaction_note.dart';
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
extension GetTransactionNoteCollection on Isar {
IsarCollection get transactionNotes => this.collection();
@@ -76,7 +76,7 @@ const TransactionNoteSchema = CollectionSchema(
getId: _transactionNoteGetId,
getLinks: _transactionNoteGetLinks,
attach: _transactionNoteAttach,
- version: '3.0.5',
+ version: '3.1.8',
);
int _transactionNoteEstimateSize(
diff --git a/lib/models/isar/ordinal.g.dart b/lib/models/isar/ordinal.g.dart
index 89c967cb0..5c23e11bb 100644
--- a/lib/models/isar/ordinal.g.dart
+++ b/lib/models/isar/ordinal.g.dart
@@ -7,7 +7,7 @@ part of 'ordinal.dart';
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
extension GetOrdinalCollection on Isar {
IsarCollection get ordinals => this.collection();
@@ -83,7 +83,7 @@ const OrdinalSchema = CollectionSchema(
getId: _ordinalGetId,
getLinks: _ordinalGetLinks,
attach: _ordinalAttach,
- version: '3.0.5',
+ version: '3.1.8',
);
int _ordinalEstimateSize(
diff --git a/lib/models/isar/stack_theme.g.dart b/lib/models/isar/stack_theme.g.dart
index 03c543ff0..c77d979f5 100644
--- a/lib/models/isar/stack_theme.g.dart
+++ b/lib/models/isar/stack_theme.g.dart
@@ -7,7 +7,7 @@ part of 'stack_theme.dart';
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
extension GetStackThemeCollection on Isar {
IsarCollection get stackThemes => this.collection();
@@ -860,7 +860,7 @@ const StackThemeSchema = CollectionSchema(
getId: _stackThemeGetId,
getLinks: _stackThemeGetLinks,
attach: _stackThemeAttach,
- version: '3.0.5',
+ version: '3.1.8',
);
int _stackThemeEstimateSize(
@@ -18012,7 +18012,7 @@ extension StackThemeQueryProperty
// **************************************************************************
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
const ThemeAssetsSchema = Schema(
name: r'ThemeAssets',
@@ -25833,7 +25833,7 @@ extension ThemeAssetsQueryObject
on QueryBuilder {}
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
const ThemeAssetsV2Schema = Schema(
name: r'ThemeAssetsV2',
@@ -29441,7 +29441,7 @@ extension ThemeAssetsV2QueryObject
on QueryBuilder {}
// coverage:ignore-file
-// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters
+// ignore_for_file: duplicate_ignore, non_constant_identifier_names, constant_identifier_names, invalid_use_of_protected_member, unnecessary_cast, prefer_const_constructors, lines_longer_than_80_chars, require_trailing_commas, inference_failure_on_function_invocation, unnecessary_parenthesis, unnecessary_raw_strings, unnecessary_null_checks, join_return_with_assignment, prefer_final_locals, avoid_js_rounded_ints, avoid_positional_boolean_parameters, always_specify_types
const ThemeAssetsV3Schema = Schema(
name: r'ThemeAssetsV3',
diff --git a/lib/models/keys/view_only_wallet_data.dart b/lib/models/keys/view_only_wallet_data.dart
new file mode 100644
index 000000000..92c23b082
--- /dev/null
+++ b/lib/models/keys/view_only_wallet_data.dart
@@ -0,0 +1,164 @@
+import 'dart:convert';
+
+import '../../wallets/wallet/wallet_mixin_interfaces/extended_keys_interface.dart';
+import 'key_data_interface.dart';
+
+// do not remove or change the order of these enum values
+enum ViewOnlyWalletType {
+ cryptonote,
+ addressOnly,
+ xPub;
+}
+
+sealed class ViewOnlyWalletData with KeyDataInterface {
+ @override
+ final String walletId;
+
+ ViewOnlyWalletType get type;
+
+ ViewOnlyWalletData({
+ required this.walletId,
+ });
+
+ static ViewOnlyWalletData fromJsonEncodedString(
+ String jsonEncodedString, {
+ required String walletId,
+ }) {
+ final map = jsonDecode(jsonEncodedString) as Map;
+ final json = Map.from(map);
+ final type = ViewOnlyWalletType.values[json["type"] as int];
+
+ switch (type) {
+ case ViewOnlyWalletType.cryptonote:
+ return CryptonoteViewOnlyWalletData.fromJsonEncodedString(
+ jsonEncodedString,
+ walletId: walletId,
+ );
+
+ case ViewOnlyWalletType.addressOnly:
+ return AddressViewOnlyWalletData.fromJsonEncodedString(
+ jsonEncodedString,
+ walletId: walletId,
+ );
+
+ case ViewOnlyWalletType.xPub:
+ return ExtendedKeysViewOnlyWalletData.fromJsonEncodedString(
+ jsonEncodedString,
+ walletId: walletId,
+ );
+ }
+ }
+
+ String toJsonEncodedString();
+}
+
+class CryptonoteViewOnlyWalletData extends ViewOnlyWalletData {
+ @override
+ final type = ViewOnlyWalletType.cryptonote;
+
+ final String address;
+ final String privateViewKey;
+
+ CryptonoteViewOnlyWalletData({
+ required super.walletId,
+ required this.address,
+ required this.privateViewKey,
+ });
+
+ static CryptonoteViewOnlyWalletData fromJsonEncodedString(
+ String jsonEncodedString, {
+ required String walletId,
+ }) {
+ final map = jsonDecode(jsonEncodedString) as Map;
+ final json = Map.from(map);
+
+ return CryptonoteViewOnlyWalletData(
+ walletId: walletId,
+ address: json["address"] as String,
+ privateViewKey: json["privateViewKey"] as String,
+ );
+ }
+
+ @override
+ String toJsonEncodedString() => jsonEncode({
+ "type": type.index,
+ "address": address,
+ "privateViewKey": privateViewKey,
+ });
+}
+
+class AddressViewOnlyWalletData extends ViewOnlyWalletData {
+ @override
+ final type = ViewOnlyWalletType.addressOnly;
+
+ final String address;
+
+ AddressViewOnlyWalletData({
+ required super.walletId,
+ required this.address,
+ });
+
+ static AddressViewOnlyWalletData fromJsonEncodedString(
+ String jsonEncodedString, {
+ required String walletId,
+ }) {
+ final map = jsonDecode(jsonEncodedString) as Map;
+ final json = Map.from(map);
+
+ return AddressViewOnlyWalletData(
+ walletId: walletId,
+ address: json["address"] as String,
+ );
+ }
+
+ @override
+ String toJsonEncodedString() => jsonEncode({
+ "type": type.index,
+ "address": address,
+ });
+}
+
+class ExtendedKeysViewOnlyWalletData extends ViewOnlyWalletData {
+ @override
+ final type = ViewOnlyWalletType.xPub;
+
+ final List xPubs;
+
+ ExtendedKeysViewOnlyWalletData({
+ required super.walletId,
+ required List xPubs,
+ }) : xPubs = List.unmodifiable(xPubs);
+
+ static ExtendedKeysViewOnlyWalletData fromJsonEncodedString(
+ String jsonEncodedString, {
+ required String walletId,
+ }) {
+ final map = jsonDecode(jsonEncodedString) as Map;
+ final json = Map.from(map);
+
+ return ExtendedKeysViewOnlyWalletData(
+ walletId: walletId,
+ xPubs: List>.from((json["xPubs"] as List))
+ .map(
+ (e) => XPub(
+ path: e["path"] as String,
+ encoded: e["encoded"] as String,
+ ),
+ )
+ .toList(growable: false),
+ );
+ }
+
+ @override
+ String toJsonEncodedString() => jsonEncode({
+ "type": type.index,
+ "xPubs": [
+ ...xPubs.map(
+ (e) => {
+ "path": e.path,
+ "encoded": e.encoded,
+ },
+ ),
+ ],
+ });
+}
diff --git a/lib/networking/http.dart b/lib/networking/http.dart
index a4f25c225..ae2a3b97b 100644
--- a/lib/networking/http.dart
+++ b/lib/networking/http.dart
@@ -4,6 +4,7 @@ import 'dart:io';
import 'package:flutter/foundation.dart';
import 'package:socks5_proxy/socks_client.dart';
+
import '../utilities/logger.dart';
// WIP wrapper layer
@@ -118,6 +119,10 @@ class HTTP {
onDone: () => completer.complete(
Uint8List.fromList(bytes),
),
+ onError: (Object err, StackTrace s) => Logging.instance.log(
+ "Http wrapper layer listen: $err\n$s",
+ level: LogLevel.Error,
+ ),
);
return completer.future;
}
diff --git a/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart b/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart
index deb38a648..2920bbc48 100644
--- a/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart
+++ b/lib/pages/add_wallet_views/add_wallet_view/add_wallet_view.dart
@@ -69,6 +69,7 @@ class _AddWalletViewState extends ConsumerState {
...AppConfig.coins.where((e) => e.network == CryptoCurrencyNetwork.main),
];
final List coinEntities = [];
+ final List coinTestnetEntities = [];
final List tokenEntities = [];
final bool isDesktop = Util.isDesktop;
@@ -139,7 +140,7 @@ class _AddWalletViewState extends ConsumerState {
coinEntities.addAll(_coins.map((e) => CoinEntity(e)));
if (ref.read(prefsChangeNotifierProvider).showTestNetCoins) {
- coinEntities.addAll(_coinsTestnet.map((e) => CoinEntity(e)));
+ coinTestnetEntities.addAll(_coinsTestnet.map((e) => CoinEntity(e)));
}
if (AppConfig.coins.whereType().isNotEmpty) {
@@ -286,6 +287,14 @@ class _AddWalletViewState extends ConsumerState {
initialState: ExpandableState.expanded,
animationDurationMultiplier: 0.5,
),
+ if (coinTestnetEntities.isNotEmpty)
+ ExpandingSubListItem(
+ title: "Testnet",
+ entities:
+ filter(_searchTerm, coinTestnetEntities),
+ initialState: ExpandableState.expanded,
+ animationDurationMultiplier: 0.5,
+ ),
if (tokenEntities.isNotEmpty)
ExpandingSubListItem(
title: "Tokens",
@@ -419,6 +428,13 @@ class _AddWalletViewState extends ConsumerState {
entities: filter(_searchTerm, coinEntities),
initialState: ExpandableState.expanded,
),
+ if (coinTestnetEntities.isNotEmpty)
+ ExpandingSubListItem(
+ title: "Testnet",
+ entities:
+ filter(_searchTerm, coinTestnetEntities),
+ initialState: ExpandableState.expanded,
+ ),
if (tokenEntities.isNotEmpty)
ExpandingSubListItem(
title: "Tokens",
diff --git a/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart b/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart
index 29742f251..f17ed06ff 100644
--- a/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart
+++ b/lib/pages/add_wallet_views/name_your_wallet_view/name_your_wallet_view.dart
@@ -25,6 +25,7 @@ import '../../../utilities/name_generator.dart';
import '../../../utilities/text_styles.dart';
import '../../../utilities/util.dart';
import '../../../wallets/crypto_currency/crypto_currency.dart';
+import '../../../wallets/crypto_currency/interfaces/view_only_option_currency_interface.dart';
import '../../../wallets/crypto_currency/intermediate/frost_currency.dart';
import '../../../wallets/isar/models/wallet_info.dart';
import '../../../widgets/background.dart';
@@ -104,7 +105,9 @@ class _NameYourWalletViewState extends ConsumerState {
case AddWalletType.New:
unawaited(
Navigator.of(context).pushNamed(
- coin.hasMnemonicPassphraseSupport
+ coin.possibleMnemonicLengths.length > 1 ||
+ coin.hasMnemonicPassphraseSupport ||
+ coin is ViewOnlyOptionCurrencyInterface
? NewWalletOptionsView.routeName
: NewWalletRecoveryPhraseWarningView.routeName,
arguments: Tuple2(
diff --git a/lib/pages/add_wallet_views/new_wallet_options/new_wallet_options_view.dart b/lib/pages/add_wallet_views/new_wallet_options/new_wallet_options_view.dart
index 1008fd5df..bfe41c3fe 100644
--- a/lib/pages/add_wallet_views/new_wallet_options/new_wallet_options_view.dart
+++ b/lib/pages/add_wallet_views/new_wallet_options/new_wallet_options_view.dart
@@ -12,9 +12,11 @@ import '../../../utilities/constants.dart';
import '../../../utilities/text_styles.dart';
import '../../../utilities/util.dart';
import '../../../wallets/crypto_currency/crypto_currency.dart';
+import '../../../wallets/crypto_currency/interfaces/view_only_option_currency_interface.dart';
import '../../../widgets/background.dart';
import '../../../widgets/conditional_parent.dart';
import '../../../widgets/custom_buttons/app_bar_icon_button.dart';
+import '../../../widgets/custom_buttons/checkbox_text_button.dart';
import '../../../widgets/desktop/desktop_app_bar.dart';
import '../../../widgets/desktop/desktop_scaffold.dart';
import '../../../widgets/desktop/primary_button.dart';
@@ -25,8 +27,12 @@ import '../new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_wa
import '../restore_wallet_view/restore_options_view/sub_widgets/mobile_mnemonic_length_selector.dart';
import '../restore_wallet_view/sub_widgets/mnemonic_word_count_select_sheet.dart';
-final pNewWalletOptions =
- StateProvider<({String mnemonicPassphrase, int mnemonicWordsCount})?>(
+final pNewWalletOptions = StateProvider<
+ ({
+ String mnemonicPassphrase,
+ int mnemonicWordsCount,
+ bool convertToViewOnly,
+ })?>(
(ref) => null,
);
@@ -59,6 +65,8 @@ class _NewWalletOptionsViewState extends ConsumerState {
bool hidePassword = true;
NewWalletOptions _selectedOptions = NewWalletOptions.Default;
+ bool _convertToViewOnly = false;
+
@override
void initState() {
passwordController = TextEditingController();
@@ -210,7 +218,7 @@ class _NewWalletOptionsViewState extends ConsumerState {
if (_selectedOptions == NewWalletOptions.Advanced)
Column(
children: [
- if (Util.isDesktop)
+ if (Util.isDesktop && lengths.length > 1)
DropdownButtonHideUnderline(
child: DropdownButton2(
value: ref
@@ -265,7 +273,7 @@ class _NewWalletOptionsViewState extends ConsumerState {
),
),
),
- if (!Util.isDesktop)
+ if (!Util.isDesktop && lengths.length > 1)
MobileMnemonicLengthSelector(
chooseMnemonicLength: () {
showModalBottomSheet(
@@ -284,91 +292,109 @@ class _NewWalletOptionsViewState extends ConsumerState {
);
},
),
- const SizedBox(
- height: 24,
- ),
- RoundedWhiteContainer(
- child: Center(
- child: Text(
- "You may add a BIP39 passphrase. This is optional. "
- "You will need BOTH your seed and your passphrase to recover the wallet.",
- style: Util.isDesktop
- ? STextStyles.desktopTextExtraSmall(context)
- .copyWith(
- color: Theme.of(context)
- .extension()!
- .textSubtitle1,
- )
- : STextStyles.itemSubtitle(context),
+ if (widget.coin.hasMnemonicPassphraseSupport)
+ const SizedBox(
+ height: 24,
+ ),
+ if (widget.coin.hasMnemonicPassphraseSupport)
+ RoundedWhiteContainer(
+ child: Center(
+ child: Text(
+ "You may add a BIP39 passphrase. This is optional. "
+ "You will need BOTH your seed and your passphrase to recover the wallet.",
+ style: Util.isDesktop
+ ? STextStyles.desktopTextExtraSmall(context)
+ .copyWith(
+ color: Theme.of(context)
+ .extension()!
+ .textSubtitle1,
+ )
+ : STextStyles.itemSubtitle(context),
+ ),
),
),
- ),
- const SizedBox(
- height: 8,
- ),
- ClipRRect(
- borderRadius: BorderRadius.circular(
- Constants.size.circularBorderRadius,
+ if (widget.coin.hasMnemonicPassphraseSupport)
+ const SizedBox(
+ height: 8,
),
- child: TextField(
- key: const Key("mnemonicPassphraseFieldKey1"),
- focusNode: passwordFocusNode,
- controller: passwordController,
- style: Util.isDesktop
- ? STextStyles.desktopTextMedium(context).copyWith(
- height: 2,
- )
- : STextStyles.field(context),
- obscureText: hidePassword,
- enableSuggestions: false,
- autocorrect: false,
- decoration: standardInputDecoration(
- "BIP39 passphrase",
- passwordFocusNode,
- context,
- ).copyWith(
- suffixIcon: UnconstrainedBox(
- child: ConditionalParent(
- condition: Util.isDesktop,
- builder: (child) => SizedBox(
- height: 70,
- child: child,
- ),
- child: Row(
- children: [
- SizedBox(
- width: Util.isDesktop ? 24 : 16,
- ),
- GestureDetector(
- key: const Key(
- "mnemonicPassphraseFieldShowPasswordButtonKey",
- ),
- onTap: () async {
- setState(() {
- hidePassword = !hidePassword;
- });
- },
- child: SvgPicture.asset(
- hidePassword
- ? Assets.svg.eye
- : Assets.svg.eyeSlash,
- color: Theme.of(context)
- .extension()!
- .textDark3,
+ if (widget.coin.hasMnemonicPassphraseSupport)
+ ClipRRect(
+ borderRadius: BorderRadius.circular(
+ Constants.size.circularBorderRadius,
+ ),
+ child: TextField(
+ key: const Key("mnemonicPassphraseFieldKey1"),
+ focusNode: passwordFocusNode,
+ controller: passwordController,
+ style: Util.isDesktop
+ ? STextStyles.desktopTextMedium(context).copyWith(
+ height: 2,
+ )
+ : STextStyles.field(context),
+ obscureText: hidePassword,
+ enableSuggestions: false,
+ autocorrect: false,
+ decoration: standardInputDecoration(
+ "BIP39 passphrase",
+ passwordFocusNode,
+ context,
+ ).copyWith(
+ suffixIcon: UnconstrainedBox(
+ child: ConditionalParent(
+ condition: Util.isDesktop,
+ builder: (child) => SizedBox(
+ height: 70,
+ child: child,
+ ),
+ child: Row(
+ children: [
+ SizedBox(
width: Util.isDesktop ? 24 : 16,
- height: Util.isDesktop ? 24 : 16,
),
- ),
- const SizedBox(
- width: 12,
- ),
- ],
+ GestureDetector(
+ key: const Key(
+ "mnemonicPassphraseFieldShowPasswordButtonKey",
+ ),
+ onTap: () async {
+ setState(() {
+ hidePassword = !hidePassword;
+ });
+ },
+ child: SvgPicture.asset(
+ hidePassword
+ ? Assets.svg.eye
+ : Assets.svg.eyeSlash,
+ color: Theme.of(context)
+ .extension()!
+ .textDark3,
+ width: Util.isDesktop ? 24 : 16,
+ height: Util.isDesktop ? 24 : 16,
+ ),
+ ),
+ const SizedBox(
+ width: 12,
+ ),
+ ],
+ ),
),
),
),
),
),
- ),
+ if (widget.coin is ViewOnlyOptionCurrencyInterface)
+ const SizedBox(
+ height: 24,
+ ),
+ if (widget.coin is ViewOnlyOptionCurrencyInterface)
+ CheckboxTextButton(
+ label: "Convert to view only wallet. "
+ "You will only be shown the seed phrase once. "
+ "Save it somewhere. "
+ "If you lose it you will lose access to any funds in this wallet.",
+ onChanged: (value) {
+ _convertToViewOnly = value;
+ },
+ ),
],
),
if (!Util.isDesktop) const Spacer(),
@@ -383,6 +409,7 @@ class _NewWalletOptionsViewState extends ConsumerState {
mnemonicWordsCount:
ref.read(mnemonicWordCountStateProvider.state).state,
mnemonicPassphrase: passwordController.text,
+ convertToViewOnly: _convertToViewOnly,
);
} else {
ref.read(pNewWalletOptions.notifier).state = null;
diff --git a/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart b/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart
index 42836e117..73acccb9d 100644
--- a/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart
+++ b/lib/pages/add_wallet_views/new_wallet_recovery_phrase_warning_view/new_wallet_recovery_phrase_warning_view.dart
@@ -560,6 +560,8 @@ class _NewWalletRecoveryPhraseWarningViewState
wordCount = info
.coin.defaultSeedPhraseLength;
+ // TODO: Refactor these to generate each coin in their respective classes
+ // This code should not be in a random view page file
if (coin is Monero ||
coin is Wownero) {
// currently a special case due to the
@@ -580,7 +582,12 @@ class _NewWalletRecoveryPhraseWarningViewState
)
.state!
.mnemonicPassphrase;
- } else {}
+ } else {
+ // this may not be epiccash specific?
+ if (coin is Epiccash) {
+ mnemonicPassphrase = "";
+ }
+ }
wordCount = ref
.read(
diff --git a/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart b/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart
index 0b7fcc37b..384cacb0c 100644
--- a/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart
+++ b/lib/pages/add_wallet_views/restore_wallet_view/restore_options_view/restore_options_view.dart
@@ -23,6 +23,8 @@ import '../../../../utilities/format.dart';
import '../../../../utilities/text_styles.dart';
import '../../../../utilities/util.dart';
import '../../../../wallets/crypto_currency/crypto_currency.dart';
+import '../../../../wallets/crypto_currency/interfaces/view_only_option_currency_interface.dart';
+import '../../../../wallets/crypto_currency/intermediate/cryptonote_currency.dart';
import '../../../../widgets/conditional_parent.dart';
import '../../../../widgets/custom_buttons/app_bar_icon_button.dart';
import '../../../../widgets/custom_buttons/checkbox_text_button.dart';
@@ -32,7 +34,9 @@ import '../../../../widgets/desktop/desktop_scaffold.dart';
import '../../../../widgets/expandable.dart';
import '../../../../widgets/rounded_white_container.dart';
import '../../../../widgets/stack_text_field.dart';
+import '../../../../widgets/toggle.dart';
import '../../create_or_restore_wallet_view/sub_widgets/coin_image.dart';
+import '../restore_view_only_wallet_view.dart';
import '../restore_wallet_view.dart';
import '../sub_widgets/mnemonic_word_count_select_sheet.dart';
import 'sub_widgets/mobile_mnemonic_length_selector.dart';
@@ -67,9 +71,8 @@ class _RestoreOptionsViewState extends ConsumerState {
late final TextEditingController passwordController;
final bool _nextEnabled = true;
- DateTime _restoreFromDate = DateTime.fromMillisecondsSinceEpoch(0);
+ DateTime? _restoreFromDate;
bool hidePassword = true;
- bool _expandedAdavnced = false;
bool get supportsMnemonicPassphrase => coin.hasMnemonicPassphraseSupport;
@@ -99,27 +102,46 @@ class _RestoreOptionsViewState extends ConsumerState {
super.dispose();
}
+ bool _nextLock = false;
Future nextPressed() async {
- if (!isDesktop) {
- // hide keyboard if has focus
- if (FocusScope.of(context).hasFocus) {
- FocusScope.of(context).unfocus();
- await Future.delayed(const Duration(milliseconds: 75));
+ if (_nextLock) return;
+ _nextLock = true;
+ try {
+ if (!isDesktop) {
+ // hide keyboard if has focus
+ if (FocusScope.of(context).hasFocus) {
+ FocusScope.of(context).unfocus();
+ await Future.delayed(const Duration(milliseconds: 75));
+ }
}
- }
- if (mounted) {
- await Navigator.of(context).pushNamed(
- RestoreWalletView.routeName,
- arguments: Tuple6(
- walletName,
- coin,
- ref.read(mnemonicWordCountStateProvider.state).state,
- _restoreFromDate,
- passwordController.text,
- enableLelantusScanning,
- ),
- );
+ if (mounted) {
+ if (!_showViewOnlyOption) {
+ await Navigator.of(context).pushNamed(
+ RestoreWalletView.routeName,
+ arguments: Tuple6(
+ walletName,
+ coin,
+ ref.read(mnemonicWordCountStateProvider.state).state,
+ _restoreFromDate,
+ passwordController.text,
+ enableLelantusScanning,
+ ),
+ );
+ } else {
+ await Navigator.of(context).pushNamed(
+ RestoreViewOnlyWalletView.routeName,
+ arguments: (
+ walletName: walletName,
+ coin: coin,
+ restoreFromDate: _restoreFromDate,
+ enableLelantusScanning: enableLelantusScanning,
+ ),
+ );
+ }
+ }
+ } finally {
+ _nextLock = false;
}
}
@@ -164,17 +186,12 @@ class _RestoreOptionsViewState extends ConsumerState {
);
}
+ bool _showViewOnlyOption = false;
+
@override
Widget build(BuildContext context) {
debugPrint("BUILD: $runtimeType with ${coin.identifier} $walletName");
- final lengths = coin.possibleMnemonicLengths;
-
- final isMoneroAnd25 = coin is Monero &&
- ref.watch(mnemonicWordCountStateProvider.state).state == 25;
- final isWowneroAnd25 = coin is Wownero &&
- ref.watch(mnemonicWordCountStateProvider.state).state == 25;
-
return MasterScaffold(
isDesktop: isDesktop,
appBar: isDesktop
@@ -227,288 +244,57 @@ class _RestoreOptionsViewState extends ConsumerState {
SizedBox(
height: isDesktop ? 40 : 24,
),
- if (isMoneroAnd25 || coin is Epiccash || isWowneroAnd25)
- Text(
- "Choose start date",
- style: isDesktop
- ? STextStyles.desktopTextExtraSmall(context).copyWith(
- color: Theme.of(context)
- .extension()!
- .textDark3,
- )
- : STextStyles.smallMed12(context),
- textAlign: TextAlign.left,
- ),
- if (isMoneroAnd25 || coin is Epiccash || isWowneroAnd25)
+ if (coin is ViewOnlyOptionCurrencyInterface)
SizedBox(
- height: isDesktop ? 16 : 8,
- ),
- if (isMoneroAnd25 || coin is Epiccash || isWowneroAnd25)
- if (!isDesktop)
- RestoreFromDatePicker(
- onTap: chooseDate,
- controller: _dateController,
- ),
- if (isMoneroAnd25 || coin is Epiccash || isWowneroAnd25)
- if (isDesktop)
- // TODO desktop date picker
- RestoreFromDatePicker(
- onTap: chooseDesktopDate,
- controller: _dateController,
- ),
- if (isMoneroAnd25 || coin is Epiccash || isWowneroAnd25)
- const SizedBox(
- height: 8,
- ),
- if (isMoneroAnd25 || coin is Epiccash || isWowneroAnd25)
- RoundedWhiteContainer(
- child: Center(
- child: Text(
- "Choose the date you made the wallet (approximate is fine)",
- style: isDesktop
- ? STextStyles.desktopTextExtraSmall(context).copyWith(
- color: Theme.of(context)
- .extension()!
- .textSubtitle1,
- )
- : STextStyles.smallMed12(context).copyWith(
- fontSize: 10,
- ),
- ),
- ),
- ),
- if (isMoneroAnd25 || coin is Epiccash || isWowneroAnd25)
- SizedBox(
- height: isDesktop ? 24 : 16,
- ),
- Text(
- "Choose recovery phrase length",
- style: isDesktop
- ? STextStyles.desktopTextExtraSmall(context).copyWith(
- color: Theme.of(context)
- .extension()!
- .textDark3,
- )
- : STextStyles.smallMed12(context),
- textAlign: TextAlign.left,
- ),
- SizedBox(
- height: isDesktop ? 16 : 8,
- ),
- if (isDesktop)
- DropdownButtonHideUnderline(
- child: DropdownButton2(
- value:
- ref.watch(mnemonicWordCountStateProvider.state).state,
- items: [
- ...lengths.map(
- (e) => DropdownMenuItem(
- value: e,
- child: Text(
- "$e words",
- style: STextStyles.desktopTextMedium(context),
- ),
- ),
- ),
- ],
- onChanged: (value) {
- if (value is int) {
- ref.read(mnemonicWordCountStateProvider.state).state =
- value;
- }
+ height: isDesktop ? 56 : 48,
+ width: isDesktop ? 490 : null,
+ child: Toggle(
+ key: UniqueKey(),
+ onText: "Seed",
+ offText: "View Only",
+ onColor:
+ Theme.of(context).extension()!.popupBG,
+ offColor: Theme.of(context)
+ .extension()!
+ .textFieldDefaultBG,
+ isOn: _showViewOnlyOption,
+ onValueChanged: (value) {
+ setState(() {
+ _showViewOnlyOption = value;
+ });
},
- isExpanded: true,
- iconStyleData: IconStyleData(
- icon: SvgPicture.asset(
- Assets.svg.chevronDown,
- width: 12,
- height: 6,
- color: Theme.of(context)
- .extension()!
- .textFieldActiveSearchIconRight,
- ),
- ),
- dropdownStyleData: DropdownStyleData(
- offset: const Offset(0, -10),
- elevation: 0,
- decoration: BoxDecoration(
- color: Theme.of(context)
- .extension()!
- .textFieldDefaultBG,
- borderRadius: BorderRadius.circular(
- Constants.size.circularBorderRadius,
- ),
- ),
- ),
- menuItemStyleData: const MenuItemStyleData(
- padding: EdgeInsets.symmetric(
- horizontal: 16,
- vertical: 8,
+ decoration: BoxDecoration(
+ color: Colors.transparent,
+ borderRadius: BorderRadius.circular(
+ Constants.size.circularBorderRadius,
),
),
),
),
- if (!isDesktop)
- MobileMnemonicLengthSelector(
- chooseMnemonicLength: chooseMnemonicLength,
- ),
- if (supportsMnemonicPassphrase)
+ if (coin is ViewOnlyOptionCurrencyInterface)
SizedBox(
- height: isDesktop ? 24 : 16,
+ height: isDesktop ? 40 : 24,
),
- if (supportsMnemonicPassphrase)
- Expandable(
- onExpandChanged: (state) {
- setState(() {
- _expandedAdavnced = state == ExpandableState.expanded;
- });
- },
- header: Container(
- color: Colors.transparent,
- child: Padding(
- padding: const EdgeInsets.only(
- top: 8.0,
- bottom: 8.0,
- right: 10,
- ),
- child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- Text(
- "Advanced",
- style: isDesktop
- ? STextStyles.desktopTextExtraExtraSmall(
- context,
- ).copyWith(
- color: Theme.of(context)
- .extension()!
- .textDark3,
- )
- : STextStyles.smallMed12(context),
- textAlign: TextAlign.left,
- ),
- SvgPicture.asset(
- _expandedAdavnced
- ? Assets.svg.chevronUp
- : Assets.svg.chevronDown,
- width: 12,
- height: 6,
- color: Theme.of(context)
- .extension()!
- .textFieldActiveSearchIconRight,
- ),
- ],
- ),
+ _showViewOnlyOption
+ ? ViewOnlyRestoreOption(
+ coin: coin,
+ dateController: _dateController,
+ dateChooserFunction:
+ isDesktop ? chooseDesktopDate : chooseDate,
+ )
+ : SeedRestoreOption(
+ coin: coin,
+ dateController: _dateController,
+ pwController: passwordController,
+ pwFocusNode: passwordFocusNode,
+ supportsMnemonicPassphrase: supportsMnemonicPassphrase,
+ dateChooserFunction:
+ isDesktop ? chooseDesktopDate : chooseDate,
+ chooseMnemonicLength: chooseMnemonicLength,
+ lelScanChanged: (value) {
+ enableLelantusScanning = value;
+ },
),
- ),
- body: Container(
- color: Colors.transparent,
- child: Column(
- children: [
- if (coin is Firo)
- CheckboxTextButton(
- label: "Scan for Lelantus transactions",
- onChanged: (newValue) {
- setState(() {
- enableLelantusScanning = newValue ?? true;
- });
- },
- ),
- if (coin is Firo)
- const SizedBox(
- height: 8,
- ),
- ClipRRect(
- borderRadius: BorderRadius.circular(
- Constants.size.circularBorderRadius,
- ),
- child: TextField(
- key: const Key("mnemonicPassphraseFieldKey1"),
- focusNode: passwordFocusNode,
- controller: passwordController,
- style: isDesktop
- ? STextStyles.desktopTextMedium(context)
- .copyWith(
- height: 2,
- )
- : STextStyles.field(context),
- obscureText: hidePassword,
- enableSuggestions: false,
- autocorrect: false,
- decoration: standardInputDecoration(
- "BIP39 passphrase",
- passwordFocusNode,
- context,
- ).copyWith(
- suffixIcon: UnconstrainedBox(
- child: ConditionalParent(
- condition: isDesktop,
- builder: (child) => SizedBox(
- height: 70,
- child: child,
- ),
- child: Row(
- children: [
- SizedBox(
- width: isDesktop ? 24 : 16,
- ),
- GestureDetector(
- key: const Key(
- "mnemonicPassphraseFieldShowPasswordButtonKey",
- ),
- onTap: () async {
- setState(() {
- hidePassword = !hidePassword;
- });
- },
- child: SvgPicture.asset(
- hidePassword
- ? Assets.svg.eye
- : Assets.svg.eyeSlash,
- color: Theme.of(context)
- .extension()!
- .textDark3,
- width: isDesktop ? 24 : 16,
- height: isDesktop ? 24 : 16,
- ),
- ),
- const SizedBox(
- width: 12,
- ),
- ],
- ),
- ),
- ),
- ),
- ),
- ),
- const SizedBox(
- height: 8,
- ),
- RoundedWhiteContainer(
- child: Center(
- child: Text(
- "If the recovery phrase you are about to restore "
- "was created with an optional BIP39 passphrase "
- "you can enter it here.",
- style: isDesktop
- ? STextStyles.desktopTextExtraSmall(context)
- .copyWith(
- color: Theme.of(context)
- .extension()!
- .textSubtitle1,
- )
- : STextStyles.itemSubtitle(context),
- ),
- ),
- ),
- const SizedBox(
- height: 16,
- ),
- ],
- ),
- ),
- ),
if (!isDesktop)
const Spacer(
flex: 3,
@@ -532,3 +318,394 @@ class _RestoreOptionsViewState extends ConsumerState {
);
}
}
+
+class SeedRestoreOption extends ConsumerStatefulWidget {
+ const SeedRestoreOption({
+ super.key,
+ required this.coin,
+ required this.dateController,
+ required this.pwController,
+ required this.pwFocusNode,
+ required this.supportsMnemonicPassphrase,
+ required this.dateChooserFunction,
+ required this.chooseMnemonicLength,
+ required this.lelScanChanged,
+ });
+
+ final CryptoCurrency coin;
+ final TextEditingController dateController;
+ final TextEditingController pwController;
+ final FocusNode pwFocusNode;
+ final bool supportsMnemonicPassphrase;
+
+ final Future Function() dateChooserFunction;
+ final Future Function() chooseMnemonicLength;
+ final void Function(bool) lelScanChanged;
+
+ @override
+ ConsumerState createState() => _SeedRestoreOptionState();
+}
+
+class _SeedRestoreOptionState extends ConsumerState {
+ bool _hidePassword = true;
+ bool _expandedAdvanced = false;
+ bool _enableLelantusScanning = false;
+
+ @override
+ Widget build(BuildContext context) {
+ final lengths = widget.coin.possibleMnemonicLengths;
+
+ final isMoneroAnd25 = widget.coin is Monero &&
+ ref.watch(mnemonicWordCountStateProvider.state).state == 25;
+ final isWowneroAnd25 = widget.coin is Wownero &&
+ ref.watch(mnemonicWordCountStateProvider.state).state == 25;
+
+ return Column(
+ children: [
+ if (isMoneroAnd25 || widget.coin is Epiccash || isWowneroAnd25)
+ Text(
+ "Choose start date",
+ style: Util.isDesktop
+ ? STextStyles.desktopTextExtraSmall(context).copyWith(
+ color:
+ Theme.of(context).extension()!.textDark3,
+ )
+ : STextStyles.smallMed12(context),
+ textAlign: TextAlign.left,
+ ),
+ if (isMoneroAnd25 || widget.coin is Epiccash || isWowneroAnd25)
+ SizedBox(
+ height: Util.isDesktop ? 16 : 8,
+ ),
+ if (isMoneroAnd25 || widget.coin is Epiccash || isWowneroAnd25)
+ RestoreFromDatePicker(
+ onTap: widget.dateChooserFunction,
+ controller: widget.dateController,
+ ),
+ if (isMoneroAnd25 || widget.coin is Epiccash || isWowneroAnd25)
+ const SizedBox(
+ height: 8,
+ ),
+ if (isMoneroAnd25 || widget.coin is Epiccash || isWowneroAnd25)
+ RoundedWhiteContainer(
+ child: Center(
+ child: Text(
+ "Choose the date you made the wallet (approximate is fine)",
+ style: Util.isDesktop
+ ? STextStyles.desktopTextExtraSmall(context).copyWith(
+ color: Theme.of(context)
+ .extension()!
+ .textSubtitle1,
+ )
+ : STextStyles.smallMed12(context).copyWith(
+ fontSize: 10,
+ ),
+ ),
+ ),
+ ),
+ if (isMoneroAnd25 || widget.coin is Epiccash || isWowneroAnd25)
+ SizedBox(
+ height: Util.isDesktop ? 24 : 16,
+ ),
+ Text(
+ "Choose recovery phrase length",
+ style: Util.isDesktop
+ ? STextStyles.desktopTextExtraSmall(context).copyWith(
+ color: Theme.of(context).extension()!.textDark3,
+ )
+ : STextStyles.smallMed12(context),
+ textAlign: TextAlign.left,
+ ),
+ SizedBox(
+ height: Util.isDesktop ? 16 : 8,
+ ),
+ if (Util.isDesktop)
+ DropdownButtonHideUnderline(
+ child: DropdownButton2(
+ value: ref.watch(mnemonicWordCountStateProvider.state).state,
+ items: [
+ ...lengths.map(
+ (e) => DropdownMenuItem(
+ value: e,
+ child: Text(
+ "$e words",
+ style: STextStyles.desktopTextMedium(context),
+ ),
+ ),
+ ),
+ ],
+ onChanged: (value) {
+ if (value is int) {
+ ref.read(mnemonicWordCountStateProvider.state).state = value;
+ }
+ },
+ isExpanded: true,
+ iconStyleData: IconStyleData(
+ icon: SvgPicture.asset(
+ Assets.svg.chevronDown,
+ width: 12,
+ height: 6,
+ color: Theme.of(context)
+ .extension()!
+ .textFieldActiveSearchIconRight,
+ ),
+ ),
+ dropdownStyleData: DropdownStyleData(
+ offset: const Offset(0, -10),
+ elevation: 0,
+ decoration: BoxDecoration(
+ color: Theme.of(context)
+ .extension()!
+ .textFieldDefaultBG,
+ borderRadius: BorderRadius.circular(
+ Constants.size.circularBorderRadius,
+ ),
+ ),
+ ),
+ menuItemStyleData: const MenuItemStyleData(
+ padding: EdgeInsets.symmetric(
+ horizontal: 16,
+ vertical: 8,
+ ),
+ ),
+ ),
+ ),
+ if (!Util.isDesktop)
+ MobileMnemonicLengthSelector(
+ chooseMnemonicLength: widget.chooseMnemonicLength,
+ ),
+ if (widget.supportsMnemonicPassphrase)
+ SizedBox(
+ height: Util.isDesktop ? 24 : 16,
+ ),
+ if (widget.supportsMnemonicPassphrase)
+ Expandable(
+ onExpandChanged: (state) {
+ setState(() {
+ _expandedAdvanced = state == ExpandableState.expanded;
+ });
+ },
+ header: Container(
+ color: Colors.transparent,
+ child: Padding(
+ padding: const EdgeInsets.only(
+ top: 8.0,
+ bottom: 8.0,
+ right: 10,
+ ),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ Text(
+ "Advanced",
+ style: Util.isDesktop
+ ? STextStyles.desktopTextExtraExtraSmall(
+ context,
+ ).copyWith(
+ color: Theme.of(context)
+ .extension()!
+ .textDark3,
+ )
+ : STextStyles.smallMed12(context),
+ textAlign: TextAlign.left,
+ ),
+ SvgPicture.asset(
+ _expandedAdvanced
+ ? Assets.svg.chevronUp
+ : Assets.svg.chevronDown,
+ width: 12,
+ height: 6,
+ color: Theme.of(context)
+ .extension()!
+ .textFieldActiveSearchIconRight,
+ ),
+ ],
+ ),
+ ),
+ ),
+ body: Container(
+ color: Colors.transparent,
+ child: Column(
+ children: [
+ if (widget.coin is Firo)
+ CheckboxTextButton(
+ label: "Scan for Lelantus transactions",
+ onChanged: (newValue) {
+ setState(() {
+ _enableLelantusScanning = newValue ?? true;
+ });
+
+ widget.lelScanChanged(_enableLelantusScanning);
+ },
+ ),
+ if (widget.coin is Firo)
+ const SizedBox(
+ height: 8,
+ ),
+ ClipRRect(
+ borderRadius: BorderRadius.circular(
+ Constants.size.circularBorderRadius,
+ ),
+ child: TextField(
+ key: const Key("mnemonicPassphraseFieldKey1"),
+ focusNode: widget.pwFocusNode,
+ controller: widget.pwController,
+ style: Util.isDesktop
+ ? STextStyles.desktopTextMedium(context).copyWith(
+ height: 2,
+ )
+ : STextStyles.field(context),
+ obscureText: _hidePassword,
+ enableSuggestions: false,
+ autocorrect: false,
+ decoration: standardInputDecoration(
+ "BIP39 passphrase",
+ widget.pwFocusNode,
+ context,
+ ).copyWith(
+ suffixIcon: UnconstrainedBox(
+ child: ConditionalParent(
+ condition: Util.isDesktop,
+ builder: (child) => SizedBox(
+ height: 70,
+ child: child,
+ ),
+ child: Row(
+ children: [
+ SizedBox(
+ width: Util.isDesktop ? 24 : 16,
+ ),
+ GestureDetector(
+ key: const Key(
+ "mnemonicPassphraseFieldShowPasswordButtonKey",
+ ),
+ onTap: () async {
+ setState(() {
+ _hidePassword = !_hidePassword;
+ });
+ },
+ child: SvgPicture.asset(
+ _hidePassword
+ ? Assets.svg.eye
+ : Assets.svg.eyeSlash,
+ color: Theme.of(context)
+ .extension()!
+ .textDark3,
+ width: Util.isDesktop ? 24 : 16,
+ height: Util.isDesktop ? 24 : 16,
+ ),
+ ),
+ const SizedBox(
+ width: 12,
+ ),
+ ],
+ ),
+ ),
+ ),
+ ),
+ ),
+ ),
+ const SizedBox(
+ height: 8,
+ ),
+ RoundedWhiteContainer(
+ child: Center(
+ child: Text(
+ "If the recovery phrase you are about to restore "
+ "was created with an optional BIP39 passphrase "
+ "you can enter it here.",
+ style: Util.isDesktop
+ ? STextStyles.desktopTextExtraSmall(context)
+ .copyWith(
+ color: Theme.of(context)
+ .extension()!
+ .textSubtitle1,
+ )
+ : STextStyles.itemSubtitle(context),
+ ),
+ ),
+ ),
+ const SizedBox(
+ height: 16,
+ ),
+ ],
+ ),
+ ),
+ ),
+ ],
+ );
+ }
+}
+
+class ViewOnlyRestoreOption extends StatefulWidget {
+ const ViewOnlyRestoreOption({
+ super.key,
+ required this.coin,
+ required this.dateController,
+ required this.dateChooserFunction,
+ });
+
+ final CryptoCurrency coin;
+ final TextEditingController dateController;
+
+ final Future Function() dateChooserFunction;
+
+ @override
+ State createState() => _ViewOnlyRestoreOptionState();
+}
+
+class _ViewOnlyRestoreOptionState extends State {
+ @override
+ Widget build(BuildContext context) {
+ final showDateOption = widget.coin is CryptonoteCurrency;
+ return Column(
+ children: [
+ if (showDateOption)
+ Text(
+ "Choose start date",
+ style: Util.isDesktop
+ ? STextStyles.desktopTextExtraSmall(context).copyWith(
+ color:
+ Theme.of(context).extension()!.textDark3,
+ )
+ : STextStyles.smallMed12(context),
+ textAlign: TextAlign.left,
+ ),
+ if (showDateOption)
+ SizedBox(
+ height: Util.isDesktop ? 16 : 8,
+ ),
+ if (showDateOption)
+ RestoreFromDatePicker(
+ onTap: widget.dateChooserFunction,
+ controller: widget.dateController,
+ ),
+ if (showDateOption)
+ const SizedBox(
+ height: 8,
+ ),
+ if (showDateOption)
+ RoundedWhiteContainer(
+ child: Center(
+ child: Text(
+ "Choose the date you made the wallet (approximate is fine)",
+ style: Util.isDesktop
+ ? STextStyles.desktopTextExtraSmall(context).copyWith(
+ color: Theme.of(context)
+ .extension()!
+ .textSubtitle1,
+ )
+ : STextStyles.smallMed12(context).copyWith(
+ fontSize: 10,
+ ),
+ ),
+ ),
+ ),
+ if (showDateOption)
+ SizedBox(
+ height: Util.isDesktop ? 24 : 16,
+ ),
+ ],
+ );
+ }
+}
diff --git a/lib/pages/add_wallet_views/restore_wallet_view/restore_view_only_wallet_view.dart b/lib/pages/add_wallet_views/restore_wallet_view/restore_view_only_wallet_view.dart
new file mode 100644
index 000000000..3a7131762
--- /dev/null
+++ b/lib/pages/add_wallet_views/restore_wallet_view/restore_view_only_wallet_view.dart
@@ -0,0 +1,592 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:cs_monero/src/deprecated/get_height_by_date.dart'
+ as cs_monero_deprecated;
+import 'package:dropdown_button2/dropdown_button2.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
+
+import '../../../models/keys/view_only_wallet_data.dart';
+import '../../../pages_desktop_specific/desktop_home_view.dart';
+import '../../../pages_desktop_specific/my_stack_view/exit_to_my_stack_button.dart';
+import '../../../providers/db/main_db_provider.dart';
+import '../../../providers/global/secure_store_provider.dart';
+import '../../../providers/providers.dart';
+import '../../../themes/stack_colors.dart';
+import '../../../utilities/assets.dart';
+import '../../../utilities/barcode_scanner_interface.dart';
+import '../../../utilities/clipboard_interface.dart';
+import '../../../utilities/constants.dart';
+import '../../../utilities/text_styles.dart';
+import '../../../utilities/util.dart';
+import '../../../wallets/crypto_currency/crypto_currency.dart';
+import '../../../wallets/crypto_currency/interfaces/electrumx_currency_interface.dart';
+import '../../../wallets/crypto_currency/intermediate/bip39_hd_currency.dart';
+import '../../../wallets/crypto_currency/intermediate/cryptonote_currency.dart';
+import '../../../wallets/isar/models/wallet_info.dart';
+import '../../../wallets/wallet/impl/epiccash_wallet.dart';
+import '../../../wallets/wallet/impl/monero_wallet.dart';
+import '../../../wallets/wallet/impl/wownero_wallet.dart';
+import '../../../wallets/wallet/wallet.dart';
+import '../../../wallets/wallet/wallet_mixin_interfaces/extended_keys_interface.dart';
+import '../../../widgets/custom_buttons/app_bar_icon_button.dart';
+import '../../../widgets/desktop/desktop_app_bar.dart';
+import '../../../widgets/desktop/desktop_scaffold.dart';
+import '../../../widgets/desktop/primary_button.dart';
+import '../../../widgets/stack_text_field.dart';
+import '../../../widgets/toggle.dart';
+import '../../home_view/home_view.dart';
+import 'confirm_recovery_dialog.dart';
+import 'sub_widgets/restore_failed_dialog.dart';
+import 'sub_widgets/restore_succeeded_dialog.dart';
+import 'sub_widgets/restoring_dialog.dart';
+
+class RestoreViewOnlyWalletView extends ConsumerStatefulWidget {
+ const RestoreViewOnlyWalletView({
+ super.key,
+ required this.walletName,
+ required this.coin,
+ required this.restoreFromDate,
+ this.enableLelantusScanning = false,
+ this.barcodeScanner = const BarcodeScannerWrapper(),
+ this.clipboard = const ClipboardWrapper(),
+ });
+
+ static const routeName = "/restoreViewOnlyWallet";
+
+ final String walletName;
+ final CryptoCurrency coin;
+ final DateTime? restoreFromDate;
+ final bool enableLelantusScanning;
+ final BarcodeScannerInterface barcodeScanner;
+ final ClipboardInterface clipboard;
+
+ @override
+ ConsumerState createState() =>
+ _RestoreViewOnlyWalletViewState();
+}
+
+class _RestoreViewOnlyWalletViewState
+ extends ConsumerState {
+ late final TextEditingController addressController;
+ late final TextEditingController viewKeyController;
+
+ late String _currentDropDownValue;
+
+ bool _enableRestoreButton = false;
+ bool _addressOnly = false;
+
+ bool _buttonLock = false;
+
+ Future _requestRestore() async {
+ if (_buttonLock) return;
+ _buttonLock = true;
+
+ try {
+ if (!Util.isDesktop) {
+ // wait for keyboard to disappear
+ FocusScope.of(context).unfocus();
+ await Future.delayed(
+ const Duration(milliseconds: 100),
+ );
+ }
+
+ if (mounted) {
+ await showDialog(
+ context: context,
+ useSafeArea: false,
+ barrierDismissible: true,
+ builder: (context) {
+ return ConfirmRecoveryDialog(
+ onConfirm: _attemptRestore,
+ );
+ },
+ );
+ }
+ } finally {
+ _buttonLock = false;
+ }
+ }
+
+ Future _attemptRestore() async {
+ int height = 0;
+ final Map otherDataJson = {
+ WalletInfoKeys.isViewOnlyKey: true,
+ };
+
+ final ViewOnlyWalletType viewOnlyWalletType;
+ if (widget.coin is Bip39HDCurrency) {
+ if (widget.coin is Firo) {
+ otherDataJson.addAll(
+ {
+ WalletInfoKeys.lelantusCoinIsarRescanRequired: false,
+ WalletInfoKeys.enableLelantusScanning:
+ widget.enableLelantusScanning,
+ },
+ );
+ }
+ viewOnlyWalletType = _addressOnly
+ ? ViewOnlyWalletType.addressOnly
+ : ViewOnlyWalletType.xPub;
+ } else if (widget.coin is CryptonoteCurrency) {
+ if (widget.restoreFromDate != null) {
+ if (widget.coin is Monero) {
+ height = cs_monero_deprecated.getMoneroHeightByDate(
+ date: widget.restoreFromDate!,
+ );
+ }
+ if (widget.coin is Wownero) {
+ height = cs_monero_deprecated.getWowneroHeightByDate(
+ date: widget.restoreFromDate!,
+ );
+ }
+ if (height < 0) height = 0;
+ }
+
+ viewOnlyWalletType = ViewOnlyWalletType.cryptonote;
+ } else {
+ throw Exception(
+ "Unsupported view only wallet currency type found: ${widget.coin.runtimeType}",
+ );
+ }
+ otherDataJson[WalletInfoKeys.viewOnlyTypeIndexKey] =
+ viewOnlyWalletType.index;
+
+ if (!Platform.isLinux && !Util.isDesktop) await WakelockPlus.enable();
+
+ try {
+ final info = WalletInfo.createNew(
+ coin: widget.coin,
+ name: widget.walletName,
+ restoreHeight: height,
+ otherDataJsonString: jsonEncode(otherDataJson),
+ );
+
+ bool isRestoring = true;
+ // show restoring in progress
+
+ if (mounted) {
+ unawaited(
+ showDialog(
+ context: context,
+ useSafeArea: false,
+ barrierDismissible: false,
+ builder: (context) {
+ return RestoringDialog(
+ onCancel: () async {
+ isRestoring = false;
+
+ await ref.read(pWallets).deleteWallet(
+ info,
+ ref.read(secureStoreProvider),
+ );
+ },
+ );
+ },
+ ),
+ );
+ }
+
+ final ViewOnlyWalletData viewOnlyData;
+ switch (viewOnlyWalletType) {
+ case ViewOnlyWalletType.cryptonote:
+ if (addressController.text.isEmpty ||
+ viewKeyController.text.isEmpty) {
+ throw Exception("Missing address and/or private view key fields");
+ }
+ viewOnlyData = CryptonoteViewOnlyWalletData(
+ walletId: info.walletId,
+ address: addressController.text,
+ privateViewKey: viewKeyController.text,
+ );
+ break;
+
+ case ViewOnlyWalletType.addressOnly:
+ if (addressController.text.isEmpty) {
+ throw Exception("Address is empty");
+ }
+ viewOnlyData = AddressViewOnlyWalletData(
+ walletId: info.walletId,
+ address: addressController.text,
+ );
+ break;
+
+ case ViewOnlyWalletType.xPub:
+ viewOnlyData = ExtendedKeysViewOnlyWalletData(
+ walletId: info.walletId,
+ xPubs: [
+ XPub(
+ path: _currentDropDownValue,
+ encoded: viewKeyController.text,
+ ),
+ ],
+ );
+ break;
+ }
+
+ var node = ref
+ .read(nodeServiceChangeNotifierProvider)
+ .getPrimaryNodeFor(currency: widget.coin);
+
+ if (node == null) {
+ node = widget.coin.defaultNode;
+ await ref.read(nodeServiceChangeNotifierProvider).setPrimaryNodeFor(
+ coin: widget.coin,
+ node: node,
+ );
+ }
+
+ try {
+ final wallet = await Wallet.create(
+ walletInfo: info,
+ mainDB: ref.read(mainDBProvider),
+ secureStorageInterface: ref.read(secureStoreProvider),
+ nodeService: ref.read(nodeServiceChangeNotifierProvider),
+ prefs: ref.read(prefsChangeNotifierProvider),
+ viewOnlyData: viewOnlyData,
+ );
+
+ // TODO: extract interface with isRestore param
+ switch (wallet.runtimeType) {
+ case const (EpiccashWallet):
+ await (wallet as EpiccashWallet).init(isRestore: true);
+ break;
+
+ case const (MoneroWallet):
+ await (wallet as MoneroWallet).init(isRestore: true);
+ break;
+
+ case const (WowneroWallet):
+ await (wallet as WowneroWallet).init(isRestore: true);
+ break;
+
+ default:
+ await wallet.init();
+ }
+
+ await wallet.recover(isRescan: false);
+
+ // check if state is still active before continuing
+ if (mounted) {
+ // don't remove this setMnemonicVerified thing
+ await wallet.info.setMnemonicVerified(
+ isar: ref.read(mainDBProvider).isar,
+ );
+
+ ref.read(pWallets).addWallet(wallet);
+
+ if (mounted) {
+ if (Util.isDesktop) {
+ Navigator.of(context).popUntil(
+ ModalRoute.withName(
+ DesktopHomeView.routeName,
+ ),
+ );
+ } else {
+ unawaited(
+ Navigator.of(context).pushNamedAndRemoveUntil(
+ HomeView.routeName,
+ (route) => false,
+ ),
+ );
+ }
+
+ await showDialog(
+ context: context,
+ useSafeArea: false,
+ barrierDismissible: true,
+ builder: (context) {
+ return const RestoreSucceededDialog();
+ },
+ );
+ }
+ }
+ } catch (e) {
+ // check if state is still active and restore wasn't cancelled
+ // before continuing
+ if (mounted && isRestoring) {
+ // pop waiting dialog
+ Navigator.pop(context);
+
+ // show restoring wallet failed dialog
+ await showDialog(
+ context: context,
+ useSafeArea: false,
+ barrierDismissible: true,
+ builder: (context) {
+ return RestoreFailedDialog(
+ errorMessage: e.toString(),
+ walletId: info.walletId,
+ walletName: info.name,
+ );
+ },
+ );
+ }
+ }
+ } finally {
+ if (!Platform.isLinux && !Util.isDesktop) await WakelockPlus.disable();
+ }
+ }
+
+ @override
+ void initState() {
+ super.initState();
+ addressController = TextEditingController();
+ viewKeyController = TextEditingController();
+
+ if (widget.coin is Bip39HDCurrency) {
+ _currentDropDownValue = (widget.coin as Bip39HDCurrency)
+ .supportedHardenedDerivationPaths
+ .last;
+ }
+ }
+
+ @override
+ void dispose() {
+ addressController.dispose();
+ viewKeyController.dispose();
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ final isDesktop = Util.isDesktop;
+
+ final isElectrumX = widget.coin is ElectrumXCurrencyInterface;
+
+ return MasterScaffold(
+ isDesktop: isDesktop,
+ appBar: isDesktop
+ ? const DesktopAppBar(
+ isCompactHeight: false,
+ leading: AppBarBackButton(),
+ trailing: ExitToMyStackButton(),
+ )
+ : AppBar(
+ leading: AppBarBackButton(
+ onPressed: () async {
+ if (FocusScope.of(context).hasFocus) {
+ FocusScope.of(context).unfocus();
+ await Future.delayed(
+ const Duration(milliseconds: 50),
+ );
+ }
+ if (context.mounted) {
+ Navigator.of(context).pop();
+ }
+ },
+ ),
+ ),
+ body: Container(
+ color: Theme.of(context).extension()!.background,
+ child: LayoutBuilder(
+ builder: (context, constraints) {
+ return SingleChildScrollView(
+ child: ConstrainedBox(
+ constraints: BoxConstraints(
+ minHeight: constraints.maxHeight,
+ maxWidth: isDesktop ? 480 : double.infinity,
+ ),
+ child: IntrinsicHeight(
+ child: Padding(
+ padding: const EdgeInsets.all(16),
+ child: Column(
+ children: [
+ if (isDesktop)
+ const Spacer(
+ flex: 10,
+ ),
+ if (!isDesktop)
+ Text(
+ widget.walletName,
+ style: STextStyles.itemSubtitle(context),
+ ),
+ SizedBox(
+ height: isDesktop ? 0 : 4,
+ ),
+ Text(
+ "Enter view only details",
+ style: isDesktop
+ ? STextStyles.desktopH2(context)
+ : STextStyles.pageTitleH1(context),
+ ),
+ if (isElectrumX)
+ SizedBox(
+ height: isDesktop ? 24 : 16,
+ ),
+ if (isElectrumX)
+ SizedBox(
+ height: isDesktop ? 56 : 48,
+ width: isDesktop ? 490 : null,
+ child: Toggle(
+ key: UniqueKey(),
+ onText: "Extended pub key",
+ offText: "Single address",
+ onColor: Theme.of(context)
+ .extension()!
+ .popupBG,
+ offColor: Theme.of(context)
+ .extension()!
+ .textFieldDefaultBG,
+ isOn: _addressOnly,
+ onValueChanged: (value) {
+ setState(() {
+ _addressOnly = value;
+ });
+ },
+ decoration: BoxDecoration(
+ color: Colors.transparent,
+ borderRadius: BorderRadius.circular(
+ Constants.size.circularBorderRadius,
+ ),
+ ),
+ ),
+ ),
+ SizedBox(
+ height: isDesktop ? 24 : 16,
+ ),
+ if (!isElectrumX || _addressOnly)
+ FullTextField(
+ key: const Key("viewOnlyAddressRestoreFieldKey"),
+ label: "Address",
+ controller: addressController,
+ onChanged: (newValue) {
+ if (isElectrumX) {
+ viewKeyController.text = "";
+ setState(() {
+ _enableRestoreButton = newValue.isNotEmpty;
+ });
+ } else {
+ setState(() {
+ _enableRestoreButton = newValue.isNotEmpty &&
+ viewKeyController.text.isNotEmpty;
+ });
+ }
+ },
+ ),
+ if (!isElectrumX)
+ SizedBox(
+ height: isDesktop ? 16 : 12,
+ ),
+ if (isElectrumX && !_addressOnly)
+ DropdownButtonHideUnderline(
+ child: DropdownButton2(
+ value: _currentDropDownValue,
+ items: [
+ ...(widget.coin as Bip39HDCurrency)
+ .supportedHardenedDerivationPaths
+ .map(
+ (e) => DropdownMenuItem(
+ value: e,
+ child: Text(
+ e,
+ style: STextStyles.w500_14(context),
+ ),
+ ),
+ ),
+ ],
+ onChanged: (value) {
+ if (value is String) {
+ setState(() {
+ _currentDropDownValue = value;
+ });
+ }
+ },
+ isExpanded: true,
+ buttonStyleData: ButtonStyleData(
+ decoration: BoxDecoration(
+ color: Theme.of(context)
+ .extension()!
+ .textFieldDefaultBG,
+ borderRadius: BorderRadius.circular(
+ Constants.size.circularBorderRadius,
+ ),
+ ),
+ ),
+ iconStyleData: IconStyleData(
+ icon: Padding(
+ padding: const EdgeInsets.only(right: 10),
+ child: SvgPicture.asset(
+ Assets.svg.chevronDown,
+ width: 12,
+ height: 6,
+ color: Theme.of(context)
+ .extension()!
+ .textFieldActiveSearchIconRight,
+ ),
+ ),
+ ),
+ dropdownStyleData: DropdownStyleData(
+ offset: const Offset(0, -10),
+ elevation: 0,
+ decoration: BoxDecoration(
+ color: Theme.of(context)
+ .extension()!
+ .textFieldDefaultBG,
+ borderRadius: BorderRadius.circular(
+ Constants.size.circularBorderRadius,
+ ),
+ ),
+ ),
+ menuItemStyleData: const MenuItemStyleData(
+ padding: EdgeInsets.symmetric(
+ horizontal: 16,
+ vertical: 8,
+ ),
+ ),
+ ),
+ ),
+ if (isElectrumX && !_addressOnly)
+ SizedBox(
+ height: isDesktop ? 16 : 12,
+ ),
+ if (!isElectrumX || !_addressOnly)
+ FullTextField(
+ key: const Key("viewOnlyKeyRestoreFieldKey"),
+ label:
+ "${isElectrumX ? "Extended" : "Private View"} Key",
+ controller: viewKeyController,
+ onChanged: (value) {
+ if (isElectrumX) {
+ addressController.text = "";
+ setState(() {
+ _enableRestoreButton = value.isNotEmpty;
+ });
+ } else {
+ setState(() {
+ _enableRestoreButton = value.isNotEmpty &&
+ addressController.text.isNotEmpty;
+ });
+ }
+ },
+ ),
+ if (!isDesktop) const Spacer(),
+ SizedBox(
+ height: isDesktop ? 24 : 16,
+ ),
+ PrimaryButton(
+ enabled: _enableRestoreButton,
+ onPressed: _requestRestore,
+ width: isDesktop ? 480 : null,
+ label: "Restore",
+ ),
+ if (isDesktop)
+ const Spacer(
+ flex: 15,
+ ),
+ ],
+ ),
+ ),
+ ),
+ ),
+ );
+ },
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/pages/add_wallet_views/restore_wallet_view/restore_wallet_view.dart b/lib/pages/add_wallet_views/restore_wallet_view/restore_wallet_view.dart
index 4c26ff3fa..2fae2352c 100644
--- a/lib/pages/add_wallet_views/restore_wallet_view/restore_wallet_view.dart
+++ b/lib/pages/add_wallet_views/restore_wallet_view/restore_wallet_view.dart
@@ -16,13 +16,14 @@ import 'dart:math';
import 'package:bip39/bip39.dart' as bip39;
import 'package:bip39/src/wordlists/english.dart' as bip39wordlist;
+import 'package:cs_monero/cs_monero.dart' as lib_monero;
+import 'package:cs_monero/src/deprecated/get_height_by_date.dart'
+ as cs_monero_deprecated;
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
-import 'package:flutter_libmonero/monero/monero.dart' as libxmr;
-import 'package:flutter_libmonero/wownero/wownero.dart' as libwow;
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_svg/flutter_svg.dart';
-import 'package:wakelock/wakelock.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
import '../../../notifications/show_flush_bar.dart';
import '../../../pages_desktop_specific/desktop_home_view.dart';
@@ -86,7 +87,7 @@ class RestoreWalletView extends ConsumerStatefulWidget {
final CryptoCurrency coin;
final String mnemonicPassphrase;
final int seedWordsLength;
- final DateTime restoreFromDate;
+ final DateTime? restoreFromDate;
final bool enableLelantusScanning;
final BarcodeScannerInterface barcodeScanner;
@@ -181,7 +182,7 @@ class _RestoreWalletViewState extends ConsumerState {
if (widget.coin is Monero) {
switch (widget.seedWordsLength) {
case 25:
- return libxmr.monero.getMoneroWordList("English").contains(word);
+ return lib_monero.getMoneroWordList("English").contains(word);
case 16:
return Monero.sixteenWordsWordList.contains(word);
default:
@@ -189,7 +190,7 @@ class _RestoreWalletViewState extends ConsumerState {
}
}
if (widget.coin is Wownero) {
- final wowneroWordList = libwow.wownero.getWowneroWordList(
+ final wowneroWordList = lib_monero.getWowneroWordList(
"English",
seedWordsLength: widget.seedWordsLength,
);
@@ -219,29 +220,35 @@ class _RestoreWalletViewState extends ConsumerState {
int height = 0;
String? otherDataJsonString;
- if (widget.coin is Monero) {
- height = libxmr.monero.getHeigthByDate(date: widget.restoreFromDate);
- } else if (widget.coin is Wownero) {
- height = libwow.wownero.getHeightByDate(date: widget.restoreFromDate);
+ if (widget.restoreFromDate != null) {
+ if (widget.coin is Monero) {
+ height = cs_monero_deprecated.getMoneroHeightByDate(
+ date: widget.restoreFromDate!,
+ );
+ }
+ if (widget.coin is Wownero) {
+ height = cs_monero_deprecated.getWowneroHeightByDate(
+ date: widget.restoreFromDate!,
+ );
+ }
+ if (height < 0) {
+ height = 0;
+ }
}
- // todo: wait until this implemented
- // else if (widget.coin is Wownero) {
- // height = wownero.getHeightByDate(date: widget.restoreFromDate);
- // }
// TODO: make more robust estimate of date maybe using https://explorer.epic.tech/api-index
if (widget.coin is Epiccash) {
- final int secondsSinceEpoch =
- widget.restoreFromDate.millisecondsSinceEpoch ~/ 1000;
- const int epicCashFirstBlock = 1565370278;
- const double overestimateSecondsPerBlock = 61;
- final int chosenSeconds = secondsSinceEpoch - epicCashFirstBlock;
- final int approximateHeight =
- chosenSeconds ~/ overestimateSecondsPerBlock;
- //todo: check if print needed
- // debugPrint(
- // "approximate height: $approximateHeight chosen_seconds: $chosenSeconds");
- height = approximateHeight;
+ if (widget.restoreFromDate != null) {
+ final int secondsSinceEpoch =
+ widget.restoreFromDate!.millisecondsSinceEpoch ~/ 1000;
+ const int epicCashFirstBlock = 1565370278;
+ const double overestimateSecondsPerBlock = 61;
+ final int chosenSeconds = secondsSinceEpoch - epicCashFirstBlock;
+ final int approximateHeight =
+ chosenSeconds ~/ overestimateSecondsPerBlock;
+
+ height = approximateHeight;
+ }
if (height < 0) {
height = 0;
}
@@ -282,7 +289,7 @@ class _RestoreWalletViewState extends ConsumerState {
),
);
} else {
- if (!Platform.isLinux) await Wakelock.enable();
+ if (!Platform.isLinux) await WakelockPlus.enable();
final info = WalletInfo.createNew(
coin: widget.coin,
@@ -426,12 +433,12 @@ class _RestoreWalletViewState extends ConsumerState {
}
if (!Platform.isLinux && !isDesktop) {
- await Wakelock.disable();
+ await WakelockPlus.disable();
}
}
} catch (e) {
if (!Platform.isLinux && !isDesktop) {
- await Wakelock.disable();
+ await WakelockPlus.disable();
}
// if (e is HiveError &&
@@ -463,7 +470,7 @@ class _RestoreWalletViewState extends ConsumerState {
}
if (!Platform.isLinux && !isDesktop) {
- await Wakelock.disable();
+ await WakelockPlus.disable();
}
}
}
@@ -648,16 +655,18 @@ class _RestoreWalletViewState extends ConsumerState {
const Duration(milliseconds: 100),
);
- await showDialog(
- context: context,
- useSafeArea: false,
- barrierDismissible: true,
- builder: (context) {
- return ConfirmRecoveryDialog(
- onConfirm: attemptRestore,
- );
- },
- );
+ if (mounted) {
+ await showDialog(
+ context: context,
+ useSafeArea: false,
+ barrierDismissible: true,
+ builder: (context) {
+ return ConfirmRecoveryDialog(
+ onConfirm: attemptRestore,
+ );
+ },
+ );
+ }
}
@override
diff --git a/lib/pages/add_wallet_views/verify_recovery_phrase_view/verify_recovery_phrase_view.dart b/lib/pages/add_wallet_views/verify_recovery_phrase_view/verify_recovery_phrase_view.dart
index 2a7a9fcae..e95e33539 100644
--- a/lib/pages/add_wallet_views/verify_recovery_phrase_view/verify_recovery_phrase_view.dart
+++ b/lib/pages/add_wallet_views/verify_recovery_phrase_view/verify_recovery_phrase_view.dart
@@ -9,13 +9,17 @@
*/
import 'dart:async';
+import 'dart:convert';
import 'dart:math';
+import 'package:cs_monero/src/deprecated/get_height_by_date.dart'
+ as cs_monero_deprecated;
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:tuple/tuple.dart';
+import '../../../models/keys/view_only_wallet_data.dart';
import '../../../notifications/show_flush_bar.dart';
import '../../../pages_desktop_specific/desktop_home_view.dart';
import '../../../pages_desktop_specific/my_stack_view/exit_to_my_stack_button.dart';
@@ -25,14 +29,25 @@ import '../../../providers/providers.dart';
import '../../../themes/stack_colors.dart';
import '../../../utilities/assets.dart';
import '../../../utilities/constants.dart';
+import '../../../utilities/logger.dart';
+import '../../../utilities/show_loading.dart';
import '../../../utilities/text_styles.dart';
import '../../../utilities/util.dart';
-import '../../../wallets/crypto_currency/coins/ethereum.dart';
+import '../../../wallets/crypto_currency/crypto_currency.dart';
+import '../../../wallets/crypto_currency/intermediate/bip39_hd_currency.dart';
+import '../../../wallets/isar/models/wallet_info.dart';
import '../../../wallets/isar/providers/wallet_info_provider.dart';
+import '../../../wallets/wallet/impl/epiccash_wallet.dart';
+import '../../../wallets/wallet/impl/monero_wallet.dart';
+import '../../../wallets/wallet/impl/wownero_wallet.dart';
+import '../../../wallets/wallet/intermediate/lib_monero_wallet.dart';
import '../../../wallets/wallet/wallet.dart';
+import '../../../wallets/wallet/wallet_mixin_interfaces/extended_keys_interface.dart';
+import '../../../wallets/wallet/wallet_mixin_interfaces/view_only_option_interface.dart';
import '../../../widgets/custom_buttons/app_bar_icon_button.dart';
import '../../../widgets/desktop/desktop_app_bar.dart';
import '../../../widgets/desktop/desktop_scaffold.dart';
+import '../../../widgets/stack_dialog.dart';
import '../../home_view/home_view.dart';
import '../add_token_view/edit_wallet_tokens_view.dart';
import '../new_wallet_options/new_wallet_options_view.dart';
@@ -64,46 +79,25 @@ class _VerifyRecoveryPhraseViewState
extends ConsumerState
// with WidgetsBindingObserver
{
- late Wallet _wallet;
+ late String _walletId;
+ late CryptoCurrency _coin;
late List _mnemonic;
late final bool isDesktop;
@override
void initState() {
- _wallet = widget.wallet;
+ _walletId = widget.wallet.walletId;
+ _coin = widget.wallet.cryptoCurrency;
_mnemonic = widget.mnemonic;
isDesktop = Util.isDesktop;
- // WidgetsBinding.instance?.addObserver(this);
super.initState();
}
@override
dispose() {
- // WidgetsBinding.instance?.removeObserver(this);
super.dispose();
}
- // @override
- // void didChangeAppLifecycleState(AppLifecycleState state) {
- // switch (state) {
- // case AppLifecycleState.inactive:
- // debugPrint(
- // "VerifyRecoveryPhraseView ========================= Inactive");
- // break;
- // case AppLifecycleState.paused:
- // debugPrint("VerifyRecoveryPhraseView ========================= Paused");
- // break;
- // case AppLifecycleState.resumed:
- // debugPrint(
- // "VerifyRecoveryPhraseView ========================= Resumed");
- // break;
- // case AppLifecycleState.detached:
- // debugPrint(
- // "VerifyRecoveryPhraseView ========================= Detached");
- // break;
- // }
- // }
-
Future _verifyMnemonicPassphrase() async {
final result = await showDialog(
context: context,
@@ -113,6 +107,157 @@ class _VerifyRecoveryPhraseViewState
return result == "verified";
}
+ Future _convertToViewOnly() async {
+ int height = 0;
+ final Map otherDataJson = {
+ WalletInfoKeys.isViewOnlyKey: true,
+ };
+
+ final ViewOnlyWalletType viewOnlyWalletType;
+ if (widget.wallet is ExtendedKeysInterface) {
+ if (widget.wallet.cryptoCurrency is Firo) {
+ otherDataJson.addAll(
+ {
+ WalletInfoKeys.lelantusCoinIsarRescanRequired: false,
+ WalletInfoKeys.enableLelantusScanning: false,
+ },
+ );
+ }
+ viewOnlyWalletType = ViewOnlyWalletType.xPub;
+ } else if (widget.wallet is LibMoneroWallet) {
+ if (widget.wallet.cryptoCurrency is Monero) {
+ height = cs_monero_deprecated.getMoneroHeightByDate(
+ date: DateTime.now().subtract(const Duration(days: 7)),
+ );
+ }
+ if (widget.wallet.cryptoCurrency is Wownero) {
+ height = cs_monero_deprecated.getWowneroHeightByDate(
+ date: DateTime.now().subtract(const Duration(days: 7)),
+ );
+ }
+ if (height < 0) height = 0;
+
+ viewOnlyWalletType = ViewOnlyWalletType.cryptonote;
+ } else {
+ throw Exception(
+ "Unsupported view only wallet type found: ${widget.wallet.runtimeType}",
+ );
+ }
+
+ otherDataJson[WalletInfoKeys.viewOnlyTypeIndexKey] =
+ viewOnlyWalletType.index;
+
+ final voInfo = WalletInfo.createNew(
+ coin: _coin,
+ name: widget.wallet.info.name,
+ restoreHeight: height,
+ otherDataJsonString: jsonEncode(otherDataJson),
+ );
+
+ final ViewOnlyWalletData viewOnlyData;
+ if (widget.wallet is ExtendedKeysInterface) {
+ final extendedKeyInfo =
+ await (widget.wallet as ExtendedKeysInterface).getXPubs();
+ final testPath = (_coin as Bip39HDCurrency).constructDerivePath(
+ derivePathType: (_coin as Bip39HDCurrency).defaultDerivePathType,
+ chain: 0,
+ index: 0,
+ );
+
+ XPub? xPub;
+ for (final pub in extendedKeyInfo.xpubs) {
+ if (testPath.startsWith(pub.path)) {
+ xPub = pub;
+ break;
+ }
+ }
+
+ if (xPub == null) {
+ throw Exception("Default derivation path not matched in xPubs");
+ }
+
+ viewOnlyData = ExtendedKeysViewOnlyWalletData(
+ walletId: voInfo.walletId,
+ xPubs: [xPub],
+ );
+ } else if (widget.wallet is LibMoneroWallet) {
+ final w = widget.wallet as LibMoneroWallet;
+
+ final info = await w
+ .hackToCreateNewViewOnlyWalletDataFromNewlyCreatedWalletThisFunctionShouldNotBeCalledUnlessYouKnowWhatYouAreDoing();
+ final address = info.$1;
+ final privateViewKey = info.$2;
+
+ await w.exit();
+
+ viewOnlyData = CryptonoteViewOnlyWalletData(
+ walletId: voInfo.walletId,
+ address: address,
+ privateViewKey: privateViewKey,
+ );
+ } else {
+ throw Exception(
+ "Unsupported view only wallet type found: ${widget.wallet.runtimeType}",
+ );
+ }
+
+ final voWallet = await Wallet.create(
+ walletInfo: voInfo,
+ mainDB: ref.read(mainDBProvider),
+ secureStorageInterface: ref.read(secureStoreProvider),
+ nodeService: ref.read(nodeServiceChangeNotifierProvider),
+ prefs: ref.read(prefsChangeNotifierProvider),
+ viewOnlyData: viewOnlyData,
+ );
+
+ try {
+ // TODO: extract interface with isRestore param
+ switch (voWallet.runtimeType) {
+ case const (EpiccashWallet):
+ await (voWallet as EpiccashWallet).init(isRestore: true);
+ break;
+
+ case const (MoneroWallet):
+ await (voWallet as MoneroWallet).init(isRestore: true);
+ break;
+
+ case const (WowneroWallet):
+ await (voWallet as WowneroWallet).init(isRestore: true);
+ break;
+
+ default:
+ await voWallet.init();
+ }
+
+ await voWallet.recover(isRescan: false);
+
+ // don't remove this setMnemonicVerified thing
+ await voWallet.info.setMnemonicVerified(
+ isar: ref.read(mainDBProvider).isar,
+ );
+
+ ref.read(pWallets).addWallet(voWallet);
+
+ await voWallet.exit();
+
+ await ref.read(pWallets).deleteWallet(
+ widget.wallet.info,
+ ref.read(secureStoreProvider),
+ );
+ } catch (e) {
+ await ref.read(pWallets).deleteWallet(
+ widget.wallet.info,
+ ref.read(secureStoreProvider),
+ );
+ await ref.read(pWallets).deleteWallet(
+ voWallet.info,
+ ref.read(secureStoreProvider),
+ );
+
+ rethrow;
+ }
+ }
+
Future _continue(bool isMatch) async {
if (isMatch) {
if (ref.read(pNewWalletOptions) != null &&
@@ -124,11 +269,11 @@ class _VerifyRecoveryPhraseViewState
}
}
- await ref.read(pWalletInfo(_wallet.walletId)).setMnemonicVerified(
+ await ref.read(pWalletInfo(widget.wallet.walletId)).setMnemonicVerified(
isar: ref.read(mainDBProvider).isar,
);
- ref.read(pWallets).addWallet(_wallet);
+ ref.read(pWallets).addWallet(widget.wallet);
final isCreateSpecialEthWallet =
ref.read(createSpecialEthWalletRoutingFlag);
@@ -142,6 +287,51 @@ class _VerifyRecoveryPhraseViewState
.state;
}
+ if (mounted &&
+ ref.read(pNewWalletOptions)?.convertToViewOnly == true &&
+ widget.wallet is ViewOnlyOptionInterface) {
+ try {
+ Exception? ex;
+ await showLoading(
+ whileFuture: _convertToViewOnly(),
+ context: context,
+ message: "Converting to view only wallet",
+ rootNavigator: Util.isDesktop,
+ onException: (e) {
+ ex = e;
+ },
+ );
+
+ if (ex != null) {
+ throw ex!;
+ }
+ } catch (e, s) {
+ Logging.instance.log(
+ "$e\n$s",
+ level: LogLevel.Fatal,
+ );
+
+ if (mounted) {
+ await showDialog(
+ context: context,
+ builder: (_) => StackOkDialog(
+ title: e.toString(),
+ desktopPopRootNavigator: Util.isDesktop,
+ ),
+ );
+ }
+
+ if (mounted) {
+ Navigator.of(context).popUntil(
+ ModalRoute.withName(
+ NewWalletRecoveryPhraseView.routeName,
+ ),
+ );
+ }
+ return;
+ }
+ }
+
if (mounted) {
if (isDesktop) {
if (isCreateSpecialEthWallet) {
@@ -156,7 +346,7 @@ class _VerifyRecoveryPhraseViewState
DesktopHomeView.routeName,
),
);
- if (widget.wallet.info.coin is Ethereum) {
+ if (_coin is Ethereum) {
unawaited(
Navigator.of(context).pushNamed(
EditWalletTokensView.routeName,
@@ -179,7 +369,7 @@ class _VerifyRecoveryPhraseViewState
(route) => false,
),
);
- if (widget.wallet.info.coin is Ethereum) {
+ if (_coin is Ethereum) {
unawaited(
Navigator.of(context).pushNamed(
EditWalletTokensView.routeName,
@@ -269,7 +459,7 @@ class _VerifyRecoveryPhraseViewState
Future delete() async {
await ref.read(pWallets).deleteWallet(
- _wallet.info,
+ widget.wallet.info,
ref.read(secureStoreProvider),
);
}
@@ -299,7 +489,7 @@ class _VerifyRecoveryPhraseViewState
trailing: ExitToMyStackButton(
onPressed: () async {
await delete();
- if (mounted) {
+ if (context.mounted) {
Navigator.of(context).popUntil(
ModalRoute.withName(DesktopHomeView.routeName),
);
diff --git a/lib/pages/address_book_views/subviews/new_contact_address_entry_form.dart b/lib/pages/address_book_views/subviews/new_contact_address_entry_form.dart
index ba57db69b..d84cee567 100644
--- a/lib/pages/address_book_views/subviews/new_contact_address_entry_form.dart
+++ b/lib/pages/address_book_views/subviews/new_contact_address_entry_form.dart
@@ -66,6 +66,62 @@ class _NewContactAddressEntryFormState
List coins = [];
+ void _onQrTapped() async {
+ try {
+ // ref
+ // .read(shouldShowLockscreenOnResumeStateProvider
+ // .state)
+ // .state = false;
+ final qrResult = await widget.barcodeScanner.scan();
+
+ // Future.delayed(
+ // const Duration(seconds: 2),
+ // () => ref
+ // .read(
+ // shouldShowLockscreenOnResumeStateProvider
+ // .state)
+ // .state = true,
+ // );
+
+ final paymentData = AddressUtils.parsePaymentUri(
+ qrResult.rawContent,
+ logging: Logging.instance,
+ );
+
+ if (paymentData != null) {
+ addressController.text = paymentData.address;
+ ref.read(addressEntryDataProvider(widget.id)).address =
+ addressController.text.isEmpty ? null : addressController.text;
+
+ addressLabelController.text =
+ paymentData.label ?? addressLabelController.text;
+ ref.read(addressEntryDataProvider(widget.id)).addressLabel =
+ addressLabelController.text.isEmpty
+ ? null
+ : addressLabelController.text;
+
+ // now check for non standard encoded basic address
+ } else if (ref.read(addressEntryDataProvider(widget.id)).coin != null) {
+ if (ref.read(addressEntryDataProvider(widget.id)).coin!.validateAddress(
+ qrResult.rawContent,
+ )) {
+ addressController.text = qrResult.rawContent;
+ ref.read(addressEntryDataProvider(widget.id)).address =
+ qrResult.rawContent;
+ }
+ }
+ } on PlatformException catch (e, s) {
+ // ref
+ // .read(shouldShowLockscreenOnResumeStateProvider
+ // .state)
+ // .state = true;
+ Logging.instance.log(
+ "Failed to get camera permissions to scan address qr code: $e\n$s",
+ level: LogLevel.Warning,
+ );
+ }
+ }
+
@override
void initState() {
addressLabelController = TextEditingController()
@@ -404,71 +460,7 @@ class _NewContactAddressEntryFormState
null)
TextFieldIconButton(
key: const Key("addAddressBookEntryScanQrButtonKey"),
- onTap: () async {
- try {
- // ref
- // .read(shouldShowLockscreenOnResumeStateProvider
- // .state)
- // .state = false;
- final qrResult = await widget.barcodeScanner.scan();
-
- // Future.delayed(
- // const Duration(seconds: 2),
- // () => ref
- // .read(
- // shouldShowLockscreenOnResumeStateProvider
- // .state)
- // .state = true,
- // );
-
- final results =
- AddressUtils.parseUri(qrResult.rawContent);
- if (results.isNotEmpty) {
- addressController.text = results["address"] ?? "";
- ref
- .read(addressEntryDataProvider(widget.id))
- .address =
- addressController.text.isEmpty
- ? null
- : addressController.text;
-
- addressLabelController.text = results["label"] ??
- addressLabelController.text;
- ref
- .read(addressEntryDataProvider(widget.id))
- .addressLabel =
- addressLabelController.text.isEmpty
- ? null
- : addressLabelController.text;
-
- // now check for non standard encoded basic address
- } else if (ref
- .read(addressEntryDataProvider(widget.id))
- .coin !=
- null) {
- if (ref
- .read(addressEntryDataProvider(widget.id))
- .coin!
- .validateAddress(
- qrResult.rawContent,
- )) {
- addressController.text = qrResult.rawContent;
- ref
- .read(addressEntryDataProvider(widget.id))
- .address = qrResult.rawContent;
- }
- }
- } on PlatformException catch (e, s) {
- // ref
- // .read(shouldShowLockscreenOnResumeStateProvider
- // .state)
- // .state = true;
- Logging.instance.log(
- "Failed to get camera permissions to scan address qr code: $e\n$s",
- level: LogLevel.Warning,
- );
- }
- },
+ onTap: _onQrTapped,
child: const QrCodeIcon(),
),
const SizedBox(
diff --git a/lib/pages/buy_view/buy_form.dart b/lib/pages/buy_view/buy_form.dart
index 26ab7f254..f47831547 100644
--- a/lib/pages/buy_view/buy_form.dart
+++ b/lib/pages/buy_view/buy_form.dart
@@ -713,6 +713,60 @@ class _BuyFormState extends ConsumerState {
}
}
+ void _onQrTapped() async {
+ try {
+ if (FocusScope.of(context).hasFocus) {
+ FocusScope.of(context).unfocus();
+ await Future.delayed(
+ const Duration(milliseconds: 75),
+ );
+ }
+
+ final qrResult = await scanner.scan();
+
+ Logging.instance.log(
+ "qrResult content: ${qrResult.rawContent}",
+ level: LogLevel.Info,
+ );
+
+ final paymentData = AddressUtils.parsePaymentUri(
+ qrResult.rawContent,
+ logging: Logging.instance,
+ );
+
+ Logging.instance.log(
+ "qrResult parsed: $paymentData",
+ level: LogLevel.Info,
+ );
+
+ if (paymentData != null) {
+ // auto fill address
+ _address = paymentData.address;
+ _receiveAddressController.text = _address!;
+
+ setState(() {
+ _addressToggleFlag = _receiveAddressController.text.isNotEmpty;
+ });
+
+ // now check for non standard encoded basic address
+ } else {
+ _address = qrResult.rawContent;
+ _receiveAddressController.text = _address ?? "";
+
+ setState(() {
+ _addressToggleFlag = _receiveAddressController.text.isNotEmpty;
+ });
+ }
+ } on PlatformException catch (e, s) {
+ // here we ignore the exception caused by not giving permission
+ // to use the camera to scan a qr code
+ Logging.instance.log(
+ "Failed to get camera permissions while trying to scan qr code in SendView: $e\n$s",
+ level: LogLevel.Warning,
+ );
+ }
+ }
+
@override
void initState() {
_receiveAddressController = TextEditingController();
@@ -1375,63 +1429,7 @@ class _BuyFormState extends ConsumerState {
!isDesktop)
TextFieldIconButton(
key: const Key("buyViewScanQrButtonKey"),
- onTap: () async {
- try {
- if (FocusScope.of(context).hasFocus) {
- FocusScope.of(context).unfocus();
- await Future.delayed(
- const Duration(milliseconds: 75),
- );
- }
-
- final qrResult = await scanner.scan();
-
- Logging.instance.log(
- "qrResult content: ${qrResult.rawContent}",
- level: LogLevel.Info,
- );
-
- final results = AddressUtils.parseUri(
- qrResult.rawContent,
- );
-
- Logging.instance.log(
- "qrResult parsed: $results",
- level: LogLevel.Info,
- );
-
- if (results.isNotEmpty) {
- // auto fill address
- _address = results["address"] ?? "";
- _receiveAddressController.text = _address!;
-
- setState(() {
- _addressToggleFlag =
- _receiveAddressController
- .text.isNotEmpty;
- });
-
- // now check for non standard encoded basic address
- } else {
- _address = qrResult.rawContent;
- _receiveAddressController.text =
- _address ?? "";
-
- setState(() {
- _addressToggleFlag =
- _receiveAddressController
- .text.isNotEmpty;
- });
- }
- } on PlatformException catch (e, s) {
- // here we ignore the exception caused by not giving permission
- // to use the camera to scan a qr code
- Logging.instance.log(
- "Failed to get camera permissions while trying to scan qr code in SendView: $e\n$s",
- level: LogLevel.Warning,
- );
- }
- },
+ onTap: _onQrTapped,
child: const QrCodeIcon(),
),
],
diff --git a/lib/pages/cashfusion/fusion_progress_view.dart b/lib/pages/cashfusion/fusion_progress_view.dart
index e4d787903..022fa0861 100644
--- a/lib/pages/cashfusion/fusion_progress_view.dart
+++ b/lib/pages/cashfusion/fusion_progress_view.dart
@@ -12,7 +12,7 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:wakelock/wakelock.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
import '../../pages_desktop_specific/cashfusion/sub_widgets/fusion_progress.dart';
import '../../providers/cash_fusion/fusion_progress_ui_state_provider.dart';
@@ -85,7 +85,7 @@ class _FusionProgressViewState extends ConsumerState {
message: "Stopping fusion",
);
- await Wakelock.disable();
+ await WakelockPlus.disable();
return true;
} else {
@@ -101,7 +101,7 @@ class _FusionProgressViewState extends ConsumerState {
@override
void dispose() {
- Wakelock.disable();
+ WakelockPlus.disable();
super.dispose();
}
@@ -117,7 +117,7 @@ class _FusionProgressViewState extends ConsumerState {
.watch(fusionProgressUIStateProvider(widget.walletId))
.fusionRoundsCompleted;
- Wakelock.enable();
+ WakelockPlus.enable();
return WillPopScope(
onWillPop: () async {
diff --git a/lib/pages/churning/churn_error_dialog.dart b/lib/pages/churning/churn_error_dialog.dart
new file mode 100644
index 000000000..c9335faff
--- /dev/null
+++ b/lib/pages/churning/churn_error_dialog.dart
@@ -0,0 +1,127 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../providers/churning/churning_service_provider.dart';
+import '../../utilities/text_styles.dart';
+import '../../utilities/util.dart';
+import '../../widgets/conditional_parent.dart';
+import '../../widgets/desktop/desktop_dialog.dart';
+import '../../widgets/desktop/primary_button.dart';
+import '../../widgets/desktop/secondary_button.dart';
+import '../../widgets/stack_dialog.dart';
+
+class ChurnErrorDialog extends ConsumerWidget {
+ const ChurnErrorDialog({
+ super.key,
+ required this.error,
+ required this.walletId,
+ });
+
+ final String error;
+ final String walletId;
+
+ static const errorTitle = "An error occurred";
+
+ @override
+ Widget build(BuildContext context, WidgetRef ref) {
+ return ConditionalParent(
+ condition: Util.isDesktop,
+ builder: (child) => DesktopDialog(
+ maxHeight: double.infinity,
+ child: child,
+ ),
+ child: ConditionalParent(
+ condition: !Util.isDesktop,
+ builder: (child) => StackDialogBase(
+ child: child,
+ ),
+ child: Column(
+ children: [
+ Util.isDesktop
+ ? Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ Padding(
+ padding: const EdgeInsets.only(left: 32, top: 32),
+ child: Text(
+ errorTitle,
+ style: STextStyles.desktopH2(context),
+ ),
+ ),
+ ],
+ )
+ : Text(
+ errorTitle,
+ style: STextStyles.pageTitleH2(context),
+ ),
+ const SizedBox(
+ height: 20,
+ ),
+ Padding(
+ padding: Util.isDesktop
+ ? const EdgeInsets.all(32)
+ : const EdgeInsets.all(20),
+ child: Row(
+ children: [
+ Flexible(
+ child: SelectableText(
+ error.startsWith("Exception:")
+ ? error.substring(10).trim()
+ : error,
+ ),
+ ),
+ ],
+ ),
+ ),
+ const SizedBox(
+ height: 20,
+ ),
+ Padding(
+ padding: Util.isDesktop
+ ? const EdgeInsets.all(32)
+ : const EdgeInsets.all(20),
+ child: Text(
+ "Stop churning or try and continue?",
+ style: Util.isDesktop
+ ? STextStyles.w600_14(context)
+ : STextStyles.w600_14(context),
+ ),
+ ),
+ Padding(
+ padding: EdgeInsets.only(
+ left: Util.isDesktop ? 32 : 20,
+ bottom: Util.isDesktop ? 32 : 20,
+ right: Util.isDesktop ? 32 : 20,
+ ),
+ child: Row(
+ children: [
+ Expanded(
+ child: SecondaryButton(
+ label: "Stop",
+ onPressed: () {
+ ref.read(pChurningService(walletId)).stopChurning();
+ Navigator.of(context).pop();
+ },
+ ),
+ ),
+ SizedBox(
+ width: Util.isDesktop ? 20 : 16,
+ ),
+ Expanded(
+ child: PrimaryButton(
+ label: "Continue",
+ onPressed: () {
+ ref.read(pChurningService(walletId)).unpause();
+ Navigator.of(context).pop();
+ },
+ ),
+ ),
+ ],
+ ),
+ ),
+ ],
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/pages/churning/churning_progress_view.dart b/lib/pages/churning/churning_progress_view.dart
new file mode 100644
index 000000000..8e732e643
--- /dev/null
+++ b/lib/pages/churning/churning_progress_view.dart
@@ -0,0 +1,259 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
+
+import '../../providers/churning/churning_service_provider.dart';
+import '../../themes/stack_colors.dart';
+import '../../utilities/assets.dart';
+import '../../utilities/text_styles.dart';
+import '../../widgets/background.dart';
+import '../../widgets/churning/churn_progress_item.dart';
+import '../../widgets/custom_buttons/app_bar_icon_button.dart';
+import '../../widgets/desktop/primary_button.dart';
+import '../../widgets/desktop/secondary_button.dart';
+import '../../widgets/rounded_container.dart';
+import '../../widgets/stack_dialog.dart';
+import 'churn_error_dialog.dart';
+
+class ChurningProgressView extends ConsumerStatefulWidget {
+ const ChurningProgressView({
+ super.key,
+ required this.walletId,
+ });
+
+ static const routeName = "/churningProgressView";
+
+ final String walletId;
+ @override
+ ConsumerState createState() =>
+ _ChurningProgressViewState();
+}
+
+class _ChurningProgressViewState extends ConsumerState {
+ Future _requestAndProcessCancel() async {
+ final shouldCancel = await showDialog(
+ context: context,
+ barrierDismissible: false,
+ builder: (_) => StackDialog(
+ title: "Cancel churning?",
+ leftButton: SecondaryButton(
+ label: "No",
+ buttonHeight: null,
+ onPressed: () {
+ Navigator.of(context).pop(false);
+ },
+ ),
+ rightButton: PrimaryButton(
+ label: "Yes",
+ buttonHeight: null,
+ onPressed: () {
+ Navigator.of(context).pop(true);
+ },
+ ),
+ ),
+ );
+
+ if (shouldCancel == true && mounted) {
+ ref.read(pChurningService(widget.walletId)).stopChurning();
+
+ await WakelockPlus.disable();
+
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ @override
+ void initState() {
+ super.initState();
+
+ WidgetsBinding.instance.addPostFrameCallback((_) {
+ if (mounted) ref.read(pChurningService(widget.walletId)).churn();
+ });
+ }
+
+ @override
+ void dispose() {
+ WakelockPlus.disable();
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ final bool _succeeded = ref.watch(
+ pChurningService(widget.walletId).select((s) => s.done),
+ );
+
+ final int _roundsCompleted = ref.watch(
+ pChurningService(widget.walletId).select((s) => s.roundsCompleted),
+ );
+
+ WakelockPlus.enable();
+
+ ref.listen(
+ pChurningService(widget.walletId).select((s) => s.lastSeenError),
+ (p, n) {
+ if (!ref.read(pChurningService(widget.walletId)).ignoreErrors &&
+ n != null) {
+ if (context.mounted) {
+ showDialog(
+ context: context,
+ builder: (context) => ChurnErrorDialog(
+ error: n.toString(),
+ walletId: widget.walletId,
+ ),
+ );
+ }
+ }
+ },
+ );
+
+ return WillPopScope(
+ onWillPop: () async {
+ return await _requestAndProcessCancel();
+ },
+ child: Background(
+ child: SafeArea(
+ child: Scaffold(
+ backgroundColor:
+ Theme.of(context).extension()!.background,
+ appBar: AppBar(
+ automaticallyImplyLeading: false,
+ leading: AppBarBackButton(
+ onPressed: () async {
+ if (await _requestAndProcessCancel()) {
+ if (context.mounted) {
+ Navigator.of(context).pop();
+ }
+ }
+ },
+ ),
+ title: Text(
+ "Churning progress",
+ style: STextStyles.navBarTitle(context),
+ ),
+ titleSpacing: 0,
+ ),
+ body: LayoutBuilder(
+ builder: (builderContext, constraints) {
+ return SingleChildScrollView(
+ child: ConstrainedBox(
+ constraints: BoxConstraints(
+ minHeight: constraints.maxHeight,
+ ),
+ child: IntrinsicHeight(
+ child: Padding(
+ padding: const EdgeInsets.all(16),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.stretch,
+ children: [
+ if (_roundsCompleted == 0)
+ RoundedContainer(
+ color: Theme.of(context)
+ .extension()!
+ .snackBarBackError,
+ child: Text(
+ "Do not close this window. If you exit, "
+ "the process will be canceled.",
+ style:
+ STextStyles.smallMed14(context).copyWith(
+ color: Theme.of(context)
+ .extension()!
+ .snackBarTextError,
+ ),
+ textAlign: TextAlign.center,
+ ),
+ ),
+ if (_roundsCompleted > 0)
+ RoundedContainer(
+ color: Theme.of(context)
+ .extension()!
+ .snackBarBackInfo,
+ child: Text(
+ "Churning rounds completed: $_roundsCompleted",
+ style: STextStyles.w500_14(context).copyWith(
+ color: Theme.of(context)
+ .extension()!
+ .snackBarTextInfo,
+ ),
+ textAlign: TextAlign.center,
+ ),
+ ),
+ const SizedBox(
+ height: 20,
+ ),
+ ProgressItem(
+ iconAsset: Assets.svg.alertCircle,
+ label: "Waiting for balance to unlock ${ref.watch(
+ pChurningService(widget.walletId)
+ .select((s) => s.confirmsInfo),
+ ) ?? ""}",
+ status: ref.watch(
+ pChurningService(widget.walletId)
+ .select((s) => s.waitingForUnlockedBalance),
+ ),
+ ),
+ const SizedBox(
+ height: 12,
+ ),
+ ProgressItem(
+ iconAsset: Assets.svg.churn,
+ label: "Creating churn transaction",
+ status: ref.watch(
+ pChurningService(widget.walletId)
+ .select((s) => s.makingChurnTransaction),
+ ),
+ ),
+ const SizedBox(
+ height: 12,
+ ),
+ ProgressItem(
+ iconAsset: Assets.svg.checkCircle,
+ label: "Complete",
+ status: ref.watch(
+ pChurningService(widget.walletId)
+ .select((s) => s.completedStatus),
+ ),
+ ),
+ const Spacer(),
+ const SizedBox(
+ height: 16,
+ ),
+ if (_succeeded)
+ PrimaryButton(
+ label: "Churn again",
+ onPressed: ref
+ .read(pChurningService(widget.walletId))
+ .churn,
+ ),
+ if (_succeeded)
+ const SizedBox(
+ height: 16,
+ ),
+ SecondaryButton(
+ label: "Cancel",
+ onPressed: () async {
+ if (await _requestAndProcessCancel()) {
+ if (context.mounted) {
+ Navigator.of(context).pop();
+ }
+ }
+ },
+ ),
+ ],
+ ),
+ ),
+ ),
+ ),
+ );
+ },
+ ),
+ ),
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/pages/churning/churning_rounds_selection_sheet.dart b/lib/pages/churning/churning_rounds_selection_sheet.dart
new file mode 100644
index 000000000..de21964e8
--- /dev/null
+++ b/lib/pages/churning/churning_rounds_selection_sheet.dart
@@ -0,0 +1,159 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_hooks/flutter_hooks.dart';
+
+import '../../themes/stack_colors.dart';
+import '../../utilities/constants.dart';
+import '../../utilities/extensions/extensions.dart';
+import '../../utilities/text_styles.dart';
+
+enum ChurnOption {
+ continuous,
+ custom;
+}
+
+class ChurnRoundCountSelectSheet extends HookWidget {
+ const ChurnRoundCountSelectSheet({
+ super.key,
+ required this.currentOption,
+ });
+
+ final ChurnOption currentOption;
+
+ @override
+ Widget build(BuildContext context) {
+ final option = useState(currentOption);
+
+ return WillPopScope(
+ onWillPop: () async {
+ Navigator.of(context).pop(option.value);
+ return false;
+ },
+ child: Container(
+ decoration: BoxDecoration(
+ color: Theme.of(context).extension()!.popupBG,
+ borderRadius: const BorderRadius.vertical(
+ top: Radius.circular(20),
+ ),
+ ),
+ child: Padding(
+ padding: const EdgeInsets.only(
+ left: 24,
+ right: 24,
+ top: 10,
+ bottom: 0,
+ ),
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Center(
+ child: Container(
+ decoration: BoxDecoration(
+ color: Theme.of(context)
+ .extension()!
+ .textFieldDefaultBG,
+ borderRadius: BorderRadius.circular(
+ Constants.size.circularBorderRadius,
+ ),
+ ),
+ width: 60,
+ height: 4,
+ ),
+ ),
+ const SizedBox(
+ height: 36,
+ ),
+ Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ "Rounds of churn",
+ style: STextStyles.pageTitleH2(context),
+ textAlign: TextAlign.left,
+ ),
+ const SizedBox(
+ height: 20,
+ ),
+ for (int i = 0; i < ChurnOption.values.length; i++)
+ Column(
+ children: [
+ GestureDetector(
+ onTap: () {
+ option.value = ChurnOption.values[i];
+ Navigator.of(context).pop(option.value);
+ },
+ child: Container(
+ color: Colors.transparent,
+ child: Row(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ // Column(
+ // mainAxisAlignment: MainAxisAlignment.start,
+ // children: [
+ SizedBox(
+ width: 20,
+ height: 20,
+ child: Radio(
+ activeColor: Theme.of(context)
+ .extension()!
+ .radioButtonIconEnabled,
+ value: ChurnOption.values[i],
+ groupValue: option.value,
+ onChanged: (_) {
+ option.value = ChurnOption.values[i];
+ Navigator.of(context).pop(option.value);
+ },
+ ),
+ ),
+ // ],
+ // ),
+ const SizedBox(
+ width: 12,
+ ),
+ Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ ChurnOption.values[i].name.capitalize(),
+ style: STextStyles.titleBold12(context),
+ textAlign: TextAlign.left,
+ ),
+ const SizedBox(
+ height: 2,
+ ),
+ Text(
+ ChurnOption.values[i] ==
+ ChurnOption.continuous
+ ? "Keep churning until manually stopped"
+ : "Stop after a set number of churns",
+ style: STextStyles.itemSubtitle12(context)
+ .copyWith(
+ color: Theme.of(context)
+ .extension()!
+ .textDark3,
+ ),
+ textAlign: TextAlign.left,
+ ),
+ ],
+ ),
+ ],
+ ),
+ ),
+ ),
+ const SizedBox(
+ height: 16,
+ ),
+ ],
+ ),
+ const SizedBox(
+ height: 16,
+ ),
+ ],
+ ),
+ ],
+ ),
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/pages/churning/churning_view.dart b/lib/pages/churning/churning_view.dart
new file mode 100644
index 000000000..d59042e5e
--- /dev/null
+++ b/lib/pages/churning/churning_view.dart
@@ -0,0 +1,292 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_svg/svg.dart';
+
+import '../../providers/churning/churning_service_provider.dart';
+import '../../themes/stack_colors.dart';
+import '../../utilities/assets.dart';
+import '../../utilities/constants.dart';
+import '../../utilities/extensions/extensions.dart';
+import '../../utilities/text_styles.dart';
+import '../../widgets/background.dart';
+import '../../widgets/custom_buttons/app_bar_icon_button.dart';
+import '../../widgets/custom_buttons/checkbox_text_button.dart';
+import '../../widgets/desktop/primary_button.dart';
+import '../../widgets/rounded_container.dart';
+import '../../widgets/rounded_white_container.dart';
+import '../../widgets/stack_dialog.dart';
+import '../../widgets/stack_text_field.dart';
+import 'churning_progress_view.dart';
+import 'churning_rounds_selection_sheet.dart';
+
+class ChurningView extends ConsumerStatefulWidget {
+ const ChurningView({
+ super.key,
+ required this.walletId,
+ });
+
+ static const routeName = "/churnView";
+
+ final String walletId;
+
+ @override
+ ConsumerState createState() => _ChurnViewState();
+}
+
+class _ChurnViewState extends ConsumerState {
+ late final TextEditingController churningRoundController;
+ late final FocusNode churningRoundFocusNode;
+
+ bool _enableStartButton = false;
+
+ ChurnOption _option = ChurnOption.continuous;
+
+ Future _startChurn() async {
+ final churningService = ref.read(pChurningService(widget.walletId));
+
+ final int rounds = _option == ChurnOption.continuous
+ ? 0
+ : int.parse(churningRoundController.text);
+
+ churningService.rounds = rounds;
+
+ await Navigator.of(context).pushNamed(
+ ChurningProgressView.routeName,
+ arguments: widget.walletId,
+ );
+ }
+
+ @override
+ void initState() {
+ churningRoundController = TextEditingController();
+
+ churningRoundFocusNode = FocusNode();
+
+ final rounds = ref.read(pChurningService(widget.walletId)).rounds;
+
+ _option = rounds == 0 ? ChurnOption.continuous : ChurnOption.custom;
+ churningRoundController.text = rounds.toString();
+
+ _enableStartButton = churningRoundController.text.isNotEmpty;
+
+ super.initState();
+ }
+
+ @override
+ void dispose() {
+ churningRoundController.dispose();
+ churningRoundFocusNode.dispose();
+
+ super.dispose();
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Background(
+ child: SafeArea(
+ child: Scaffold(
+ backgroundColor:
+ Theme.of(context).extension()!.background,
+ appBar: AppBar(
+ automaticallyImplyLeading: false,
+ leading: const AppBarBackButton(),
+ title: Text(
+ "Churn",
+ style: STextStyles.navBarTitle(context),
+ ),
+ titleSpacing: 0,
+ actions: [
+ AspectRatio(
+ aspectRatio: 1,
+ child: AppBarIconButton(
+ size: 36,
+ icon: SvgPicture.asset(
+ Assets.svg.circleQuestion,
+ width: 20,
+ height: 20,
+ color: Theme.of(context)
+ .extension()!
+ .topNavIconPrimary,
+ ),
+ onPressed: () async {
+ await showDialog(
+ context: context,
+ builder: (context) => const StackOkDialog(
+ title: "What is churning?",
+ message: "Churning in a Monero wallet involves"
+ " sending Monero to oneself in multiple"
+ " transactions, which can enhance privacy"
+ " by making it harder for observers to "
+ "link your transactions. This process"
+ " re-mixes the funds within the network,"
+ " helping obscure transaction history. "
+ "Churning is optional and mainly beneficial"
+ " in scenarios where maximum privacy is"
+ " desired or if you received the Monero from"
+ " a source from which you'd like to disassociate.",
+ ),
+ );
+ },
+ ),
+ ),
+ ],
+ ),
+ body: LayoutBuilder(
+ builder: (builderContext, constraints) {
+ return SingleChildScrollView(
+ child: ConstrainedBox(
+ constraints: BoxConstraints(
+ minHeight: constraints.maxHeight,
+ ),
+ child: IntrinsicHeight(
+ child: Padding(
+ padding: const EdgeInsets.all(16),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ RoundedWhiteContainer(
+ child: Text(
+ "Churning helps anonymize your coins by mixing them.",
+ style: STextStyles.w500_12(context).copyWith(
+ color: Theme.of(context)
+ .extension()!
+ .textSubtitle1,
+ ),
+ ),
+ ),
+ const SizedBox(
+ height: 16,
+ ),
+ const SizedBox(
+ height: 16,
+ ),
+ Text(
+ "Configuration",
+ style: STextStyles.w500_14(context).copyWith(
+ color: Theme.of(context)
+ .extension()!
+ .textDark3,
+ ),
+ ),
+ const SizedBox(
+ height: 12,
+ ),
+ RoundedContainer(
+ onPressed: () async {
+ final option =
+ await showModalBottomSheet(
+ backgroundColor: Colors.transparent,
+ context: context,
+ shape: const RoundedRectangleBorder(
+ borderRadius: BorderRadius.vertical(
+ top: Radius.circular(20),
+ ),
+ ),
+ builder: (_) {
+ return ChurnRoundCountSelectSheet(
+ currentOption: _option,
+ );
+ },
+ );
+ if (option != null) {
+ setState(() {
+ _option = option;
+ });
+ }
+ },
+ color: Theme.of(context)
+ .extension()!
+ .textFieldActiveBG,
+ child: Padding(
+ padding: const EdgeInsets.symmetric(vertical: 8),
+ child: Row(
+ mainAxisAlignment:
+ MainAxisAlignment.spaceBetween,
+ children: [
+ Text(
+ _option.name.capitalize(),
+ style: STextStyles.w500_12(context),
+ ),
+ SvgPicture.asset(
+ Assets.svg.chevronDown,
+ width: 12,
+ color: Theme.of(context)
+ .extension()!
+ .textSubtitle1,
+ ),
+ ],
+ ),
+ ),
+ ),
+ if (_option == ChurnOption.custom)
+ const SizedBox(
+ height: 10,
+ ),
+ if (_option == ChurnOption.custom)
+ ClipRRect(
+ borderRadius: BorderRadius.circular(
+ Constants.size.circularBorderRadius,
+ ),
+ child: TextField(
+ autocorrect: false,
+ enableSuggestions: false,
+ controller: churningRoundController,
+ focusNode: churningRoundFocusNode,
+ inputFormatters: [
+ FilteringTextInputFormatter.digitsOnly,
+ ],
+ keyboardType: TextInputType.number,
+ onChanged: (value) {
+ setState(() {
+ _enableStartButton = value.isNotEmpty;
+ });
+ },
+ style: STextStyles.field(context),
+ decoration: standardInputDecoration(
+ "Number of churns",
+ churningRoundFocusNode,
+ context,
+ ).copyWith(
+ labelText: "Enter number of churns..",
+ ),
+ ),
+ ),
+ const SizedBox(
+ height: 16,
+ ),
+ CheckboxTextButton(
+ label: "Pause on errors",
+ initialValue: !ref
+ .read(pChurningService(widget.walletId))
+ .ignoreErrors,
+ onChanged: (value) {
+ ref
+ .read(pChurningService(widget.walletId))
+ .ignoreErrors = !value;
+ },
+ ),
+ const SizedBox(
+ height: 16,
+ ),
+ const Spacer(),
+ PrimaryButton(
+ label: "Start",
+ enabled: _enableStartButton,
+ onPressed: _startChurn,
+ ),
+ ],
+ ),
+ ),
+ ),
+ ),
+ );
+ },
+ ),
+ ),
+ ),
+ );
+ }
+}
diff --git a/lib/pages/coin_control/utxo_details_view.dart b/lib/pages/coin_control/utxo_details_view.dart
index 54a6f6e5a..d2b378f79 100644
--- a/lib/pages/coin_control/utxo_details_view.dart
+++ b/lib/pages/coin_control/utxo_details_view.dart
@@ -13,9 +13,9 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:isar/isar.dart';
+
import '../../db/isar/main_db.dart';
import '../../models/isar/models/isar_models.dart';
-import '../wallet_view/transaction_views/transaction_details_view.dart';
import '../../providers/global/wallets_provider.dart';
import '../../themes/stack_colors.dart';
import '../../utilities/amount/amount.dart';
@@ -33,6 +33,7 @@ import '../../widgets/desktop/desktop_dialog_close_button.dart';
import '../../widgets/desktop/secondary_button.dart';
import '../../widgets/icon_widgets/utxo_status_icon.dart';
import '../../widgets/rounded_container.dart';
+import '../wallet_view/transaction_views/transaction_details_view.dart';
class UtxoDetailsView extends ConsumerStatefulWidget {
const UtxoDetailsView({
diff --git a/lib/pages/exchange_view/exchange_step_views/step_2_view.dart b/lib/pages/exchange_view/exchange_step_views/step_2_view.dart
index 461dc2935..028ce0ac4 100644
--- a/lib/pages/exchange_view/exchange_step_views/step_2_view.dart
+++ b/lib/pages/exchange_view/exchange_step_views/step_2_view.dart
@@ -70,6 +70,78 @@ class _Step2ViewState extends ConsumerState {
bool enableNext = false;
+ void _onRefundQrTapped() async {
+ try {
+ final qrResult = await scanner.scan();
+
+ final paymentData = AddressUtils.parsePaymentUri(
+ qrResult.rawContent,
+ logging: Logging.instance,
+ );
+
+ if (paymentData != null) {
+ // auto fill address
+ _refundController.text = paymentData.address;
+ model.refundAddress = _refundController.text;
+
+ setState(() {
+ enableNext = _toController.text.isNotEmpty &&
+ _refundController.text.isNotEmpty;
+ });
+ } else {
+ _refundController.text = qrResult.rawContent;
+ model.refundAddress = _refundController.text;
+
+ setState(() {
+ enableNext = _toController.text.isNotEmpty &&
+ _refundController.text.isNotEmpty;
+ });
+ }
+ } on PlatformException catch (e, s) {
+ Logging.instance.log(
+ "Failed to get camera permissions while trying to scan qr code in SendView: $e\n$s",
+ level: LogLevel.Warning,
+ );
+ }
+ }
+
+ void _onToQrTapped() async {
+ try {
+ final qrResult = await scanner.scan();
+
+ final paymentData = AddressUtils.parsePaymentUri(
+ qrResult.rawContent,
+ logging: Logging.instance,
+ );
+
+ if (paymentData != null) {
+ // auto fill address
+ _toController.text = paymentData.address;
+ model.recipientAddress = _toController.text;
+
+ setState(() {
+ enableNext = _toController.text.isNotEmpty &&
+ (_refundController.text.isNotEmpty ||
+ !ref.read(efExchangeProvider).supportsRefundAddress);
+ });
+ } else {
+ _toController.text = qrResult.rawContent;
+ model.recipientAddress = _toController.text;
+
+ setState(() {
+ enableNext = _toController.text.isNotEmpty &&
+ (_refundController.text.isNotEmpty ||
+ !!ref.read(efExchangeProvider).supportsRefundAddress);
+ });
+ }
+ } on PlatformException catch (e, s) {
+ Logging.instance.log(
+ "Failed to get camera permissions while trying to scan qr code in SendView: $e\n$s",
+ level: LogLevel.Warning,
+ );
+ }
+ }
+
@override
void initState() {
model = widget.model;
@@ -137,7 +209,7 @@ class _Step2ViewState extends ConsumerState {
FocusScope.of(context).unfocus();
await Future.delayed(const Duration(milliseconds: 75));
}
- if (mounted) {
+ if (context.mounted) {
Navigator.of(context).pop();
}
},
@@ -405,50 +477,7 @@ class _Step2ViewState extends ConsumerState {
key: const Key(
"sendViewScanQrButtonKey",
),
- onTap: () async {
- try {
- final qrResult =
- await scanner.scan();
-
- final results =
- AddressUtils.parseUri(
- qrResult.rawContent,
- );
- if (results.isNotEmpty) {
- // auto fill address
- _toController.text =
- results["address"] ?? "";
- model.recipientAddress =
- _toController.text;
-
- setState(() {
- enableNext = _toController
- .text.isNotEmpty &&
- (_refundController.text
- .isNotEmpty ||
- !supportsRefund);
- });
- } else {
- _toController.text =
- qrResult.rawContent;
- model.recipientAddress =
- _toController.text;
-
- setState(() {
- enableNext = _toController
- .text.isNotEmpty &&
- (_refundController.text
- .isNotEmpty ||
- !supportsRefund);
- });
- }
- } on PlatformException catch (e, s) {
- Logging.instance.log(
- "Failed to get camera permissions while trying to scan qr code in SendView: $e\n$s",
- level: LogLevel.Warning,
- );
- }
- },
+ onTap: _onToQrTapped,
child: const QrCodeIcon(),
),
],
@@ -685,51 +714,7 @@ class _Step2ViewState extends ConsumerState {
key: const Key(
"sendViewScanQrButtonKey",
),
- onTap: () async {
- try {
- final qrResult =
- await scanner.scan();
-
- final results =
- AddressUtils.parseUri(
- qrResult.rawContent,
- );
- if (results.isNotEmpty) {
- // auto fill address
- _refundController.text =
- results["address"] ??
- "";
- model.refundAddress =
- _refundController.text;
-
- setState(() {
- enableNext = _toController
- .text
- .isNotEmpty &&
- _refundController
- .text.isNotEmpty;
- });
- } else {
- _refundController.text =
- qrResult.rawContent;
- model.refundAddress =
- _refundController.text;
-
- setState(() {
- enableNext = _toController
- .text
- .isNotEmpty &&
- _refundController
- .text.isNotEmpty;
- });
- }
- } on PlatformException catch (e, s) {
- Logging.instance.log(
- "Failed to get camera permissions while trying to scan qr code in SendView: $e\n$s",
- level: LogLevel.Warning,
- );
- }
- },
+ onTap: _onRefundQrTapped,
child: const QrCodeIcon(),
),
],
diff --git a/lib/pages/exchange_view/send_from_view.dart b/lib/pages/exchange_view/send_from_view.dart
index 643768f19..f499775b1 100644
--- a/lib/pages/exchange_view/send_from_view.dart
+++ b/lib/pages/exchange_view/send_from_view.dart
@@ -35,7 +35,7 @@ import '../../wallets/crypto_currency/crypto_currency.dart';
import '../../wallets/isar/providers/wallet_info_provider.dart';
import '../../wallets/models/tx_data.dart';
import '../../wallets/wallet/impl/firo_wallet.dart';
-import '../../wallets/wallet/wallet_mixin_interfaces/cw_based_interface.dart';
+import '../../wallets/wallet/intermediate/lib_monero_wallet.dart';
import '../../widgets/background.dart';
import '../../widgets/conditional_parent.dart';
import '../../widgets/custom_buttons/app_bar_icon_button.dart';
@@ -277,7 +277,7 @@ class _SendFromCardState extends ConsumerState {
// access to this screen but this is needed to get past an error that
// would occur only to lead to another error which is why xmr/wow wallets
// don't have access to this screen currently
- if (wallet is CwBasedInterface) {
+ if (wallet is LibMoneroWallet) {
await wallet.init();
await wallet.open();
}
diff --git a/lib/pages/paynym/paynym_claim_view.dart b/lib/pages/paynym/paynym_claim_view.dart
index 9bf9cb3cd..acabb388d 100644
--- a/lib/pages/paynym/paynym_claim_view.dart
+++ b/lib/pages/paynym/paynym_claim_view.dart
@@ -13,10 +13,8 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_svg/flutter_svg.dart';
+
import '../../models/paynym/paynym_account.dart';
-import 'dialogs/claiming_paynym_dialog.dart';
-import 'paynym_home_view.dart';
-import '../wallet_view/wallet_view.dart';
import '../../providers/global/paynym_api_provider.dart';
import '../../providers/global/wallets_provider.dart';
import '../../providers/wallet/my_paynym_account_state_provider.dart';
@@ -30,6 +28,9 @@ import '../../widgets/custom_buttons/app_bar_icon_button.dart';
import '../../widgets/desktop/desktop_app_bar.dart';
import '../../widgets/desktop/desktop_scaffold.dart';
import '../../widgets/desktop/primary_button.dart';
+import '../wallet_view/wallet_view.dart';
+import 'dialogs/claiming_paynym_dialog.dart';
+import 'paynym_home_view.dart';
class PaynymClaimView extends ConsumerStatefulWidget {
const PaynymClaimView({
@@ -197,7 +198,7 @@ class _PaynymClaimViewState extends ConsumerState {
if (shouldCancel) return;
- // attempt to create new entry in paynym.is db
+ // attempt to create new entry in [PaynymIsApi.baseURL] db
final created = await ref
.read(paynymAPIProvider)
.create(pCode.toString());
diff --git a/lib/pages/paynym/subwidgets/paynym_bot.dart b/lib/pages/paynym/subwidgets/paynym_bot.dart
index 1a6d6e469..384e471e5 100644
--- a/lib/pages/paynym/subwidgets/paynym_bot.dart
+++ b/lib/pages/paynym/subwidgets/paynym_bot.dart
@@ -11,8 +11,10 @@
import 'dart:typed_data';
import 'package:flutter/material.dart';
+
import '../../../networking/http.dart';
import '../../../services/tor_service.dart';
+import '../../../utilities/paynym_is_api.dart';
import '../../../utilities/prefs.dart';
class PayNymBot extends StatelessWidget {
@@ -50,7 +52,8 @@ class PayNymBot extends StatelessWidget {
Future _fetchImage() async {
final HTTP client = HTTP();
- final Uri uri = Uri.parse("https://paynym.is/$paymentCodeString/avatar");
+ final Uri uri =
+ Uri.parse("${PaynymIsApi.baseURL}/$paymentCodeString/avatar");
final response = await client.get(
url: uri,
diff --git a/lib/pages/pinpad_views/lock_screen_view.dart b/lib/pages/pinpad_views/lock_screen_view.dart
index 3c52c8efc..711a25a45 100644
--- a/lib/pages/pinpad_views/lock_screen_view.dart
+++ b/lib/pages/pinpad_views/lock_screen_view.dart
@@ -26,7 +26,7 @@ import '../../utilities/biometrics.dart';
import '../../utilities/flutter_secure_storage_interface.dart';
import '../../utilities/show_loading.dart';
import '../../utilities/text_styles.dart';
-import '../../wallets/wallet/wallet_mixin_interfaces/cw_based_interface.dart';
+import '../../wallets/wallet/intermediate/lib_monero_wallet.dart';
import '../../widgets/background.dart';
import '../../widgets/custom_buttons/app_bar_icon_button.dart';
import '../../widgets/custom_buttons/blue_text_button.dart';
@@ -102,7 +102,7 @@ class _LockscreenViewState extends ConsumerState {
final wallet = ref.read(pWallets).getWallet(walletId);
final Future loadFuture;
- if (wallet is CwBasedInterface) {
+ if (wallet is LibMoneroWallet) {
loadFuture =
wallet.init().then((value) async => await (wallet).open());
} else {
diff --git a/lib/pages/receive_view/addresses/address_details_view.dart b/lib/pages/receive_view/addresses/address_details_view.dart
index 2006e900b..25e18becb 100644
--- a/lib/pages/receive_view/addresses/address_details_view.dart
+++ b/lib/pages/receive_view/addresses/address_details_view.dart
@@ -8,6 +8,7 @@
*
*/
+import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:isar/isar.dart';
@@ -147,6 +148,7 @@ class _AddressDetailsViewState extends ConsumerState {
@override
Widget build(BuildContext context) {
final coin = ref.watch(pWalletCoin(widget.walletId));
+ final wallet = ref.watch(pWallets).getWallet(widget.walletId);
return ConditionalParent(
condition: !isDesktop,
builder: (child) => Background(
@@ -372,13 +374,21 @@ class _AddressDetailsViewState extends ConsumerState {
detail: address.subType.prettyName,
button: Container(),
),
- if (ref.watch(pWallets).getWallet(widget.walletId)
- is Bip39HDWallet)
+ if (kDebugMode)
const _Div(
height: 12,
),
- if (ref.watch(pWallets).getWallet(widget.walletId)
- is Bip39HDWallet)
+ if (kDebugMode)
+ DetailItem(
+ title: "frost secure (kDebugMode)",
+ detail: address.zSafeFrost.toString(),
+ button: Container(),
+ ),
+ if (wallet is Bip39HDWallet && !wallet.isViewOnly)
+ const _Div(
+ height: 12,
+ ),
+ if (wallet is Bip39HDWallet && !wallet.isViewOnly)
AddressPrivateKey(
walletId: widget.walletId,
address: address,
diff --git a/lib/pages/receive_view/addresses/wallet_addresses_view.dart b/lib/pages/receive_view/addresses/wallet_addresses_view.dart
index f464d0e57..6c1441b43 100644
--- a/lib/pages/receive_view/addresses/wallet_addresses_view.dart
+++ b/lib/pages/receive_view/addresses/wallet_addresses_view.dart
@@ -67,6 +67,19 @@ class _WalletAddressesViewState extends ConsumerState {
.and()
.not()
.typeEqualTo(AddressType.nonWallet)
+ .and()
+ .group(
+ (q) => q
+ .group(
+ (q2) => q2
+ .typeEqualTo(AddressType.frostMS)
+ .and()
+ .zSafeFrostEqualTo(true),
+ )
+ .or()
+ .not()
+ .typeEqualTo(AddressType.frostMS),
+ )
.sortByDerivationIndex()
.idProperty()
.findAll();
@@ -114,6 +127,19 @@ class _WalletAddressesViewState extends ConsumerState {
.and()
.not()
.typeEqualTo(AddressType.nonWallet)
+ .and()
+ .group(
+ (q) => q
+ .group(
+ (q2) => q2
+ .typeEqualTo(AddressType.frostMS)
+ .and()
+ .zSafeFrostEqualTo(true),
+ )
+ .or()
+ .not()
+ .typeEqualTo(AddressType.frostMS),
+ )
.sortByDerivationIndex()
.idProperty()
.findAll();
diff --git a/lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart b/lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart
index f9049a538..dfe85d934 100644
--- a/lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart
+++ b/lib/pages/receive_view/generate_receiving_uri_qr_code_view.dart
@@ -97,7 +97,7 @@ class _GenerateUriQrCodeViewState extends State {
initialDirectory: dir.path,
);
- if (path != null) {
+ if (path != null && mounted) {
final file = File(path);
if (file.existsSync()) {
unawaited(
@@ -109,13 +109,15 @@ class _GenerateUriQrCodeViewState extends State {
);
} else {
await file.writeAsBytes(pngBytes);
- unawaited(
- showFloatingFlushBar(
- type: FlushBarType.success,
- message: "$path saved!",
- context: context,
- ),
- );
+ if (mounted) {
+ unawaited(
+ showFloatingFlushBar(
+ type: FlushBarType.success,
+ message: "$path saved!",
+ context: context,
+ ),
+ );
+ }
}
}
} else {
@@ -144,7 +146,18 @@ class _GenerateUriQrCodeViewState extends State {
final amountString = amountController.text;
final noteString = noteController.text;
- if (amountString.isNotEmpty && Decimal.tryParse(amountString) == null) {
+ // try "."
+ Decimal? amount = Decimal.tryParse(amountString);
+ if (amount == null) {
+ // try single instance of ","
+ final first = amountString.indexOf(",");
+ final last = amountString.lastIndexOf(",");
+ if (first == last) {
+ amount = Decimal.tryParse(amountString.replaceFirst(",", "."));
+ }
+ }
+
+ if (amountString.isNotEmpty && amount == null) {
showFloatingFlushBar(
type: FlushBarType.warning,
message: "Invalid amount",
@@ -156,7 +169,7 @@ class _GenerateUriQrCodeViewState extends State {
final Map queryParams = {};
if (amountString.isNotEmpty) {
- queryParams["amount"] = amountString;
+ queryParams["amount"] = amount.toString();
}
if (noteString.isNotEmpty) {
queryParams["message"] = noteString;
@@ -300,7 +313,7 @@ class _GenerateUriQrCodeViewState extends State {
FocusScope.of(context).unfocus();
await Future.delayed(const Duration(milliseconds: 70));
}
- if (mounted) {
+ if (context.mounted) {
Navigator.of(context).pop();
}
},
diff --git a/lib/pages/receive_view/receive_view.dart b/lib/pages/receive_view/receive_view.dart
index a40262cdc..636a05ab8 100644
--- a/lib/pages/receive_view/receive_view.dart
+++ b/lib/pages/receive_view/receive_view.dart
@@ -18,6 +18,7 @@ import 'package:flutter_svg/flutter_svg.dart';
import 'package:isar/isar.dart';
import '../../models/isar/models/isar_models.dart';
+import '../../models/keys/view_only_wallet_data.dart';
import '../../notifications/show_flush_bar.dart';
import '../../providers/db/main_db_provider.dart';
import '../../providers/providers.dart';
@@ -36,6 +37,7 @@ import '../../wallets/wallet/intermediate/bip39_hd_wallet.dart';
import '../../wallets/wallet/wallet_mixin_interfaces/bcash_interface.dart';
import '../../wallets/wallet/wallet_mixin_interfaces/multi_address_interface.dart';
import '../../wallets/wallet/wallet_mixin_interfaces/spark_interface.dart';
+import '../../wallets/wallet/wallet_mixin_interfaces/view_only_option_interface.dart';
import '../../widgets/background.dart';
import '../../widgets/conditional_parent.dart';
import '../../widgets/custom_buttons/app_bar_icon_button.dart';
@@ -113,9 +115,15 @@ class _ReceiveViewState extends ConsumerState {
address = await wallet.generateNextReceivingAddress(
derivePathType: type,
);
- await ref.read(mainDBProvider).isar.writeTxn(() async {
- await ref.read(mainDBProvider).isar.addresses.put(address!);
+ final isar = ref.read(mainDBProvider).isar;
+ await isar.writeTxn(() async {
+ await isar.addresses.put(address!);
});
+ final info = ref.read(pWalletInfo(walletId));
+ await info.updateReceivingAddress(
+ newAddress: address.value,
+ isar: isar,
+ );
} else {
await wallet.generateNewReceivingAddress();
address = null;
@@ -183,10 +191,15 @@ class _ReceiveViewState extends ConsumerState {
clipboard = widget.clipboard;
final wallet = ref.read(pWallets).getWallet(walletId);
_supportsSpark = wallet is SparkInterface;
- _showMultiType = _supportsSpark ||
- (wallet is! BCashInterface &&
- wallet is Bip39HDWallet &&
- wallet.supportedAddressTypes.length > 1);
+
+ if (wallet is ViewOnlyOptionInterface && wallet.isViewOnly) {
+ _showMultiType = false;
+ } else {
+ _showMultiType = _supportsSpark ||
+ (wallet is! BCashInterface &&
+ wallet is Bip39HDWallet &&
+ wallet.supportedAddressTypes.length > 1);
+ }
_walletAddressTypes.add(wallet.info.mainAddressType);
@@ -259,6 +272,18 @@ class _ReceiveViewState extends ConsumerState {
address = ref.watch(pWalletReceivingAddress(walletId));
}
+ final wallet =
+ ref.watch(pWallets.select((value) => value.getWallet(walletId)));
+
+ final bool canGen;
+ if (wallet is ViewOnlyOptionInterface &&
+ wallet.isViewOnly &&
+ wallet.viewOnlyType == ViewOnlyWalletType.addressOnly) {
+ canGen = false;
+ } else {
+ canGen = (wallet is MultiAddressInterface || _supportsSpark);
+ }
+
return Background(
child: Scaffold(
backgroundColor: Theme.of(context).extension()!.background,
@@ -547,17 +572,11 @@ class _ReceiveViewState extends ConsumerState {
);
},
),
- if (ref.watch(
- pWallets.select((value) => value.getWallet(walletId)),
- ) is MultiAddressInterface ||
- _supportsSpark)
+ if (canGen)
const SizedBox(
height: 12,
),
- if (ref.watch(
- pWallets.select((value) => value.getWallet(walletId)),
- ) is MultiAddressInterface ||
- _supportsSpark)
+ if (canGen)
SecondaryButton(
label: "Generate new address",
onPressed: _supportsSpark &&
diff --git a/lib/pages/send_view/frost_ms/recipient.dart b/lib/pages/send_view/frost_ms/recipient.dart
index 6d9d9b7c4..ce38153e7 100644
--- a/lib/pages/send_view/frost_ms/recipient.dart
+++ b/lib/pages/send_view/frost_ms/recipient.dart
@@ -120,6 +120,69 @@ class _RecipientState extends ConsumerState {
}
}
+ void _onQrTapped() async {
+ try {
+ if (FocusScope.of(context).hasFocus) {
+ FocusScope.of(context).unfocus();
+ await Future.delayed(
+ const Duration(
+ milliseconds: 75,
+ ),
+ );
+ }
+
+ final qrResult = await ref.read(pBarcodeScanner).scan();
+
+ Logging.instance.log(
+ "qrResult content: ${qrResult.rawContent}",
+ level: LogLevel.Info,
+ );
+
+ final paymentData = AddressUtils.parsePaymentUri(
+ qrResult.rawContent,
+ logging: Logging.instance,
+ );
+
+ Logging.instance.log(
+ "qrResult parsed: $paymentData",
+ level: LogLevel.Info,
+ );
+
+ if (paymentData != null &&
+ paymentData.coin?.uriScheme == widget.coin.uriScheme) {
+ // auto fill address
+
+ addressController.text = paymentData.address.trim();
+
+ // autofill amount field
+ if (paymentData.amount != null) {
+ final Amount amount = Decimal.parse(paymentData.amount!).toAmount(
+ fractionDigits: widget.coin.fractionDigits,
+ );
+ amountController.text =
+ ref.read(pAmountFormatter(widget.coin)).format(
+ amount,
+ withUnitName: false,
+ );
+ }
+ } else {
+ addressController.text = qrResult.rawContent.trim();
+ }
+
+ setState(() {
+ _addressIsEmpty = addressController.text.isEmpty;
+ });
+
+ _updateRecipientData();
+ } on PlatformException catch (e, s) {
+ Logging.instance.log(
+ "Failed to get camera permissions while "
+ "trying to scan qr code in SendView: $e\n$s",
+ level: LogLevel.Warning,
+ );
+ }
+ }
+
@override
void initState() {
addressController = TextEditingController();
@@ -289,76 +352,7 @@ class _RecipientState extends ConsumerState {
key: const Key(
"sendViewScanQrButtonKey",
),
- onTap: () async {
- try {
- if (FocusScope.of(context).hasFocus) {
- FocusScope.of(context).unfocus();
- await Future.delayed(
- const Duration(
- milliseconds: 75,
- ),
- );
- }
-
- final qrResult =
- await ref.read(pBarcodeScanner).scan();
-
- Logging.instance.log(
- "qrResult content: ${qrResult.rawContent}",
- level: LogLevel.Info,
- );
-
- /// TODO: deal with address utils
- final results =
- AddressUtils.parseUri(qrResult.rawContent);
-
- Logging.instance.log(
- "qrResult parsed: $results",
- level: LogLevel.Info,
- );
-
- if (results.isNotEmpty &&
- results["scheme"] ==
- widget.coin.uriScheme) {
- // auto fill address
-
- addressController.text =
- (results["address"] ?? "").trim();
-
- // autofill amount field
- if (results["amount"] != null) {
- final Amount amount =
- Decimal.parse(results["amount"]!)
- .toAmount(
- fractionDigits:
- widget.coin.fractionDigits,
- );
- amountController.text = ref
- .read(pAmountFormatter(widget.coin))
- .format(
- amount,
- withUnitName: false,
- );
- }
- } else {
- addressController.text =
- qrResult.rawContent.trim();
- }
-
- setState(() {
- _addressIsEmpty =
- addressController.text.isEmpty;
- });
-
- _updateRecipientData();
- } on PlatformException catch (e, s) {
- Logging.instance.log(
- "Failed to get camera permissions while "
- "trying to scan qr code in SendView: $e\n$s",
- level: LogLevel.Warning,
- );
- }
- },
+ onTap: _onQrTapped,
child: const QrCodeIcon(),
),
],
diff --git a/lib/pages/send_view/frost_ms/send_steps/frost_send_step_1b.dart b/lib/pages/send_view/frost_ms/send_steps/frost_send_step_1b.dart
index 058b980c5..b7c95ea2c 100644
--- a/lib/pages/send_view/frost_ms/send_steps/frost_send_step_1b.dart
+++ b/lib/pages/send_view/frost_ms/send_steps/frost_send_step_1b.dart
@@ -67,6 +67,7 @@ class _FrostSendStep1bState extends ConsumerState {
final data = Frost.extractDataFromSignConfig(
signConfig: config,
coin: wallet.cryptoCurrency,
+ serializedKeys: (await wallet.getSerializedKeys())!,
);
final utxos = await ref
diff --git a/lib/pages/send_view/send_view.dart b/lib/pages/send_view/send_view.dart
index cd7d5f01a..1dd9b68ef 100644
--- a/lib/pages/send_view/send_view.dart
+++ b/lib/pages/send_view/send_view.dart
@@ -11,7 +11,7 @@
import 'dart:async';
import 'dart:io';
-import 'package:cw_core/monero_transaction_priority.dart';
+import 'package:cs_monero/cs_monero.dart' as lib_monero;
import 'package:decimal/decimal.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@@ -163,9 +163,13 @@ class _SendViewState extends ConsumerState {
level: LogLevel.Info,
);
- final paymentData = AddressUtils.parsePaymentUri(qrResult.rawContent);
+ final paymentData = AddressUtils.parsePaymentUri(
+ qrResult.rawContent,
+ logging: Logging.instance,
+ );
- if (paymentData.coin.uriScheme == coin.uriScheme) {
+ if (paymentData != null &&
+ paymentData.coin?.uriScheme == coin.uriScheme) {
// auto fill address
_address = paymentData.address.trim();
sendToController.text = _address!;
@@ -195,12 +199,8 @@ class _SendViewState extends ConsumerState {
});
// now check for non standard encoded basic address
- } else if (ref
- .read(pWallets)
- .getWallet(walletId)
- .cryptoCurrency
- .validateAddress(qrResult.rawContent)) {
- _address = qrResult.rawContent.trim();
+ } else {
+ _address = qrResult.rawContent.split("\n").first.trim();
sendToController.text = _address ?? "";
_setValidAddressProviders(_address);
@@ -470,22 +470,22 @@ class _SendViewState extends ConsumerState {
Amount fee;
if (coin is Monero) {
- MoneroTransactionPriority specialMoneroId;
+ lib_monero.TransactionPriority specialMoneroId;
switch (ref.read(feeRateTypeStateProvider.state).state) {
case FeeRateType.fast:
- specialMoneroId = MoneroTransactionPriority.fast;
+ specialMoneroId = lib_monero.TransactionPriority.high;
break;
case FeeRateType.average:
- specialMoneroId = MoneroTransactionPriority.regular;
+ specialMoneroId = lib_monero.TransactionPriority.medium;
break;
case FeeRateType.slow:
- specialMoneroId = MoneroTransactionPriority.slow;
+ specialMoneroId = lib_monero.TransactionPriority.normal;
break;
default:
throw ArgumentError("custom fee not available for monero");
}
- fee = await wallet.estimateFeeFor(amount, specialMoneroId.raw!);
+ fee = await wallet.estimateFeeFor(amount, specialMoneroId.value);
cachedFees[amount] = ref.read(pAmountFormatter(coin)).format(
fee,
withUnitName: true,
diff --git a/lib/pages/send_view/sub_widgets/transaction_fee_selection_sheet.dart b/lib/pages/send_view/sub_widgets/transaction_fee_selection_sheet.dart
index a70098c03..0ca0dba47 100644
--- a/lib/pages/send_view/sub_widgets/transaction_fee_selection_sheet.dart
+++ b/lib/pages/send_view/sub_widgets/transaction_fee_selection_sheet.dart
@@ -8,9 +8,10 @@
*
*/
-import 'package:cw_core/monero_transaction_priority.dart';
import 'package:flutter/material.dart';
+import 'package:cs_monero/cs_monero.dart' as lib_monero;
import 'package:flutter_riverpod/flutter_riverpod.dart';
+
import '../../../models/paymint/fee_object_model.dart';
import '../../../providers/providers.dart';
import '../../../providers/ui/fee_rate_type_state_provider.dart';
@@ -90,7 +91,7 @@ class _TransactionFeeSelectionSheetState
if (coin is Monero || coin is Wownero) {
final fee = await wallet.estimateFeeFor(
amount,
- MoneroTransactionPriority.fast.raw!,
+ lib_monero.TransactionPriority.high.value,
);
ref.read(feeSheetSessionCacheProvider).fast[amount] = fee;
} else if (coin is Firo) {
@@ -127,7 +128,7 @@ class _TransactionFeeSelectionSheetState
if (coin is Monero || coin is Wownero) {
final fee = await wallet.estimateFeeFor(
amount,
- MoneroTransactionPriority.regular.raw!,
+ lib_monero.TransactionPriority.medium.value,
);
ref.read(feeSheetSessionCacheProvider).average[amount] = fee;
} else if (coin is Firo) {
@@ -163,7 +164,7 @@ class _TransactionFeeSelectionSheetState
if (coin is Monero || coin is Wownero) {
final fee = await wallet.estimateFeeFor(
amount,
- MoneroTransactionPriority.slow.raw!,
+ lib_monero.TransactionPriority.normal.value,
);
ref.read(feeSheetSessionCacheProvider).slow[amount] = fee;
} else if (coin is Firo) {
diff --git a/lib/pages/send_view/token_send_view.dart b/lib/pages/send_view/token_send_view.dart
index 7f82cc0e5..3ad00fe40 100644
--- a/lib/pages/send_view/token_send_view.dart
+++ b/lib/pages/send_view/token_send_view.dart
@@ -163,25 +163,30 @@ class _TokenSendViewState extends ConsumerState {
level: LogLevel.Info,
);
- final results = AddressUtils.parseUri(qrResult.rawContent);
+ final paymentData = AddressUtils.parsePaymentUri(
+ qrResult.rawContent,
+ logging: Logging.instance,
+ );
- Logging.instance.log("qrResult parsed: $results", level: LogLevel.Info);
+ Logging.instance
+ .log("qrResult parsed: $paymentData", level: LogLevel.Info);
- if (results.isNotEmpty && results["scheme"] == coin.uriScheme) {
+ if (paymentData != null &&
+ paymentData.coin?.uriScheme == coin.uriScheme) {
// auto fill address
- _address = (results["address"] ?? "").trim();
+ _address = paymentData.address.trim();
sendToController.text = _address!;
// autofill notes field
- if (results["message"] != null) {
- noteController.text = results["message"]!;
- } else if (results["label"] != null) {
- noteController.text = results["label"]!;
+ if (paymentData.message != null) {
+ noteController.text = paymentData.message!;
+ } else if (paymentData.label != null) {
+ noteController.text = paymentData.label!;
}
// autofill amount field
- if (results["amount"] != null) {
- final Amount amount = Decimal.parse(results["amount"]!).toAmount(
+ if (paymentData.amount != null) {
+ final Amount amount = Decimal.parse(paymentData.amount!).toAmount(
fractionDigits: tokenContract.decimals,
);
cryptoAmountController.text = ref.read(pAmountFormatter(coin)).format(
@@ -198,12 +203,8 @@ class _TokenSendViewState extends ConsumerState {
});
// now check for non standard encoded basic address
- } else if (ref
- .read(pWallets)
- .getWallet(walletId)
- .cryptoCurrency
- .validateAddress(qrResult.rawContent)) {
- _address = qrResult.rawContent.trim();
+ } else {
+ _address = qrResult.rawContent.split("\n").first.trim();
sendToController.text = _address ?? "";
_updatePreviewButtonState(_address, _amountToSend);
diff --git a/lib/pages/settings_views/global_settings_view/about_view.dart b/lib/pages/settings_views/global_settings_view/about_view.dart
index f4c3eb7ec..b72c3222c 100644
--- a/lib/pages/settings_views/global_settings_view/about_view.dart
+++ b/lib/pages/settings_views/global_settings_view/about_view.dart
@@ -272,48 +272,48 @@ class AboutView extends ConsumerWidget {
const SizedBox(
height: 12,
),
- if (AppConfig.coins.whereType().isNotEmpty)
- FutureBuilder(
- future: GitStatus.getMoneroCommitStatus(),
- builder: (
- context,
- AsyncSnapshot snapshot,
- ) {
- CommitStatus stateOfCommit =
- CommitStatus.notLoaded;
-
- if (snapshot.connectionState ==
- ConnectionState.done &&
- snapshot.hasData) {
- stateOfCommit = snapshot.data!;
- }
- return RoundedWhiteContainer(
- child: Column(
- crossAxisAlignment:
- CrossAxisAlignment.stretch,
- children: [
- Text(
- "Monero Build Commit",
- style: STextStyles.titleBold12(context),
- ),
- const SizedBox(
- height: 4,
- ),
- SelectableText(
- GitStatus.moneroCommit,
- style: GitStatus.styleForStatus(
- stateOfCommit,
- context,
- ),
- ),
- ],
- ),
- );
- },
- ),
- const SizedBox(
- height: 12,
- ),
+ // if (AppConfig.coins.whereType().isNotEmpty)
+ // FutureBuilder(
+ // future: GitStatus.getMoneroCommitStatus(),
+ // builder: (
+ // context,
+ // AsyncSnapshot snapshot,
+ // ) {
+ // CommitStatus stateOfCommit =
+ // CommitStatus.notLoaded;
+ //
+ // if (snapshot.connectionState ==
+ // ConnectionState.done &&
+ // snapshot.hasData) {
+ // stateOfCommit = snapshot.data!;
+ // }
+ // return RoundedWhiteContainer(
+ // child: Column(
+ // crossAxisAlignment:
+ // CrossAxisAlignment.stretch,
+ // children: [
+ // Text(
+ // "Monero Build Commit",
+ // style: STextStyles.titleBold12(context),
+ // ),
+ // const SizedBox(
+ // height: 4,
+ // ),
+ // SelectableText(
+ // GitStatus.moneroCommit,
+ // style: GitStatus.styleForStatus(
+ // stateOfCommit,
+ // context,
+ // ),
+ // ),
+ // ],
+ // ),
+ // );
+ // },
+ // ),
+ // const SizedBox(
+ // height: 12,
+ // ),
RoundedWhiteContainer(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
diff --git a/lib/pages/settings_views/global_settings_view/advanced_views/debug_view.dart b/lib/pages/settings_views/global_settings_view/advanced_views/debug_view.dart
index 81297430e..92e5cc256 100644
--- a/lib/pages/settings_views/global_settings_view/advanced_views/debug_view.dart
+++ b/lib/pages/settings_views/global_settings_view/advanced_views/debug_view.dart
@@ -18,7 +18,7 @@ import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_libepiccash/git_versions.dart' as EPIC_VERSIONS;
-import 'package:flutter_libmonero/git_versions.dart' as MONERO_VERSIONS;
+// import 'package:flutter_libmonero/git_versions.dart' as MONERO_VERSIONS;
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_svg/svg.dart';
import 'package:lelantus/git_versions.dart' as FIRO_VERSIONS;
@@ -313,8 +313,8 @@ class _DebugViewState extends ConsumerState {
FIRO_VERSIONS.getPluginVersion();
final String epicCashCommit =
EPIC_VERSIONS.getPluginVersion();
- final String moneroCommit =
- MONERO_VERSIONS.getPluginVersion();
+ // final String moneroCommit =
+ // MONERO_VERSIONS.getPluginVersion();
final DeviceInfoPlugin deviceInfoPlugin =
DeviceInfoPlugin();
final deviceInfo =
@@ -347,7 +347,7 @@ class _DebugViewState extends ConsumerState {
"appName": appName,
"firoCommit": firoCommit,
"epicCashCommit": epicCashCommit,
- "moneroCommit": moneroCommit,
+ // "moneroCommit": moneroCommit,
"deviceInfoMap": deviceInfoMap,
"errorLogs": errorLogs,
};
diff --git a/lib/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/manage_coin_units_view.dart b/lib/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/manage_coin_units_view.dart
index cd2f7d231..28ebe18a9 100644
--- a/lib/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/manage_coin_units_view.dart
+++ b/lib/pages/settings_views/global_settings_view/advanced_views/manage_coin_units/manage_coin_units_view.dart
@@ -3,9 +3,9 @@ import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_svg/svg.dart';
-import 'edit_coin_units_view.dart';
-import '../../../../../providers/global/prefs_provider.dart';
+
import '../../../../../app_config.dart';
+import '../../../../../providers/global/prefs_provider.dart';
import '../../../../../themes/coin_icon_provider.dart';
import '../../../../../themes/stack_colors.dart';
import '../../../../../utilities/assets.dart';
@@ -18,6 +18,7 @@ import '../../../../../widgets/custom_buttons/app_bar_icon_button.dart';
import '../../../../../widgets/desktop/desktop_dialog.dart';
import '../../../../../widgets/desktop/desktop_dialog_close_button.dart';
import '../../../../../widgets/rounded_white_container.dart';
+import 'edit_coin_units_view.dart';
class ManageCoinUnitsView extends ConsumerWidget {
const ManageCoinUnitsView({super.key});
@@ -44,13 +45,9 @@ class ManageCoinUnitsView extends ConsumerWidget {
prefsChangeNotifierProvider.select((value) => value.showTestNetCoins),
);
- final _coins = AppConfig.coins
- .where((e) => e is! Firo && e.network != CryptoCurrencyNetwork.test)
- .toList();
-
final coins = showTestNet
- ? _coins
- : _coins.where((e) => e.network != CryptoCurrencyNetwork.test).toList();
+ ? AppConfig.coins
+ : AppConfig.coins.where((e) => !e.network.isTestNet).toList();
return ConditionalParent(
condition: Util.isDesktop,
diff --git a/lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart b/lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
index 478440c99..7888635b7 100644
--- a/lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
+++ b/lib/pages/settings_views/global_settings_view/manage_nodes_views/add_edit_node_view.dart
@@ -29,7 +29,7 @@ import '../../../../utilities/text_styles.dart';
import '../../../../utilities/util.dart';
import '../../../../wallets/crypto_currency/crypto_currency.dart';
import '../../../../wallets/crypto_currency/intermediate/cryptonote_currency.dart';
-import '../../../../wallets/wallet/wallet_mixin_interfaces/cw_based_interface.dart';
+import '../../../../wallets/wallet/intermediate/lib_monero_wallet.dart';
import '../../../../widgets/background.dart';
import '../../../../widgets/conditional_parent.dart';
import '../../../../widgets/custom_buttons/app_bar_icon_button.dart';
@@ -222,7 +222,7 @@ class _AddEditNodeViewState extends ConsumerState {
// strip unused path
String address = formData.host!;
- if (coin is CwBasedInterface) {
+ if (coin is LibMoneroWallet) {
if (address.startsWith("http")) {
final uri = Uri.parse(address);
address = "${uri.scheme}://${uri.host}";
@@ -837,7 +837,7 @@ class _NodeFormState extends ConsumerState {
} else {
enableSSLCheckbox = true;
}
- } else if (widget.coin is CwBasedInterface) {
+ } else if (widget.coin is LibMoneroWallet) {
if (newValue.startsWith("https://")) {
_useSSL = true;
} else if (newValue.startsWith("http://")) {
@@ -1052,7 +1052,7 @@ class _NodeFormState extends ConsumerState {
),
],
),
- if (widget.coin is CwBasedInterface)
+ if (widget.coin is LibMoneroWallet)
Row(
children: [
GestureDetector(
diff --git a/lib/pages/settings_views/global_settings_view/manage_nodes_views/manage_nodes_view.dart b/lib/pages/settings_views/global_settings_view/manage_nodes_views/manage_nodes_view.dart
index e44d352f4..a7756f662 100644
--- a/lib/pages/settings_views/global_settings_view/manage_nodes_views/manage_nodes_view.dart
+++ b/lib/pages/settings_views/global_settings_view/manage_nodes_views/manage_nodes_view.dart
@@ -62,7 +62,7 @@ class _ManageNodesViewState extends ConsumerState {
final coins = showTestNet
? _coins
- : _coins.where((e) => e.network != CryptoCurrencyNetwork.test).toList();
+ : _coins.where((e) => !e.network.isTestNet).toList();
return Background(
child: Scaffold(
diff --git a/lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart b/lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart
index d0f964116..6d99938b3 100644
--- a/lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart
+++ b/lib/pages/settings_views/global_settings_view/stack_backup_views/helpers/restore_create_backup.dart
@@ -18,7 +18,7 @@ import 'package:isar/isar.dart';
import 'package:stack_wallet_backup/stack_wallet_backup.dart';
import 'package:tuple/tuple.dart';
import 'package:uuid/uuid.dart';
-import 'package:wakelock/wakelock.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
import '../../../../../app_config.dart';
import '../../../../../db/hive/db.dart';
@@ -27,6 +27,7 @@ import '../../../../../models/exchange/change_now/exchange_transaction.dart';
import '../../../../../models/exchange/response_objects/trade.dart';
import '../../../../../models/isar/models/contact_entry.dart';
import '../../../../../models/isar/models/transaction_note.dart';
+import '../../../../../models/keys/view_only_wallet_data.dart';
import '../../../../../models/node_model.dart';
import '../../../../../models/stack_restoring_ui_state.dart';
import '../../../../../models/trade_wallet_lookup.dart';
@@ -54,10 +55,11 @@ import '../../../../../wallets/wallet/impl/bitcoin_frost_wallet.dart';
import '../../../../../wallets/wallet/impl/epiccash_wallet.dart';
import '../../../../../wallets/wallet/impl/monero_wallet.dart';
import '../../../../../wallets/wallet/impl/wownero_wallet.dart';
+import '../../../../../wallets/wallet/intermediate/lib_monero_wallet.dart';
import '../../../../../wallets/wallet/wallet.dart';
-import '../../../../../wallets/wallet/wallet_mixin_interfaces/cw_based_interface.dart';
import '../../../../../wallets/wallet/wallet_mixin_interfaces/mnemonic_interface.dart';
import '../../../../../wallets/wallet/wallet_mixin_interfaces/private_key_interface.dart';
+import '../../../../../wallets/wallet/wallet_mixin_interfaces/view_only_option_interface.dart';
class PreRestoreState {
final Set walletIds;
@@ -312,7 +314,10 @@ abstract class SWB {
backupWallet['isFavorite'] = wallet.info.isFavourite;
backupWallet['otherDataJsonString'] = wallet.info.otherDataJsonString;
- if (wallet is MnemonicInterface) {
+ if (wallet is ViewOnlyOptionInterface && wallet.isViewOnly) {
+ backupWallet['viewOnlyWalletDataKey'] =
+ (await wallet.getViewOnlyWalletData()).toJsonEncodedString();
+ } else if (wallet is MnemonicInterface) {
backupWallet['mnemonic'] = await wallet.getMnemonic();
backupWallet['mnemonicPassphrase'] =
await wallet.getMnemonicPassphrase();
@@ -419,7 +424,16 @@ abstract class SWB {
String? mnemonic, mnemonicPassphrase, privateKey;
- if (walletbackup['mnemonic'] == null) {
+ ViewOnlyWalletData? viewOnlyData;
+ if (info.isViewOnly) {
+ final viewOnlyDataEncoded =
+ walletbackup['viewOnlyWalletDataKey'] as String;
+
+ viewOnlyData = ViewOnlyWalletData.fromJsonEncodedString(
+ viewOnlyDataEncoded,
+ walletId: info.walletId,
+ );
+ } else if (walletbackup['mnemonic'] == null) {
// probably private key based
if (walletbackup['privateKey'] != null) {
privateKey = walletbackup['privateKey'] as String;
@@ -486,6 +500,7 @@ abstract class SWB {
mnemonic: mnemonic,
mnemonicPassphrase: mnemonicPassphrase,
privateKey: privateKey,
+ viewOnlyData: viewOnlyData,
);
if (wallet is MoneroWallet /*|| wallet is WowneroWallet doesn't work.*/) {
@@ -503,7 +518,7 @@ abstract class SWB {
Future? restoringFuture;
- if (!(wallet is CwBasedInterface || wallet is EpiccashWallet)) {
+ if (!(wallet is LibMoneroWallet || wallet is EpiccashWallet)) {
if (wallet is BitcoinFrostWallet) {
restoringFuture = wallet.recover(
isRescan: false,
@@ -700,7 +715,7 @@ abstract class SWB {
StackRestoringUIState? uiState,
SecureStorageInterface secureStorageInterface,
) async {
- if (!Platform.isLinux) await Wakelock.enable();
+ if (!Platform.isLinux) await WakelockPlus.enable();
Logging.instance.log(
"SWB creating temp backup",
@@ -914,7 +929,7 @@ abstract class SWB {
await status;
}
- if (!Platform.isLinux) await Wakelock.disable();
+ if (!Platform.isLinux) await WakelockPlus.disable();
// check if cancel was requested and restore previous state
if (_checkShouldCancel(
preRestoreState,
diff --git a/lib/pages/settings_views/sub_widgets/view_only_wallet_data_widget.dart b/lib/pages/settings_views/sub_widgets/view_only_wallet_data_widget.dart
new file mode 100644
index 000000000..265986087
--- /dev/null
+++ b/lib/pages/settings_views/sub_widgets/view_only_wallet_data_widget.dart
@@ -0,0 +1,86 @@
+import 'package:flutter/material.dart';
+
+import '../../../models/keys/view_only_wallet_data.dart';
+import '../../../utilities/util.dart';
+import '../../../widgets/custom_buttons/simple_copy_button.dart';
+import '../../../widgets/detail_item.dart';
+import '../../wallet_view/transaction_views/transaction_details_view.dart';
+
+class ViewOnlyWalletDataWidget extends StatelessWidget {
+ const ViewOnlyWalletDataWidget({
+ super.key,
+ required this.data,
+ });
+
+ final ViewOnlyWalletData data;
+
+ @override
+ Widget build(BuildContext context) {
+ return switch (data) {
+ final CryptonoteViewOnlyWalletData e => Column(
+ crossAxisAlignment: CrossAxisAlignment.stretch,
+ children: [
+ DetailItem(
+ title: "Address",
+ detail: e.address,
+ button: Util.isDesktop
+ ? IconCopyButton(
+ data: e.address,
+ )
+ : SimpleCopyButton(
+ data: e.address,
+ ),
+ ),
+ const SizedBox(
+ height: 16,
+ ),
+ DetailItem(
+ title: "Private view key",
+ detail: e.privateViewKey,
+ button: Util.isDesktop
+ ? IconCopyButton(
+ data: e.privateViewKey,
+ )
+ : SimpleCopyButton(
+ data: e.privateViewKey,
+ ),
+ ),
+ ],
+ ),
+ final AddressViewOnlyWalletData e => Column(
+ crossAxisAlignment: CrossAxisAlignment.stretch,
+ children: [
+ DetailItem(
+ title: "Address",
+ detail: e.address,
+ button: Util.isDesktop
+ ? IconCopyButton(
+ data: e.address,
+ )
+ : SimpleCopyButton(
+ data: e.address,
+ ),
+ ),
+ ],
+ ),
+ final ExtendedKeysViewOnlyWalletData e => Column(
+ crossAxisAlignment: CrossAxisAlignment.stretch,
+ children: [
+ ...e.xPubs.map(
+ (xPub) => DetailItem(
+ title: xPub.path,
+ detail: xPub.encoded,
+ button: Util.isDesktop
+ ? IconCopyButton(
+ data: xPub.encoded,
+ )
+ : SimpleCopyButton(
+ data: xPub.encoded,
+ ),
+ ),
+ ),
+ ],
+ ),
+ };
+ }
+}
diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart b/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart
index 95538ed10..75b8ca87b 100644
--- a/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart
+++ b/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_backup_view.dart
@@ -17,6 +17,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../../../app_config.dart';
import '../../../../models/keys/cw_key_data.dart';
import '../../../../models/keys/key_data_interface.dart';
+import '../../../../models/keys/view_only_wallet_data.dart';
import '../../../../models/keys/xpriv_data.dart';
import '../../../../notifications/show_flush_bar.dart';
import '../../../../themes/stack_colors.dart';
@@ -39,6 +40,7 @@ import '../../../../widgets/rounded_white_container.dart';
import '../../../../widgets/stack_dialog.dart';
import '../../../add_wallet_views/new_wallet_recovery_phrase_view/sub_widgets/mnemonic_table.dart';
import '../../../wallet_view/transaction_views/transaction_details_view.dart';
+import '../../sub_widgets/view_only_wallet_data_widget.dart';
import 'cn_wallet_keys.dart';
import 'wallet_xprivs.dart';
@@ -87,9 +89,10 @@ class WalletBackupView extends ConsumerWidget {
Padding(
padding: const EdgeInsets.all(10),
child: CustomTextButton(
- text: switch (keyData.runtimeType) {
- const (XPrivData) => "xpriv(s)",
- const (CWKeyData) => "keys",
+ text: switch (keyData) {
+ final XPrivData _ => "xpriv(s)",
+ final CWKeyData _ => "keys",
+ final ViewOnlyWalletData _ => "keys",
_ => throw UnimplementedError(
"Don't forget to add your KeyDataInterface here! ${keyData.runtimeType}",
),
@@ -426,7 +429,7 @@ class _FrostKeys extends StatelessWidget {
}
}
-class MobileKeyDataView extends StatelessWidget {
+class MobileKeyDataView extends ConsumerWidget {
const MobileKeyDataView({
super.key,
required this.walletId,
@@ -441,7 +444,7 @@ class MobileKeyDataView extends StatelessWidget {
final KeyDataInterface keyData;
@override
- Widget build(BuildContext context) {
+ Widget build(BuildContext context, WidgetRef ref) {
return Background(
child: Scaffold(
backgroundColor: Theme.of(context).extension()!.background,
@@ -452,9 +455,10 @@ class MobileKeyDataView extends StatelessWidget {
},
),
title: Text(
- "Wallet ${switch (keyData.runtimeType) {
- const (XPrivData) => "xpriv(s)",
- const (CWKeyData) => "keys",
+ "Wallet ${switch (keyData) {
+ final XPrivData _ => "xpriv(s)",
+ final CWKeyData _ => "keys",
+ final ViewOnlyWalletData _ => "keys",
_ => throw UnimplementedError(
"Don't forget to add your KeyDataInterface here!",
),
@@ -474,14 +478,18 @@ class MobileKeyDataView extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
children: [
Expanded(
- child: switch (keyData.runtimeType) {
- const (XPrivData) => WalletXPrivs(
+ child: switch (keyData) {
+ final XPrivData e => WalletXPrivs(
walletId: walletId,
- xprivData: keyData as XPrivData,
+ xprivData: e,
),
- const (CWKeyData) => CNWalletKeys(
+ final CWKeyData e => CNWalletKeys(
walletId: walletId,
- cwKeyData: keyData as CWKeyData,
+ cwKeyData: e,
+ ),
+ final ViewOnlyWalletData e =>
+ ViewOnlyWalletDataWidget(
+ data: e,
),
_ => throw UnimplementedError(
"Don't forget to add your KeyDataInterface here!",
diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_xprivs.dart b/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_xprivs.dart
index 594db33a7..264032961 100644
--- a/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_xprivs.dart
+++ b/lib/pages/settings_views/wallet_settings_view/wallet_backup_views/wallet_xprivs.dart
@@ -49,7 +49,7 @@ class WalletXPrivsState extends ConsumerState {
late String _currentDropDownValue;
String _current(String key) =>
- widget.xprivData.xprivs.firstWhere((e) => e.path == key).xpriv;
+ widget.xprivData.xprivs.firstWhere((e) => e.path == key).encoded;
Future _copy() async {
await widget.clipboardInterface.setData(
diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_network_settings_view/wallet_network_settings_view.dart b/lib/pages/settings_views/wallet_settings_view/wallet_network_settings_view/wallet_network_settings_view.dart
index e15fad011..1be577f1d 100644
--- a/lib/pages/settings_views/wallet_settings_view/wallet_network_settings_view/wallet_network_settings_view.dart
+++ b/lib/pages/settings_views/wallet_settings_view/wallet_network_settings_view/wallet_network_settings_view.dart
@@ -16,7 +16,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_svg/svg.dart';
import 'package:tuple/tuple.dart';
-import 'package:wakelock/wakelock.dart';
+import 'package:wakelock_plus/wakelock_plus.dart';
import '../../../../providers/providers.dart';
import '../../../../route_generator.dart';
@@ -125,7 +125,7 @@ class _WalletNetworkSettingsViewState
}
Future _attemptRescan() async {
- if (!Platform.isLinux) await Wakelock.enable();
+ if (!Platform.isLinux) await WakelockPlus.enable();
try {
if (mounted) {
@@ -180,7 +180,7 @@ class _WalletNetworkSettingsViewState
);
}
} catch (e) {
- if (!Platform.isLinux) await Wakelock.disable();
+ if (!Platform.isLinux) await WakelockPlus.disable();
if (mounted) {
// pop rescanning dialog
@@ -212,7 +212,7 @@ class _WalletNetworkSettingsViewState
}
}
} finally {
- if (!Platform.isLinux) await Wakelock.disable();
+ if (!Platform.isLinux) await WakelockPlus.disable();
}
}
diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_settings_view.dart b/lib/pages/settings_views/wallet_settings_view/wallet_settings_view.dart
index 6985bb00c..4948876bd 100644
--- a/lib/pages/settings_views/wallet_settings_view/wallet_settings_view.dart
+++ b/lib/pages/settings_views/wallet_settings_view/wallet_settings_view.dart
@@ -19,6 +19,7 @@ import '../../../db/hive/db.dart';
import '../../../db/sqlite/firo_cache.dart';
import '../../../models/epicbox_config_model.dart';
import '../../../models/keys/key_data_interface.dart';
+import '../../../models/keys/view_only_wallet_data.dart';
import '../../../notifications/show_flush_bar.dart';
import '../../../providers/global/wallets_provider.dart';
import '../../../providers/ui/transaction_filter_provider.dart';
@@ -36,9 +37,10 @@ import '../../../wallets/crypto_currency/intermediate/frost_currency.dart';
import '../../../wallets/crypto_currency/intermediate/nano_currency.dart';
import '../../../wallets/wallet/impl/bitcoin_frost_wallet.dart';
import '../../../wallets/wallet/impl/epiccash_wallet.dart';
-import '../../../wallets/wallet/wallet_mixin_interfaces/cw_based_interface.dart';
+import '../../../wallets/wallet/intermediate/lib_monero_wallet.dart';
import '../../../wallets/wallet/wallet_mixin_interfaces/extended_keys_interface.dart';
import '../../../wallets/wallet/wallet_mixin_interfaces/mnemonic_interface.dart';
+import '../../../wallets/wallet/wallet_mixin_interfaces/view_only_option_interface.dart';
import '../../../widgets/background.dart';
import '../../../widgets/custom_buttons/app_bar_icon_button.dart';
import '../../../widgets/desktop/secondary_button.dart';
@@ -98,8 +100,13 @@ class _WalletSettingsViewState extends ConsumerState {
void initState() {
walletId = widget.walletId;
coin = widget.coin;
- xPubEnabled =
- ref.read(pWallets).getWallet(walletId) is ExtendedKeysInterface;
+
+ final wallet = ref.read(pWallets).getWallet(walletId);
+ if (wallet is ViewOnlyOptionInterface && wallet.isViewOnly) {
+ xPubEnabled = false;
+ } else {
+ xPubEnabled = wallet is ExtendedKeysInterface;
+ }
xpub = "";
@@ -165,6 +172,15 @@ class _WalletSettingsViewState extends ConsumerState {
@override
Widget build(BuildContext context) {
debugPrint("BUILD: $runtimeType");
+ final wallet = ref.read(pWallets).getWallet(widget.walletId);
+
+ bool canBackup = true;
+ if (wallet is ViewOnlyOptionInterface &&
+ wallet.isViewOnly &&
+ wallet.viewOnlyType == ViewOnlyWalletType.addressOnly) {
+ canBackup = false;
+ }
+
return Background(
child: Scaffold(
backgroundColor: Theme.of(context).extension()!.background,
@@ -247,106 +263,155 @@ class _WalletSettingsViewState extends ConsumerState {
);
},
),
- const SizedBox(
- height: 8,
- ),
- Consumer(
- builder: (_, ref, __) {
- return SettingsListButton(
- iconAssetName: Assets.svg.lock,
- iconSize: 16,
- title: "Wallet backup",
- onPressed: () async {
- final wallet = ref
- .read(pWallets)
- .getWallet(widget.walletId);
+ if (canBackup)
+ const SizedBox(
+ height: 8,
+ ),
+ if (canBackup)
+ Consumer(
+ builder: (_, ref, __) {
+ return SettingsListButton(
+ iconAssetName: Assets.svg.lock,
+ iconSize: 16,
+ title: "Wallet backup",
+ onPressed: () async {
+ // TODO: [prio=med] take wallets that don't have a mnemonic into account
- // TODO: [prio=med] take wallets that don't have a mnemonic into account
-
- List? mnemonic;
- ({
- String myName,
- String config,
- String keys,
+ List? mnemonic;
({
+ String myName,
String config,
- String keys
- })? prevGen,
- })? frostWalletData;
- if (wallet is BitcoinFrostWallet) {
- final futures = [
- wallet.getSerializedKeys(),
- wallet.getMultisigConfig(),
- wallet.getSerializedKeysPrevGen(),
- wallet.getMultisigConfigPrevGen(),
- ];
+ String keys,
+ ({
+ String config,
+ String keys
+ })? prevGen,
+ })? frostWalletData;
+ if (wallet is BitcoinFrostWallet) {
+ final futures = [
+ wallet.getSerializedKeys(),
+ wallet.getMultisigConfig(),
+ wallet.getSerializedKeysPrevGen(),
+ wallet.getMultisigConfigPrevGen(),
+ ];
- final results =
- await Future.wait(futures);
+ final results =
+ await Future.wait(futures);
- if (results.length == 4) {
- frostWalletData = (
- myName: wallet.frostInfo.myName,
- config: results[1]!,
- keys: results[0]!,
- prevGen: results[2] == null ||
- results[3] == null
- ? null
- : (
- config: results[3]!,
- keys: results[2]!,
- ),
- );
+ if (results.length == 4) {
+ frostWalletData = (
+ myName: wallet.frostInfo.myName,
+ config: results[1]!,
+ keys: results[0]!,
+ prevGen: results[2] == null ||
+ results[3] == null
+ ? null
+ : (
+ config: results[3]!,
+ keys: results[2]!,
+ ),
+ );
+ }
+ } else {
+ if (wallet is MnemonicInterface) {
+ if (wallet
+ is ViewOnlyOptionInterface &&
+ !(wallet
+ as ViewOnlyOptionInterface)
+ .isViewOnly) {
+ mnemonic = await wallet
+ .getMnemonicAsWords();
+ }
+ }
}
- } else if (wallet
- is MnemonicInterface) {
- mnemonic =
- await wallet.getMnemonicAsWords();
- }
- KeyDataInterface? keyData;
- if (wallet is ExtendedKeysInterface) {
- keyData = await wallet.getXPrivs();
- } else if (wallet is CwBasedInterface) {
- keyData = await wallet.getKeys();
- }
+ KeyDataInterface? keyData;
+ if (wallet
+ is ViewOnlyOptionInterface &&
+ wallet.isViewOnly) {
+ keyData = await wallet
+ .getViewOnlyWalletData();
+ } else if (wallet
+ is ExtendedKeysInterface) {
+ keyData = await wallet.getXPrivs();
+ } else if (wallet
+ is LibMoneroWallet) {
+ keyData = await wallet.getKeys();
+ }
- if (context.mounted) {
- await Navigator.push(
- context,
- RouteGenerator.getRoute(
- shouldUseMaterialRoute:
- RouteGenerator
- .useMaterialPageRoute,
- builder: (_) => LockscreenView(
- routeOnSuccessArguments: (
- walletId: walletId,
- mnemonic: mnemonic ?? [],
- frostWalletData:
- frostWalletData,
- keyData: keyData,
+ if (context.mounted) {
+ if (keyData != null &&
+ wallet
+ is ViewOnlyOptionInterface &&
+ wallet.isViewOnly) {
+ await Navigator.push(
+ context,
+ RouteGenerator.getRoute(
+ shouldUseMaterialRoute:
+ RouteGenerator
+ .useMaterialPageRoute,
+ builder: (_) =>
+ LockscreenView(
+ routeOnSuccessArguments: (
+ walletId: walletId,
+ keyData: keyData,
+ ),
+ showBackButton: true,
+ routeOnSuccess:
+ MobileKeyDataView
+ .routeName,
+ biometricsCancelButtonString:
+ "CANCEL",
+ biometricsLocalizedReason:
+ "Authenticate to view recovery data",
+ biometricsAuthenticationTitle:
+ "View recovery data",
+ ),
+ settings: const RouteSettings(
+ name:
+ "/viewRecoveryDataLockscreen",
+ ),
),
- showBackButton: true,
- routeOnSuccess:
- WalletBackupView.routeName,
- biometricsCancelButtonString:
- "CANCEL",
- biometricsLocalizedReason:
- "Authenticate to view recovery phrase",
- biometricsAuthenticationTitle:
- "View recovery phrase",
- ),
- settings: const RouteSettings(
- name:
- "/viewRecoverPhraseLockscreen",
- ),
- ),
- );
- }
- },
- );
- },
- ),
+ );
+ } else {
+ await Navigator.push(
+ context,
+ RouteGenerator.getRoute(
+ shouldUseMaterialRoute:
+ RouteGenerator
+ .useMaterialPageRoute,
+ builder: (_) =>
+ LockscreenView(
+ routeOnSuccessArguments: (
+ walletId: walletId,
+ mnemonic: mnemonic ?? [],
+ frostWalletData:
+ frostWalletData,
+ keyData: keyData,
+ ),
+ showBackButton: true,
+ routeOnSuccess:
+ WalletBackupView
+ .routeName,
+ biometricsCancelButtonString:
+ "CANCEL",
+ biometricsLocalizedReason:
+ "Authenticate to view recovery phrase",
+ biometricsAuthenticationTitle:
+ "View recovery phrase",
+ ),
+ settings: const RouteSettings(
+ name:
+ "/viewRecoverPhraseLockscreen",
+ ),
+ ),
+ );
+ }
+ }
+ },
+ );
+ },
+ ),
const SizedBox(
height: 8,
),
diff --git a/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_view_only_wallet_keys_view.dart b/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_view_only_wallet_keys_view.dart
new file mode 100644
index 000000000..d2d2bef2a
--- /dev/null
+++ b/lib/pages/settings_views/wallet_settings_view/wallet_settings_wallet_settings/delete_view_only_wallet_keys_view.dart
@@ -0,0 +1,177 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../../../app_config.dart';
+import '../../../../models/keys/view_only_wallet_data.dart';
+import '../../../../pages_desktop_specific/my_stack_view/wallet_view/sub_widgets/delete_wallet_keys_popup.dart';
+import '../../../../providers/global/secure_store_provider.dart';
+import '../../../../providers/global/wallets_provider.dart';
+import '../../../../route_generator.dart';
+import '../../../../themes/stack_colors.dart';
+import '../../../../utilities/text_styles.dart';
+import '../../../../utilities/util.dart';
+import '../../../../wallets/isar/providers/wallet_info_provider.dart';
+import '../../../../widgets/conditional_parent.dart';
+import '../../../../widgets/custom_buttons/app_bar_icon_button.dart';
+import '../../../../widgets/desktop/primary_button.dart';
+import '../../../../widgets/rounded_white_container.dart';
+import '../../../../widgets/stack_dialog.dart';
+import '../../../home_view/home_view.dart';
+import '../../sub_widgets/view_only_wallet_data_widget.dart';
+
+class DeleteViewOnlyWalletKeysView extends ConsumerStatefulWidget {
+ const DeleteViewOnlyWalletKeysView({
+ super.key,
+ required this.walletId,
+ required this.data,
+ });
+
+ static const routeName = "/deleteWalletViewOnlyData";
+
+ final String walletId;
+ final ViewOnlyWalletData data;
+
+ @override
+ ConsumerState createState() =>
+ _DeleteViewOnlyWalletKeysViewState();
+}
+
+class _DeleteViewOnlyWalletKeysViewState
+ extends ConsumerState {
+ bool _lock = false;
+ void _continuePressed() async {
+ if (_lock) {
+ return;
+ }
+ _lock = true;
+ try {
+ if (Util.isDesktop) {
+ await Navigator.of(context).push(
+ RouteGenerator.getRoute(
+ builder: (context) {
+ return ConfirmDelete(
+ walletId: widget.walletId,
+ );
+ },
+ settings: const RouteSettings(
+ name: "/desktopConfirmDelete",
+ ),
+ ),
+ );
+ } else {
+ await showDialog(
+ barrierDismissible: true,
+ context: context,
+ builder: (_) => StackDialog(
+ title: "Thanks! Your wallet will be deleted.",
+ leftButton: TextButton(
+ style: Theme.of(context)
+ .extension()!
+ .getSecondaryEnabledButtonStyle(context),
+ onPressed: () {
+ Navigator.pop(context);
+ },
+ child: Text(
+ "Cancel",
+ style: STextStyles.button(context).copyWith(
+ color: Theme.of(context)
+ .extension