Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ class SolTokenEntity extends AddWalletListEntity {
String get ticker => token.symbol;

@override
List<Object?> get props =>
[cryptoCurrency.identifier, name, ticker, token.address];
List<Object?> get props => [
cryptoCurrency.identifier,
name,
ticker,
token.address,
];
}
14 changes: 6 additions & 8 deletions lib/models/isar/models/blockchain_data/transaction.dart
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,12 @@ class Transaction {
slateId: json["slateId"] as String?,
otherData: json["otherData"] as String?,
nonce: json["nonce"] as int?,
inputs:
List<String>.from(
json["inputs"] as List,
).map((e) => Input.fromJsonString(e)).toList(),
outputs:
List<String>.from(
json["outputs"] as List,
).map((e) => Output.fromJsonString(e)).toList(),
inputs: List<String>.from(
json["inputs"] as List,
).map((e) => Input.fromJsonString(e)).toList(),
outputs: List<String>.from(
json["outputs"] as List,
).map((e) => Output.fromJsonString(e)).toList(),
numberOfMessages: json["numberOfMessages"] as int,
);
if (json["address"] == null) {
Expand Down
56 changes: 17 additions & 39 deletions lib/models/keys/view_only_wallet_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,15 @@ import '../../wallets/wallet/wallet_mixin_interfaces/extended_keys_interface.dar
import 'key_data_interface.dart';

// do not remove or change the order of these enum values
enum ViewOnlyWalletType {
cryptonote,
addressOnly,
xPub,
spark;
}
enum ViewOnlyWalletType { cryptonote, addressOnly, xPub, spark }

sealed class ViewOnlyWalletData with KeyDataInterface {
@override
final String walletId;

ViewOnlyWalletType get type;

ViewOnlyWalletData({
required this.walletId,
});
ViewOnlyWalletData({required this.walletId});

static ViewOnlyWalletData fromJsonEncodedString(
String jsonEncodedString, {
Expand Down Expand Up @@ -88,10 +81,10 @@ class CryptonoteViewOnlyWalletData extends ViewOnlyWalletData {

@override
String toJsonEncodedString() => jsonEncode({
"type": type.index,
"address": address,
"privateViewKey": privateViewKey,
});
"type": type.index,
"address": address,
"privateViewKey": privateViewKey,
});
}

class AddressViewOnlyWalletData extends ViewOnlyWalletData {
Expand All @@ -100,10 +93,7 @@ class AddressViewOnlyWalletData extends ViewOnlyWalletData {

final String address;

AddressViewOnlyWalletData({
required super.walletId,
required this.address,
});
AddressViewOnlyWalletData({required super.walletId, required this.address});

static AddressViewOnlyWalletData fromJsonEncodedString(
String jsonEncodedString, {
Expand All @@ -119,10 +109,8 @@ class AddressViewOnlyWalletData extends ViewOnlyWalletData {
}

@override
String toJsonEncodedString() => jsonEncode({
"type": type.index,
"address": address,
});
String toJsonEncodedString() =>
jsonEncode({"type": type.index, "address": address});
}

class ExtendedKeysViewOnlyWalletData extends ViewOnlyWalletData {
Expand Down Expand Up @@ -158,16 +146,11 @@ class ExtendedKeysViewOnlyWalletData extends ViewOnlyWalletData {

@override
String toJsonEncodedString() => jsonEncode({
"type": type.index,
"xPubs": [
...xPubs.map(
(e) => {
"path": e.path,
"encoded": e.encoded,
},
),
],
});
"type": type.index,
"xPubs": [
...xPubs.map((e) => {"path": e.path, "encoded": e.encoded}),
],
});
}

class SparkViewOnlyWalletData extends ViewOnlyWalletData {
Expand All @@ -176,10 +159,7 @@ class SparkViewOnlyWalletData extends ViewOnlyWalletData {

final String viewKey;

SparkViewOnlyWalletData({
required super.walletId,
required this.viewKey,
});
SparkViewOnlyWalletData({required super.walletId, required this.viewKey});

static SparkViewOnlyWalletData fromJsonEncodedString(
String jsonEncodedString, {
Expand All @@ -195,8 +175,6 @@ class SparkViewOnlyWalletData extends ViewOnlyWalletData {
}

@override
String toJsonEncodedString() => jsonEncode({
"type": type.index,
"viewKey": viewKey,
});
String toJsonEncodedString() =>
jsonEncode({"type": type.index, "viewKey": viewKey});
}
50 changes: 25 additions & 25 deletions lib/models/paynym/paynym_account.dart
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,24 @@ class PaynymAccount {
);

PaynymAccount.fromMap(Map<String, dynamic> map)
: nymID = map["nymID"] as String,
nymName = map["nymName"] as String,
segwit = map["segwit"] as bool,
codes = (map["codes"] as List<dynamic>)
.map((e) => PaynymCode.fromMap(Map<String, dynamic>.from(e as Map)))
.toList(),
followers = (map["followers"] as List<dynamic>)
.map(
(e) => PaynymAccountLite.fromMap(
Map<String, dynamic>.from(e as Map)),
)
.toList(),
following = (map["following"] as List<dynamic>)
.map(
(e) => PaynymAccountLite.fromMap(
Map<String, dynamic>.from(e as Map)),
)
.toList();
: nymID = map["nymID"] as String,
nymName = map["nymName"] as String,
segwit = map["segwit"] as bool,
codes = (map["codes"] as List<dynamic>)
.map((e) => PaynymCode.fromMap(Map<String, dynamic>.from(e as Map)))
.toList(),
followers = (map["followers"] as List<dynamic>)
.map(
(e) =>
PaynymAccountLite.fromMap(Map<String, dynamic>.from(e as Map)),
)
.toList(),
following = (map["following"] as List<dynamic>)
.map(
(e) =>
PaynymAccountLite.fromMap(Map<String, dynamic>.from(e as Map)),
)
.toList();

PaynymAccount copyWith({
String? nymID,
Expand All @@ -75,13 +75,13 @@ class PaynymAccount {
}

Map<String, dynamic> toMap() => {
"nymID": nymID,
"nymName": nymName,
"segwit": segwit,
"codes": codes.map((e) => e.toMap()),
"followers": followers.map((e) => e.toMap()),
"following": following.map((e) => e.toMap()),
};
"nymID": nymID,
"nymName": nymName,
"segwit": segwit,
"codes": codes.map((e) => e.toMap()),
"followers": followers.map((e) => e.toMap()),
"following": following.map((e) => e.toMap()),
};

@override
String toString() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,10 @@ class _EditWalletTokensViewState extends ConsumerState<EditWalletTokensView> {
}

Future<void> onNextPressed() async {
final selectedTokens =
tokenEntities
.where((e) => e.selected)
.map((e) => e.token.address)
.toList();
final selectedTokens = tokenEntities
.where((e) => e.selected)
.map((e) => e.token.address)
.toList();

final wallet = ref.read(pWallets).getWallet(widget.walletId);

Expand Down Expand Up @@ -177,7 +176,9 @@ class _EditWalletTokensViewState extends ConsumerState<EditWalletTokensView> {
tokenEntities.add(
AddTokenListElementData(contract!)..selected = true,
);
tokenEntities.sort((a, b) => a.token.name.compareTo(b.token.name));
tokenEntities.sort(
(a, b) => a.token.name.compareTo(b.token.name),
);
}
});
}
Expand All @@ -199,9 +200,7 @@ class _EditWalletTokensViewState extends ConsumerState<EditWalletTokensView> {
),
);
} else {
final result = await Navigator.of(
context,
).pushNamed(
final result = await Navigator.of(context).pushNamed(
AddCustomSolanaTokenView.routeName,
arguments: widget.walletId,
);
Expand All @@ -228,9 +227,7 @@ class _EditWalletTokensViewState extends ConsumerState<EditWalletTokensView> {
if (tokenEntities
.where((e) => e.token.address == token!.address)
.isEmpty) {
tokenEntities.add(
AddTokenListElementData(token!)..selected = true,
);
tokenEntities.add(AddTokenListElementData(token!)..selected = true);
tokenEntities.sort((a, b) => a.token.name.compareTo(b.token.name));
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ class AddTokenList extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
children: [
child,
AddCustomTokenSelector(
addFunction: addFunction!,
),
AddCustomTokenSelector(addFunction: addFunction!),
],
),
child: Padding(
Expand Down
Loading
Loading