refactor: wallet connect bug fix #1834

TalaoDAO · Aug 25, 2023 · 936d2ab · 936d2ab
1 parent b66f916
commit 936d2ab
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/lib/dashboard/connection/operation/cubit/operation_cubit.dart b/lib/dashboard/connection/operation/cubit/operation_cubit.dart
@@ -83,9 +83,7 @@ class OperationCubit extends Cubit<OperationState> {
           final publicKey = walletConnectState.parameters[0]['from'].toString();
 
           final CryptoAccountData? currentAccount =
-              walletCubit.state.cryptoAccount.data.firstWhereOrNull(
-            (element) => element.walletAddress == publicKey,
-          );
+              walletCubit.getCryptoAccountData(publicKey);
 
           log.i('currentAccount -$currentAccount');
           if (currentAccount == null) {
@@ -467,11 +465,8 @@ class OperationCubit extends Cubit<OperationState> {
 
       final BeaconRequest beaconRequest = beaconCubit.state.beaconRequest!;
 
-      final CryptoAccountData? currentAccount =
-          walletCubit.state.cryptoAccount.data.firstWhereOrNull(
-        (element) =>
-            element.walletAddress == beaconRequest.request!.sourceAddress!,
-      );
+      final CryptoAccountData? currentAccount = walletCubit
+          .getCryptoAccountData(beaconRequest.request!.sourceAddress!);
 
       if (currentAccount == null) {
         throw ResponseMessage(

diff --git a/lib/dashboard/connection/sign_payload/cubit/sign_payload_cubit.dart b/lib/dashboard/connection/sign_payload/cubit/sign_payload_cubit.dart
@@ -167,11 +167,8 @@ class SignPayloadCubit extends Cubit<SignPayloadState> {
         case ConnectionBridgeType.beacon:
           final BeaconRequest beaconRequest = beaconCubit.state.beaconRequest!;
 
-          final CryptoAccountData? currentAccount =
-              walletCubit.state.cryptoAccount.data.firstWhereOrNull(
-            (element) =>
-                element.walletAddress == beaconRequest.request!.sourceAddress!,
-          );
+          final CryptoAccountData? currentAccount = walletCubit
+              .getCryptoAccountData(beaconRequest.request!.sourceAddress!);
 
           if (currentAccount == null) {
             throw ResponseMessage(
@@ -224,9 +221,7 @@ class SignPayloadCubit extends Cubit<SignPayloadState> {
           }
 
           final CryptoAccountData? currentAccount =
-              walletCubit.state.cryptoAccount.data.firstWhereOrNull(
-            (element) => element.walletAddress == publicKey,
-          );
+              walletCubit.getCryptoAccountData(publicKey);
 
           log.i('currentAccount -$currentAccount');
           if (currentAccount == null) {

diff --git a/lib/wallet/cubit/wallet_cubit.dart b/lib/wallet/cubit/wallet_cubit.dart
@@ -507,4 +507,13 @@ class WalletCubit extends Cubit<WalletState> {
     );
     emit(state.copyWith(status: WalletStatus.init));
   }
+
+  CryptoAccountData? getCryptoAccountData(String publicKey) {
+    final CryptoAccountData? currentAccount =
+        state.cryptoAccount.data.firstWhereOrNull(
+      (element) =>
+          element.walletAddress.toUpperCase() == publicKey.toUpperCase(),
+    );
+    return currentAccount;
+  }
 }