consensusnetworks · shanejearley · Dec 7, 2022 · Nov 23, 2022 · Nov 23, 2022 · Nov 30, 2022
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -66,7 +66,7 @@ jobs:
                   "type": "header",
                   "text": {
                     "type": "plain_text",
-                    "text": ":construction: Development Deployment → :space_invader: Casimir"
+                    "text": ":construction: Development Deployment → :ocean: Casimir"
                   }
                 },
                 {

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -80,7 +80,7 @@ jobs:
                   "type": "header",
                   "text": {
                     "type": "plain_text",
-                    "text": ":trumpet: Production Release → :space_invader: Casimir"
+                    "text": ":trumpet: Production Release → :ocean: Casimir"
                   }
                 },
                 {

diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,5 @@ aws.env
 *.log
 .idea
 
-
-
-# Prevents committing node data
-scripts/ssv/resources/nimbus/data
+# Sensitive
+**/**/secrets/*.json
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -19,5 +19,5 @@
         "typescript"
     ],
     "css.lint.unknownAtRules": "ignore",
-    "jupyter.notebookFileRoot": "${fileDirname}"
+    "jupyter.notebookFileRoot": "${fileDirname}",
 }
diff --git a/apps/landing/src/pages/home/Home.vue b/apps/landing/src/pages/home/Home.vue
@@ -19,7 +19,7 @@
     },
     {
       name: 'google',
-      content: 'Contact us at Info@conensusnetworks.com!',
+      content: 'Contact us at Info@consensusnetworks.com!',
       link: 'mailto:Info@consensusnetworks.com?subject=Me&body=Dear Casimir Dev Team!'
     },
   ])

diff --git a/apps/web/index.html b/apps/web/index.html
@@ -17,7 +17,7 @@
     <title>Casimir</title>
   </head>
   <body>
-    <div style="background: #00091A; min-width: 360px; overflow: auto;">
+    <div style="background: #001A4D; min-width: 360px; overflow: auto;">
       <div id="app"></div>
     </div>
     <script type="module" src="/src/main.ts"></script>

diff --git a/apps/web/public/ETH.svg b/apps/web/public/ETH.svg
diff --git a/apps/web/src/components/USDAmount.vue b/apps/web/src/components/USDAmount.vue
@@ -0,0 +1,28 @@
+<script lang="ts" setup>
+import { defineProps, onMounted, ref, toRef, watch } from 'vue'
+import useFormat from '@/composables/format'
+import usePrice from '@/composables/price'
+
+const { formatDecimalString } = useFormat()
+const { getExchangeRate } = usePrice()
+
+const usdAmount = ref(0)
+const props = defineProps({
+    etherAmount: {
+        type: String,
+        required: true,
+    }
+})
+const etherAmount = toRef(props, 'etherAmount')
+onMounted(async () => {
+    usdAmount.value = await getExchangeRate(props.etherAmount)
+})
+watch(etherAmount, async () => {
+    usdAmount.value = await getExchangeRate(props.etherAmount)
+})
+
+</script>
+
+<template>
+  <div>${{ formatDecimalString(usdAmount.toString()) }}</div>
+</template>
diff --git a/apps/web/src/components/Wallet.vue b/apps/web/src/components/Wallet.vue
@@ -22,7 +22,7 @@
     <div>
       <ul>
         <li
-          v-for="(_value, _key) in usersAccounts"
+          v-for="(_value, _key) in user"
           :key="_key"
         >
           <ul v-if="_key === 'accounts'">
@@ -178,7 +178,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watchEffect } from 'vue'
+import { ref, watchEffect, onMounted } from 'vue'
 import useWallet from '@/composables/wallet'
 import useUsers from '@/composables/users'
 
@@ -200,7 +200,7 @@ const trezorAccountsResult = ref<string>('Address Not Active')
 const walletConnectButtonText = ref<string>('Connect WalletConnect')
 const walletConnectAccountsResult = ref<string>('Address Not Active')
 
-const { addAccount, removeAccount, usersAccounts } = useUsers()
+const { addAccount, removeAccount, user } = useUsers()
 const {
   selectedProvider,
   selectedAccount,

diff --git a/apps/web/src/components/navigation/SideNav.vue b/apps/web/src/components/navigation/SideNav.vue
@@ -7,10 +7,10 @@ const open = ref(false)
 
 
 
-const selectedPage = ref(router.currentRoute.value.fullPath)
+const selectedPage = ref(router.currentRoute.value.fullPath.split('/')[1])
 
 watch (router.currentRoute, () => {
-  selectedPage.value = router.currentRoute.value.fullPath
+  selectedPage.value = router.currentRoute.value.fullPath.split('/')[1]
 })
 
 // To Do: connect this to our Auth and see if an account exsists
@@ -20,7 +20,7 @@ const account = ref(true)
 
 <template>
   <div 
-    class="side-nav-container"
+    class="side-nav-container text-white"
     @mouseenter="open = true"
     @mouseleave="open = false"
   >
@@ -42,7 +42,7 @@ const account = ref(true)
     >
       <div
         class="side-nav-tabs"
-        :class="selectedPage === '/'? 'side-nav-tabs-selected' : 'text-white'"
+        :class="selectedPage === ''? 'side-nav-tabs-selected' : 'text-white'"
       >
         <i
           class="iconoir-report-columns"
@@ -57,19 +57,19 @@ const account = ref(true)
     </RouterLink>
 
     <RouterLink 
-      :to="!account ? '' : '/Staking'"
+      :to="!account ? '' : '/stake'"
     >
       <div
         class="side-nav-tabs"
-        :class="selectedPage === '/Staking'? 'side-nav-tabs-selected' : ''"
+        :class="selectedPage === 'stake'? 'side-nav-tabs-selected' : ''"
         :style="!account? {
           'cursor' : 'default'
         } : {}"
       >
         <div :class="!account? 'flex text-grey_5': 'flex text-white'">
           <i>
             <img
-              src="Staking-Icon.svg"
+              src="/Staking-Icon.svg"
               alt="Staking Icon"
               :class="!account? 'opacity-50': 'opacity-100'"
             >
@@ -85,12 +85,12 @@ const account = ref(true)
     </RouterLink>
 
     <RouterLink 
-      :to="!account ? '' : '/Assets'"
+      :to="!account ? '' : '/assets'"
       class="disabled"
     >
       <div
         class="side-nav-tabs"
-        :class="selectedPage === '/Assets'? 'side-nav-tabs-selected' : ''"
+        :class="selectedPage === 'assets'? 'side-nav-tabs-selected' : ''"
         :style="!account? {
           'cursor' : 'default',
         } : {}"