fix: show insufficient funds/rejection errors properly

rotki · Nov 28, 2024 · 9184b62 · 9184b62
1 parent b01df02
commit 9184b62
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/components/checkout/pay/CryptoPaymentForm.vue b/components/checkout/pay/CryptoPaymentForm.vue
@@ -92,6 +92,11 @@ stopWatcher = watchEffect(() => {
     redirect();
 });
 
+function dismissNotification() {
+  set(state, 'idle');
+  set(error, '');
+}
+
 watch(canvas, async (canvas) => {
   if (!canvas)
     return;
@@ -252,7 +257,7 @@ watch(canvas, async (canvas) => {
     :timeout="10000"
     closeable
     :visible="failure"
-    @dismiss="state = 'idle'"
+    @dismiss="dismissNotification()"
   >
     <template #title>
       {{ status?.title }}

diff --git a/composables/crypto-payment.ts b/composables/crypto-payment.ts
@@ -93,6 +93,7 @@ export function useWeb3Payment(data: Ref<CryptoPayment>, state: Ref<StepType | I
 
   appKit.subscribeAccount((account) => {
     set(state, 'idle');
+    set(errorMessage, '');
     set(connected, account.isConnected);
 
     if (account.isConnected) {
@@ -199,15 +200,14 @@ export function useWeb3Payment(data: Ref<CryptoPayment>, state: Ref<StepType | I
         signer: await browserProvider.getSigner(),
       });
     }
-    catch (error_: any) {
-      logger.error(error_);
+    catch (error: any) {
+      logger.error(error);
       set(state, 'idle');
 
-      if ('reason' in error_ && error_.reason)
-        set(errorMessage, error_.reason);
-
+      if ('shortMessage' in error)
+        set(errorMessage, error.shortMessage);
       else
-        set(errorMessage, error_.message);
+        set(errorMessage, error.message);
     }
   };
 
@@ -225,12 +225,6 @@ export function useWeb3Payment(data: Ref<CryptoPayment>, state: Ref<StepType | I
     appKit.switchNetwork(network);
   }
 
-  watch(state, (state) => {
-    if (state === 'idle') {
-      set(errorMessage, '');
-    }
-  });
-
   onUnmounted(async () => {
     await appKit.disconnect();
   });