Merge branch 'dev' into electrum

2026-05-09 07:52:13 +02:00 · 2026-03-31 22:28:45 +02:00
parent 129a5bb9b7 151960af3c
commit e5e0e6e911
19 changed files with 192 additions and 103 deletions
@@ -23,6 +23,11 @@
        types: ['default'],
        hasSubfee: false,
        hasSweepAll: true
+      },
+      13: { 
+        types: ['plain', 'spark'],
+        hasSubfee: true,
+        hasSweepAll: false
      }
    },

@@ -64,6 +69,17 @@
        }
      }
      
+      if (cid === 13) {
+        switch(selectedType) {
+          case 'plain':
+            return this.safeParseFloat(balances.main || balances.balance);
+          case 'spark':
+            return this.safeParseFloat(balances.spark);
+          default:
+            return this.safeParseFloat(balances.main || balances.balance);
+        }
+      }
+      
      return this.safeParseFloat(balances.main || balances.balance);
    },

@@ -188,7 +204,8 @@
      balance: balance,
      blind: balance2,
      anon: balance3,
-      mweb: balance2
+      mweb: balance2,
+      spark: balance2
    };
    WalletAmountManager.setAmount(percent, balances, coinId);
  };