From 86395bba6a2e6aadc1dbf684bcb3f4abdb549ae6 Mon Sep 17 00:00:00 2001 From: zlayine Date: Thu, 30 May 2024 08:31:14 +0300 Subject: [PATCH 1/2] clear promise call --- resources/js/components/beam/BeamsList.vue | 1 + resources/js/components/beam/ClaimsList.vue | 1 + resources/js/components/marketplace/BidsList.vue | 1 + resources/js/components/marketplace/ListingsList.vue | 1 + resources/js/components/marketplace/SalesList.vue | 1 + resources/js/components/pages/Collections.vue | 1 + resources/js/components/pages/FuelTanks.vue | 1 + resources/js/components/pages/Tokens.vue | 1 + resources/js/components/pages/Transactions.vue | 1 + resources/js/components/pages/Wallets.vue | 1 + resources/js/components/pages/auth/Login.vue | 1 + resources/js/store/index.ts | 3 +++ 12 files changed, 14 insertions(+) diff --git a/resources/js/components/beam/BeamsList.vue b/resources/js/components/beam/BeamsList.vue index faa98be..1785b80 100644 --- a/resources/js/components/beam/BeamsList.vue +++ b/resources/js/components/beam/BeamsList.vue @@ -465,6 +465,7 @@ const openTransactionSlide = async (transactionId: string) => { onMounted(async () => { await appStore.initPromise; + useAppStore().clearInitPromise(); getBeams(); loadMoreItemsWithObserver(); events.on('transaction', openTransactionSlide); diff --git a/resources/js/components/beam/ClaimsList.vue b/resources/js/components/beam/ClaimsList.vue index a5451a3..7417ebc 100644 --- a/resources/js/components/beam/ClaimsList.vue +++ b/resources/js/components/beam/ClaimsList.vue @@ -279,6 +279,7 @@ const closeModalSlide = () => { (async () => { await useAppStore().initPromise; + useAppStore().clearInitPromise(); await getClaims(); })(); diff --git a/resources/js/components/marketplace/BidsList.vue b/resources/js/components/marketplace/BidsList.vue index ae1269a..c2855f0 100644 --- a/resources/js/components/marketplace/BidsList.vue +++ b/resources/js/components/marketplace/BidsList.vue @@ -280,6 +280,7 @@ const closeModalSlide = () => { (async () => { await useAppStore().initPromise; + useAppStore().clearInitPromise(); await getBids(); })(); diff --git a/resources/js/components/marketplace/ListingsList.vue b/resources/js/components/marketplace/ListingsList.vue index bad7b6a..c23435b 100644 --- a/resources/js/components/marketplace/ListingsList.vue +++ b/resources/js/components/marketplace/ListingsList.vue @@ -344,6 +344,7 @@ const closeModalSlide = () => { (async () => { await useAppStore().initPromise; + useAppStore().clearInitPromise(); await getListings(); })(); diff --git a/resources/js/components/marketplace/SalesList.vue b/resources/js/components/marketplace/SalesList.vue index 962fb78..8930601 100644 --- a/resources/js/components/marketplace/SalesList.vue +++ b/resources/js/components/marketplace/SalesList.vue @@ -280,6 +280,7 @@ const closeModalSlide = () => { (async () => { await useAppStore().initPromise; + useAppStore().clearInitPromise(); await getSales(); })(); diff --git a/resources/js/components/pages/Collections.vue b/resources/js/components/pages/Collections.vue index 600c05f..eeb63ae 100644 --- a/resources/js/components/pages/Collections.vue +++ b/resources/js/components/pages/Collections.vue @@ -322,6 +322,7 @@ const openTransactionSlide = async (transactionId: string) => { (async () => { await useAppStore().initPromise; + useAppStore().clearInitPromise(); await getCollections(); })(); diff --git a/resources/js/components/pages/FuelTanks.vue b/resources/js/components/pages/FuelTanks.vue index eb935c8..7baaa1c 100644 --- a/resources/js/components/pages/FuelTanks.vue +++ b/resources/js/components/pages/FuelTanks.vue @@ -330,6 +330,7 @@ const openTransactionSlide = async (transactionId: string) => { (async () => { await useAppStore().initPromise; + useAppStore().clearInitPromise(); await getFuelTanks(); })(); diff --git a/resources/js/components/pages/Tokens.vue b/resources/js/components/pages/Tokens.vue index 2fddb04..83fc11c 100644 --- a/resources/js/components/pages/Tokens.vue +++ b/resources/js/components/pages/Tokens.vue @@ -343,6 +343,7 @@ const openTransactionSlide = async (transactionId: string) => { onMounted(async () => { await useAppStore().initPromise; + useAppStore().clearInitPromise(); getTokens(); loadMoreTokensWithObserver(); events.on('transaction', openTransactionSlide); diff --git a/resources/js/components/pages/Transactions.vue b/resources/js/components/pages/Transactions.vue index 1eb4439..c02de3b 100644 --- a/resources/js/components/pages/Transactions.vue +++ b/resources/js/components/pages/Transactions.vue @@ -551,6 +551,7 @@ const closeModalSlide = () => { (async () => { await useAppStore().initPromise; + useAppStore().clearInitPromise(); getTransactions(); })(); diff --git a/resources/js/components/pages/Wallets.vue b/resources/js/components/pages/Wallets.vue index 2c1c205..26b8aa4 100644 --- a/resources/js/components/pages/Wallets.vue +++ b/resources/js/components/pages/Wallets.vue @@ -309,6 +309,7 @@ const openTransactionSlide = async (transactionId: string) => { onMounted(async () => { await useAppStore().initPromise; + useAppStore().clearInitPromise(); getWallets(); loadMoreItemsWithObserver(); events.on('transaction', openTransactionSlide); diff --git a/resources/js/components/pages/auth/Login.vue b/resources/js/components/pages/auth/Login.vue index 500214d..382216e 100644 --- a/resources/js/components/pages/auth/Login.vue +++ b/resources/js/components/pages/auth/Login.vue @@ -154,6 +154,7 @@ const login = async (recaptcha?: string) => { } appStore.init(); await appStore.initPromise; + appStore.clearInitPromise(); if (appStore.loggedIn) { snackbar.success({ title: 'Logged in successfully', save: false }); if (appStore.hasValidConfig) { diff --git a/resources/js/store/index.ts b/resources/js/store/index.ts index 63d0688..6623145 100644 --- a/resources/js/store/index.ts +++ b/resources/js/store/index.ts @@ -281,6 +281,9 @@ export const useAppStore = defineStore('app', { setTheme(theme: 'dark' | 'light') { this.theme = theme; }, + clearInitPromise() { + this.initPromise = null; + } }, getters: { hasValidConfig(state: AppState) { From f2d50dba4a8ac806c3e8be61d65fe77cfcf889c8 Mon Sep 17 00:00:00 2001 From: zlayine Date: Thu, 30 May 2024 08:33:44 +0300 Subject: [PATCH 2/2] fix --- resources/js/store/index.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/js/store/index.ts b/resources/js/store/index.ts index 6623145..b4ca616 100644 --- a/resources/js/store/index.ts +++ b/resources/js/store/index.ts @@ -51,6 +51,10 @@ export const useAppStore = defineStore('app', { try { // eslint-disable-next-line this.initPromise = new Promise(async (resolve) => { + if (this.config.network) { + return; + } + this.setConfig(); if (!this.config.url) { @@ -283,7 +287,7 @@ export const useAppStore = defineStore('app', { }, clearInitPromise() { this.initPromise = null; - } + }, }, getters: { hasValidConfig(state: AppState) {