app: Fix type error in eth transaction serialization.

OrchidTechnologies · Nov 21, 2024 · 6436d99 · 6436d99
1 parent 0ca99db
commit 6436d99
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/gui-orchid/lib/api/orchid_eth/eth_transaction.dart b/gui-orchid/lib/api/orchid_eth/eth_transaction.dart
@@ -15,12 +15,11 @@ class EthereumTransaction /*extends EthereumTransactionParams*/ {
   Map<String, dynamic> toJson() {
     // Export flat json
     var json = params.toJson();
-    json.addAll(<String, dynamic>{'data': data});
+    json['data'] = data;
+
     // Exclude nonce if null
     if (nonce != null) {
-      json.addAll({
-        'nonce': nonce, // decimal int
-      });
+      json['nonce'] = nonce;
     }
     return json;
   }
@@ -34,8 +33,7 @@ class EthereumTransaction /*extends EthereumTransactionParams*/ {
   @override
   bool operator ==(Object other) =>
       identical(this, other) ||
-      super == other &&
-          other is EthereumTransaction &&
+      other is EthereumTransaction &&
           runtimeType == other.runtimeType &&
           params == other.params &&
           data == other.data &&

diff --git a/gui-orchid/test/pac_transaction_test.dart b/gui-orchid/test/pac_transaction_test.dart
@@ -2,6 +2,7 @@ import 'dart:convert';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:orchid/api/orchid_crypto.dart';
 import 'package:orchid/api/orchid_eth/eth_transaction.dart';
+import 'package:orchid/api/orchid_keys.dart';
 import 'package:orchid/vpn/purchase/orchid_pac_transaction.dart';
 
 import 'expect.dart';