From cf040ced0890324249b877969eefdf6ec1d6e2b1 Mon Sep 17 00:00:00 2001
From: Christopher Cali <chris@consensusnetworks.com>
Date: Thu, 22 Jun 2023 09:47:14 -0700
Subject: [PATCH] Integrate formattedWalletOptions in staking component

---
 .../src/pages/overview/components/Staking.vue | 42 ++++++++++++-------
 common/types/src/index.ts                     |  6 ++-
 .../src/interfaces/FormattedWalletOption.ts   |  6 +++
 3 files changed, 38 insertions(+), 16 deletions(-)
 create mode 100644 common/types/src/interfaces/FormattedWalletOption.ts

diff --git a/apps/web/src/pages/overview/components/Staking.vue b/apps/web/src/pages/overview/components/Staking.vue
index 1aefac3b1..0348335ca 100644
--- a/apps/web/src/pages/overview/components/Staking.vue
+++ b/apps/web/src/pages/overview/components/Staking.vue
@@ -1,6 +1,10 @@
 <script lang="ts" setup>
 import { ref, onMounted, onUnmounted, watch } from 'vue'
+import { FormattedWalletOption } from '@casimir/types'
 import VueFeather from 'vue-feather'
+import useUsers from '@/composables/users'
+
+const { user } = useUsers()
 
 const selectedWallet = ref(null as null | string)
 const formattedAmountToStake = ref(null as null | string )
@@ -28,18 +32,7 @@ const handleInputOnAmountToStake = (event: any) => {
   formattedAmountToStake.value = parts.join('.')
 }
 
-const formattedWalletOptions = ref(
-  [
-    {
-      provider: 'MetaMask',
-      connectedAccounts: [
-      '0xd557a5745d4560B24D36A68b52351ffF9c86A212',
-      '0xd557a5745d4560B24D36A68b52351ffF9c86A212',
-      '0xd557a5745d4560B24D36A68b52351ffF9c86A212',
-      ]
-    }
-  ]
-)
+const formattedWalletOptions = ref<Array<FormattedWalletOption>>([])
 
 const convertString = (inputString: string) => {
   if (inputString.length <= 4) {
@@ -83,6 +76,23 @@ const handleOutsideClick = (event: any) => {
   }
 }
 
+const aggregateAddressesByProvider = () => {
+  formattedWalletOptions.value = []
+  // Iterate over user.value.accounts and aggregate addresses by provider
+  if(user.value){
+    const accounts = user.value.accounts
+    const providers = accounts.map((account) => account.walletProvider)
+    const uniqueProviders = [...new Set(providers)]
+    uniqueProviders.forEach((provider) => {
+      const addresses = accounts.filter((account) => account.walletProvider === provider).map((account) => account.address)
+      formattedWalletOptions.value.push({
+        provider,
+        addresses
+      })
+    })
+  }
+}
+
 watch(selectedWallet, () => {
   selectedWallet.value? account_balance.value = '$1,234.56' : account_balance.value = '- - -'
 })
@@ -99,11 +109,15 @@ watch(formattedAmountToStake, () => {
       errorMessage.value = null
     }
   }
-  
+})
+
+watch(user, () => {
+  aggregateAddressesByProvider()
 })
 
 onMounted(() => {
   window.addEventListener('click', handleOutsideClick)
+  aggregateAddressesByProvider()
 })
 
 onUnmounted(() =>{
@@ -162,7 +176,7 @@ onUnmounted(() =>{
           
 
           <button
-            v-for="wallet in item.connectedAccounts"
+            v-for="wallet in item.addresses"
             :key="wallet"
             class="w-full text-left rounded-[8px] py-[10px] px-[14px] 
             hover:bg-grey_1 flex justify-between items-center text-grey_4 hover:text-grey_6"
diff --git a/common/types/src/index.ts b/common/types/src/index.ts
index 49bde75c2..80934b80b 100644
--- a/common/types/src/index.ts
+++ b/common/types/src/index.ts
@@ -1,6 +1,7 @@
 import { Account } from './interfaces/Account'
 import { AccountWithStakingInfo } from './interfaces/AccountWithStakingInfo'
 import { AddAccountOptions } from './interfaces/AddAccountOptions'
+import { ApiResponse } from './interfaces/ApiResponse'
 import { BalanceSnapshot } from './interfaces/BalanceSnapshot'
 import { BrowserProviders } from './interfaces/BrowserProviders'
 import { Cluster } from './interfaces/Cluster'
@@ -10,9 +11,9 @@ import { CryptoAddress } from './interfaces/CryptoAddress'
 import { Currency } from './interfaces/Currency'
 import { DeploymentConfig } from './interfaces/DeploymentConfig'
 import { EthersProvider } from './interfaces/EthersProvider'
-import { ApiResponse } from './interfaces/ApiResponse'
 import { Event } from './interfaces/Event'
 import { ExistingUserCheck } from './interfaces/ExistingUserCheck'
+import { FormattedWalletOption } from './interfaces/FormattedWalletOption'
 import { GasEstimate } from './interfaces/GasEstimate'
 import { LoginCredentials } from './interfaces/LoginCredentials'
 import { MessageRequest } from './interfaces/MessageRequest'
@@ -29,6 +30,7 @@ import { Validator } from './interfaces/Validator'
 export type {
     Account,
     AccountWithStakingInfo,
+    ApiResponse,
     AddAccountOptions,
     BalanceSnapshot,
     BrowserProviders,
@@ -39,9 +41,9 @@ export type {
     Currency,
     DeploymentConfig,
     EthersProvider,
-    ApiResponse,
     Event,
     ExistingUserCheck,
+    FormattedWalletOption,
     GasEstimate,
     LoginCredentials,
     MessageRequest,
diff --git a/common/types/src/interfaces/FormattedWalletOption.ts b/common/types/src/interfaces/FormattedWalletOption.ts
new file mode 100644
index 000000000..1c95f25f8
--- /dev/null
+++ b/common/types/src/interfaces/FormattedWalletOption.ts
@@ -0,0 +1,6 @@
+import { ProviderString } from './ProviderString'
+
+export interface FormattedWalletOption {
+    provider: ProviderString,
+    addresses: string[],
+}
\ No newline at end of file