app: Fixes for UI issue and PAC purchase.

OrchidTechnologies · Oct 25, 2023 · d0b5165 · d0b5165
1 parent a9cd509
commit d0b5165
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/gui-orchid/lib/api/orchid_eth/eth_transaction.dart b/gui-orchid/lib/api/orchid_eth/eth_transaction.dart
@@ -15,7 +15,7 @@ class EthereumTransaction /*extends EthereumTransactionParams*/ {
   Map<String, dynamic> toJson() {
     // Export flat json
     var json = params.toJson();
-    json.addAll({'data': data});
+    json.addAll(<String, dynamic>{'data': data});
     // Exclude nonce if null
     if (nonce != null) {
       json.addAll({

diff --git a/gui-orchid/lib/api/orchid_user_config/orchid_account_import.dart b/gui-orchid/lib/api/orchid_user_config/orchid_account_import.dart
@@ -101,8 +101,8 @@ class OrchidAccountImport {
       if (funder != null) {
         final version = config.evalIntDefault('account.version', 1);
         final chainid = config.evalIntDefault('account.chainid', 1);
-        final account = Account.fromSignerKeyRef(
-          signerKey: signer.ref(),
+        final account = Account.fromSignerKey(
+          signerKey: signer,
           funder: EthereumAddress.from(funder),
           version: version,
           chainId: chainid,

diff --git a/gui-orchid/lib/orchid/account/account_selector.dart b/gui-orchid/lib/orchid/account/account_selector.dart
@@ -93,13 +93,14 @@ class _AccountSelectorState extends State<AccountSelector> {
   }
 
   Widget _buildAccountCard(AccountViewModel accountModel, int index) {
-    bool single = widget.accounts.length == 1;
+    // bool single = widget.accounts.length == 1;
     return FittedBox(
       fit: BoxFit.scaleDown,
       child: AccountCard(
         key: Key(accountModel.toString()),
         accountDetail: accountModel.detail,
-        selected: single ? null : accountModel.active,
+        // selected: single ? null : accountModel.active,
+        selected: accountModel.active,
         onSelected: () {
           _toggleSelected(accountModel);
         },

diff --git a/gui-orchid/lib/pages/circuit/orchid_hop_page.dart b/gui-orchid/lib/pages/circuit/orchid_hop_page.dart
@@ -203,6 +203,7 @@ class _OrchidHopPageState extends State<OrchidHopPage> {
                 }
                 return AccountSelectorDialog(
                   accounts: accounts!.toList(),
+                  // accounts: [accounts!.first], // TEST single selection
                   singleSelection: true,
                   selectedAccounts: _selectedAccount != null
                       ? Set.from([_selectedAccount])
@@ -586,7 +587,7 @@ class _OrchidHopPageState extends State<OrchidHopPage> {
   }
 
   OrchidHop? get _hop {
-    return widget.editableHop.value?.hop as OrchidHop;
+    return widget.editableHop.value?.hop as OrchidHop?;
   }
 
   Account? get _account {

diff --git a/gui-orchid/lib/util/shared_preferences_extensions.dart b/gui-orchid/lib/util/shared_preferences_extensions.dart
@@ -2,10 +2,10 @@ import 'package:orchid/api/orchid_log.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 extension SharedPreferencesUtil on SharedPreferences {
-  static Future<Map<String, Object>> dump() async {
+  static Future<Map<String, dynamic>> dump() async {
     var prefs = await SharedPreferences.getInstance();
     var keys = prefs.getKeys();
-    Map<String, Object> map = {};
+    Map<String, dynamic> map = {};
     for (var key in keys) {
       var value = prefs.get(key);
       log("XXX: key = $key, type = ${value.runtimeType}, value = $value");

diff --git a/gui-orchid/lib/vpn/purchase/orchid_pac_server.dart b/gui-orchid/lib/vpn/purchase/orchid_pac_server.dart
@@ -256,7 +256,7 @@ class OrchidPACServer {
     required EthereumAddress signer,
     PacApiConfig? apiConfig, // optional override
   }) async {
-    var params = {'account_id': signer.toString(prefix: true)};
+    Map<String, dynamic> params = {'account_id': signer.toString(prefix: true)};
     var result = await _postJson(
         method: 'get_account', paramsIn: params, apiConfig: apiConfig);
     return PacAccount.fromJson(result);
@@ -276,7 +276,7 @@ class OrchidPACServer {
     if (receipt == null || receiptType == null) {
       throw Exception('iap: null receipt');
     }
-    var params = {
+    Map<String, dynamic> params = {
       'account_id': signer.toString(prefix: true),
       'product_id': productId,
       'receipt': receipt,
@@ -334,7 +334,7 @@ class OrchidPACServer {
         hex.decode(AbiEncode.uint256(txStringSig.s)) +
         intToBytes(BigInt.from(txStringSig.v));
 
-    var params = {
+    Map<String, dynamic> params = {
       'account_id': signerKey.address.toString(prefix: true),
       'chainId': chainId,
       // txn is encoded as an escaped json string