fix account sign

enjin · Oct 7, 2024 · 6d895ed · 6d895ed
1 parent deaf41c
commit 6d895ed
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/resources/js/components/SignTransaction.vue b/resources/js/components/SignTransaction.vue
@@ -95,7 +95,7 @@ const signing = ref(false);
 const transactionStore = useTransactionStore();
 const connectionStore = useConnectionStore();
 
-const walletAccounts = computed(() => connectionStore.getWalletAccounts());
+const walletAccounts = computed(() => connectionStore.getWalletAccounts().filter((account) => account.enabled));
 
 const signTransaction = async () => {
     try {

diff --git a/resources/js/components/pages/SettingsWalletApp.vue b/resources/js/components/pages/SettingsWalletApp.vue
@@ -33,8 +33,8 @@
                             <template v-else>
                                 <WalletAppItem
                                     v-for="item in userWalletAccounts"
-                                    :key="item.account"
-                                    :account="item.account"
+                                    :key="item.address"
+                                    :account="item.address"
                                     :enabled="item.enabled"
                                 />
                             </template>

diff --git a/resources/js/store/connection.ts b/resources/js/store/connection.ts
@@ -228,16 +228,16 @@ export const useConnectionStore = defineStore('connection', {
             return [...new Set(accounts)];
         },
         getWalletAccounts() {
-            let accounts =
-                useAppStore().user?.walletAccounts ||
-                this.accounts?.map((account) => publicKeyToAddress(account.address));
+            let accounts = this.accounts?.map((account) => {
+                return { ...account, address: publicKeyToAddress(account.address) };
+            });
             try {
                 accounts = accounts?.map((account) => {
-                    if (this.disabledAccounts?.find((disabled) => disabled === account)) {
-                        return { account, enabled: false };
+                    if (this.disabledAccounts?.find((disabled) => disabled === account.address)) {
+                        return { ...account, enabled: false };
                     }
 
-                    return { account, enabled: true };
+                    return { ...account, enabled: true };
                 });
             } catch {
                 //