Merge most recent changes from develop

consensusnetworks · Jul 12, 2023 · 8997b15 · 8997b15
2 parents e4ee20f + f58d3b2
commit 8997b15
Show file tree

Hide file tree

Showing 16 changed files with 500 additions and 1,363 deletions.
diff --git a/apps/web/public/trustwallet.svg b/apps/web/public/trustwallet.svg
diff --git a/apps/web/src/App.vue b/apps/web/src/App.vue
@@ -1,7 +1,16 @@
 <script lang="ts" setup>
   import { RouterView } from 'vue-router'
   import DefaultLayout from '@/layouts/default-layout.vue'
-  
+  import useTxData from '@/mockData/mock_transaction_data'
+  import { onMounted } from 'vue'
+  import useUsers from '@/composables/users'
+
+  const { mockData } = useTxData()
+  // Need this to fix initilizing bug between user.ts and ssv.ts
+  const { user } = useUsers()
+  onMounted(() => {
+    mockData()
+  })
 </script>
 
 <template>

diff --git a/apps/web/src/components/charts/LineChartJS.vue b/apps/web/src/components/charts/LineChartJS.vue
@@ -118,7 +118,7 @@ watch(props, ()=> {
                     let rgb = hexToRGB(line_chart.data.datasets[i].backgroundColor)
 
                     gradient.addColorStop(0, `rgba(${rgb?.r},${rgb?.g},${rgb?.b}, 0.28)`) 
-                    gradient.addColorStop(1, 'rgba(0, 0, 0,0)') 
+                    gradient.addColorStop(1, 'rgba(0, 0, 0, 0.0)') 
 
                     line_chart.data.datasets[i].backgroundColor = gradient
                 }

diff --git a/apps/web/src/composables/contracts.ts b/apps/web/src/composables/contracts.ts
@@ -28,8 +28,8 @@ const totalWalletBalance = ref<BreakdownAmount>({
 })
 
 export default function useContracts() {
-    const { ethersProviderList, getEthersBalance, getEthersBrowserSigner } = useEthers()
     const { ethereumUrl, managerAddress, viewsAddress } = useEnvironment()
+    const { ethersProviderList, getEthersBalance, getEthersBrowserSigner } = useEthers()
     const { getEthersLedgerSigner } = useLedger()
     const { getCurrentPrice } = usePrice()
     const { getEthersTrezorSigner } = useTrezor()
@@ -172,19 +172,20 @@ export default function useContracts() {
         }))
     }
 
-    async function getStakingRewards() : Promise<BreakdownAmount> {
-        const addresses = (user.value as UserWithAccounts).accounts.map((account: Account) => account.address) as string[]
-        const promises = [] as Array<Promise<ethers.BigNumber>>
-        // TODO: Replace .getUserRewards with actual method that get's rewards OR figure out how to derive rewards
-        addresses.forEach((address) => {promises.push(manager.connect(provider).getUserRewards(address))})
-        const stakingRewards = (await Promise.all(promises)).reduce((a, b) => a.add(b))
-        const stakingRewardsUSD = parseFloat(ethers.utils.formatEther(stakingRewards)) * (await getCurrentPrice({ coin: 'ETH', currency: 'USD' }))
-        const stakingRewardsETH = parseFloat(ethers.utils.formatEther(stakingRewards))
-        return {
-            exchange: stakingRewardsETH.toFixed(2) + ' ETH',
-            usd: '$ ' + stakingRewardsUSD.toFixed(2)
-        }
-    }
+    // TODO: Replace .getUserRewards with actual method that get's rewards OR figure out how to derive rewards
+    // async function getStakingRewards() : Promise<BreakdownAmount> {
+    //     const addresses = (user.value as UserWithAccounts).accounts.map((account: Account) => account.address) as string[]
+    //     const promises = [] as Array<Promise<ethers.BigNumber>>
+    //     // TODO: Replace .getUserRewards with actual method that get's rewards OR figure out how to derive rewards
+    //     addresses.forEach((address) => {promises.push(manager.connect(provider).getUserRewards(address))})
+    //     const stakingRewards = (await Promise.all(promises)).reduce((a, b) => a.add(b))
+    //     const stakingRewardsUSD = parseFloat(ethers.utils.formatEther(stakingRewards)) * (await getCurrentPrice({ coin: 'ETH', currency: 'USD' }))
+    //     const stakingRewardsETH = parseFloat(ethers.utils.formatEther(stakingRewards))
+    //     return {
+    //         exchange: stakingRewardsETH.toFixed(2) + ' ETH',
+    //         usd: '$ ' + stakingRewardsUSD.toFixed(2)
+    //     }
+    // }
 
     async function getTotalWalletBalance() : Promise<BreakdownAmount> {
         const promises = [] as Array<Promise<any>>

diff --git a/apps/web/src/composables/router.ts b/apps/web/src/composables/router.ts
@@ -1,7 +1,5 @@
 import { createWebHistory, createRouter } from 'vue-router'
 import useUsers from '@/composables/users'
-
-/* eslint-disable @typescript-eslint/ban-ts-comment */
 import Overview from '@/pages/overview/Overview.vue'
 import Test from '@/pages/test/Test.vue'
 

diff --git a/apps/web/src/composables/users.ts b/apps/web/src/composables/users.ts
@@ -3,7 +3,9 @@ import { Account, AddAccountOptions, ProviderString, RemoveAccountOptions, UserW
 import useEnvironment from '@/composables/environment'
 import useEthers from './ethers'
 import * as Session from 'supertokens-web-js/recipe/session'
-import txData from '../mockData/mock_transaction_data.json'
+import useTxData from '../mockData/mock_transaction_data'
+
+const { txData } = useTxData()
 
 const { usersUrl } = useEnvironment()
 
@@ -250,7 +252,7 @@ export default function useUsers() {
 
             // TODO: Swap this when the API / data is ready
             // rawUserAnalytics.value = data
-            rawUserAnalytics.value = txData
+            rawUserAnalytics.value = txData.value
 
             setUserAnalytics()
             return { error, message, data }

diff --git a/apps/web/src/composables/wallet.ts b/apps/web/src/composables/wallet.ts
@@ -21,7 +21,8 @@ const activeWallets = ref([
   'WalletConnect',
   'Trezor',
   'Ledger',
-  'IoPay',
+  'TrustWallet',
+  // 'IoPay',
 ] as ProviderString[])
 const amount = ref<string>('1')
 const amountToStake = ref<string>('1.2')