Merge branch 'remove-other-coins' into main

# Conflicts: # lib/utilities/address_utils.dart # lib/utilities/enums/coin_enum.dart
cypherstack · Mar 17, 2023 · 0d4a53f · 0d4a53f
2 parents 78daa1d + 36a064d
commit 0d4a53f
Show file tree

Hide file tree

Showing 73 changed files with 200 additions and 21,189 deletions.
diff --git a/lib/models/epicbox_config_model.dart b/lib/models/epicbox_config_model.dart
diff --git a/lib/models/epicbox_server_model.dart b/lib/models/epicbox_server_model.dart
diff --git a/lib/models/paymint/transactions_model.dart b/lib/models/paymint/transactions_model.dart
@@ -213,38 +213,6 @@ class Transaction {
     );
   }
 
-  factory Transaction.fromLelantusJson(Map<String, dynamic> json) {
-    return Transaction(
-      txid: json['txid'] as String,
-      confirmedStatus: json['confirmed_status'] as bool? ?? false,
-      timestamp: json['timestamp'] as int? ??
-          (DateTime.now().millisecondsSinceEpoch ~/ 1000),
-      txType: json['txType'] as String,
-      amount: (Decimal.parse(json["amount"].toString()) *
-              Decimal.fromInt(Constants.satsPerCoin(Coin
-                  .firo))) // dirty hack but we need 8 decimal places here to keep consistent data structure
-          .toBigInt()
-          .toInt(),
-      aliens: [],
-      worthNow: json['worthNow'] as String,
-      worthAtBlockTimestamp: json['worthAtBlockTimestamp'] as String? ?? "0",
-      fees: (Decimal.parse(json["fees"].toString()) *
-              Decimal.fromInt(Constants.satsPerCoin(Coin
-                  .firo))) // dirty hack but we need 8 decimal places here to keep consistent data structure
-          .toBigInt()
-          .toInt(),
-      inputSize: json['inputSize'] as int? ?? 0,
-      outputSize: json['outputSize'] as int? ?? 0,
-      inputs: [],
-      outputs: [],
-      address: json["address"] as String,
-      height: json["height"] as int? ?? int64MaxValue,
-      subType: json["subType"] as String? ?? "",
-      confirmations: json["confirmations"] as int? ?? 0,
-      otherData: json["otherData"] as String?,
-    );
-  }
-
   bool get isMinting => subType.toLowerCase() == "mint" && !confirmedStatus;
 
   Transaction copyWith({
@@ -393,10 +361,8 @@ class Output {
         scriptpubkeyAsm: json['scriptPubKey']['asm'] as String?,
         scriptpubkeyType: json['scriptPubKey']['type'] as String?,
         scriptpubkeyAddress: address,
-        value: (Decimal.parse(
-                    (json["value"] ?? 0).toString()) *
-                Decimal.fromInt(Constants.satsPerCoin(Coin
-                    .firo))) // dirty hack but we need 8 decimal places here to keep consistent data structure
+        value: (Decimal.parse((json["value"] ?? 0)
+                .toString())) // dirty hack but we need 8 decimal places here to keep consistent data structure
             .toBigInt()
             .toInt(),
       );
@@ -407,9 +373,8 @@ class Output {
           scriptpubkeyAsm: "",
           scriptpubkeyType: "",
           scriptpubkeyAddress: "",
-          value: (Decimal.parse(0.toString()) *
-                  Decimal.fromInt(Constants.satsPerCoin(Coin
-                      .firo))) // dirty hack but we need 8 decimal places here to keep consistent data structure
+          value: (Decimal.parse(0
+                  .toString())) // dirty hack but we need 8 decimal places here to keep consistent data structure
               .toBigInt()
               .toInt());
     }

diff --git a/lib/models/type_adaptors/epicbox_config_model.g.dart b/lib/models/type_adaptors/epicbox_config_model.g.dart
diff --git a/lib/models/type_adaptors/epicbox_server_model.g.dart b/lib/models/type_adaptors/epicbox_server_model.g.dart
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
@@ -45,9 +45,7 @@ class _AddWalletViewState extends State<AddWalletView> {
   void initState() {
     _searchFieldController = TextEditingController();
     _searchFocusNode = FocusNode();
-    coins.remove(Coin.firoTestNet);
     if (isDesktop) {
-      coins.remove(Coin.wownero);
       if (Platform.isWindows) {
         coins.remove(Coin.monero);
       }