From 12e1f9b070cb98a25ce75c8129fce4ccd78728e3 Mon Sep 17 00:00:00 2001
From: Jack Hamer <jackhamer0990@gmail.com>
Date: Tue, 21 Mar 2023 19:48:43 +0200
Subject: [PATCH] fix: small code improvements

---
 components/loaders/Connecting.vue | 51 ++++++++++++++++++-------------
 composables/usePromise.ts         | 14 +++++++--
 store/zksync/lite/wallet.ts       |  2 +-
 3 files changed, 42 insertions(+), 25 deletions(-)

diff --git a/components/loaders/Connecting.vue b/components/loaders/Connecting.vue
index 0b1acd35..72f20a64 100644
--- a/components/loaders/Connecting.vue
+++ b/components/loaders/Connecting.vue
@@ -1,25 +1,34 @@
 <template>
-  <div class="connecting-container" v-if="account.isReconnecting || account.isConnecting">
-    <Web3Avatar v-if="account.address" :address="account.address" class="mb-2 h-16 w-16" />
-    <h1 class="h1 mb-2 text-center">{{ title }}</h1>
-    <svg
-      aria-hidden="true"
-      class="h-16 w-16 animate-spin fill-primary-300 text-gray-200"
-      viewBox="0 0 100 101"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
-        fill="currentColor"
-      />
-      <path
-        d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
-        fill="currentFill"
-      />
-    </svg>
-    <span class="sr-only">Loading...</span>
-  </div>
+  <transition
+    leave-active-class="transition ease-in duration-150"
+    leave-from-class="transform opacity-100"
+    leave-to-class="transform opacity-0"
+    enter-active-class="transition ease-in duration-250"
+    enter-from-class="transform opacity-0"
+    enter-to-class="transform opacity-100"
+  >
+    <div class="connecting-container" v-if="account.isReconnecting || account.isConnecting">
+      <Web3Avatar v-if="account.address" :address="account.address" class="mb-2 h-16 w-16" />
+      <h1 class="h1 mb-2 text-center">{{ title }}</h1>
+      <svg
+        aria-hidden="true"
+        class="h-16 w-16 animate-spin fill-primary-300 text-gray-200"
+        viewBox="0 0 100 101"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+          fill="currentColor"
+        />
+        <path
+          d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+          fill="currentFill"
+        />
+      </svg>
+      <span class="sr-only">Loading...</span>
+    </div>
+  </transition>
 </template>
 
 <script lang="ts" setup>
diff --git a/composables/usePromise.ts b/composables/usePromise.ts
index 2100493f..bee85736 100644
--- a/composables/usePromise.ts
+++ b/composables/usePromise.ts
@@ -1,19 +1,26 @@
+const defaultOptions: {
+  force?: boolean;
+} = {
+  force: false,
+};
+type UsePromiseOptions = typeof defaultOptions;
+
 export default <ResultType, ErrorType = Error>(fn: () => Promise<ResultType>) => {
   let promise: Promise<ResultType> | undefined = undefined;
-  const error = ref<ErrorType | undefined>();
   const result = ref<ResultType | undefined>();
   const inProgress = ref(false);
+  const error = ref<ErrorType | undefined>();
 
   const defaultOptions: {
     force?: boolean;
   } = {
     force: false,
   };
-  const execute = async (options = defaultOptions): Promise<ResultType | undefined> => {
+  const execute = async (options?: UsePromiseOptions): Promise<ResultType | undefined> => {
     const { force } = Object.assign({}, defaultOptions, options);
     if (!promise || force) {
-      error.value = undefined;
       inProgress.value = true;
+      error.value = undefined;
       promise = fn();
     }
 
@@ -21,6 +28,7 @@ export default <ResultType, ErrorType = Error>(fn: () => Promise<ResultType>) =>
       result.value = await promise;
     } catch (e) {
       error.value = e as unknown as ErrorType;
+      promise = undefined;
       throw e;
     } finally {
       inProgress.value = false;
diff --git a/store/zksync/lite/wallet.ts b/store/zksync/lite/wallet.ts
index 820ca1f7..3f712ed7 100644
--- a/store/zksync/lite/wallet.ts
+++ b/store/zksync/lite/wallet.ts
@@ -56,7 +56,7 @@ export const useLiteWalletStore = defineStore("liteWallet", () => {
     execute: requestBalance,
     clear: clearBalance,
   } = usePromise<void>(async () => {
-    await Promise.all([requestAccountState(), liteTokens.requestTokens()]);
+    await Promise.all([requestAccountState({ force: true }), liteTokens.requestTokens()]);
     if (!accountState.value) throw new Error("Account state is not available");
     if (!tokens.value) throw new Error("Tokens are not available");
     /* Object.entries(tokens.value).map(([symbol]) => {