Enable ledger and trezor again

consensusnetworks · Nov 6, 2023 · ba9018f · ba9018f
1 parent 0a76933
commit ba9018f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/apps/web/src/composables/staking.ts b/apps/web/src/composables/staking.ts
@@ -50,11 +50,11 @@ export default function useStaking() {
       if (browserProvidersList.includes(walletProvider)) {
         signer = getEthersBrowserSigner(walletProvider)
       } else if (walletProvider === "WalletConnect") {
-        await getWalletConnectSignerV2()
+        signer = await getWalletConnectSignerV2()
       } else if (walletProvider === "Ledger") {
-        getEthersLedgerSigner()
+        signer = getEthersLedgerSigner()
       } else if (walletProvider === "Trezor") {
-        getEthersTrezorSigner()
+        signer = getEthersTrezorSigner()
       } else {
         throw new Error(`Invalid wallet provider: ${walletProvider}`)
       }

diff --git a/apps/web/src/composables/wallets.ts b/apps/web/src/composables/wallets.ts
@@ -6,7 +6,7 @@ const installedWallets = ref([] as ProviderString[])
 const { browserProvidersList, getBrowserProvider } = useEthers()
 
 export default function useWallets() {
-  async function detectActiveNetwork(providerString: ProviderString) {
+  async function detectActiveNetwork(providerString: ProviderString): Promise<number> {
     try {
       if (browserProvidersList.includes(providerString)) {
         const provider = getBrowserProvider(providerString)
@@ -17,16 +17,17 @@ export default function useWallets() {
         const chainId = parseInt(await provider.request({ method: "eth_chainId" }), 16)
         return chainId
       } else if (providerString === "Ledger") {
-        // TODO: Implement Ledger
-        alert("detectActiveNetwork not yet implemented")
-        return "0"
+        // TODO: Determine if there is a way to implement with Ledger or if have to rely on selected network on device
+        return await new Promise(resolve => resolve(5))
       } else if (providerString === "Trezor") {
-        // TODO: Implement Trezor
-        alert("detectActiveNetwork not yet implemented")
-        return "0"
+        // TODO: Determine if there is a way to implement with Ledger or if have to rely on selected network on device
+        return await new Promise(resolve => resolve(5))
+      } else {
+        return await new Promise(resolve => resolve(0))
       }
     } catch (err) {
       console.log("Error in detectActiveNetwork: ", err)
+      return await new Promise(resolve => resolve(0))
     }
   }
 

diff --git a/apps/web/src/pages/overview/components/Staking.vue b/apps/web/src/pages/overview/components/Staking.vue
@@ -266,15 +266,14 @@ watch(openTermsOfService, ()=>{
   }
 })
 
-const handleDeposit = async () => {
+const handleStake = async () => {
   stakeButtonText.value = "Staking..."
 
   // const activeAddress = await detectActiveWalletAddress(selectedStakingProvider.value)
   // if (activeAddress !== selectedWalletAddress.value) {
   //   formattedAmountToStakeOrWithdraw.value = ''
   //   return alert(`The account you selected is not the same as the one that is active in your ${selectedStakingProvider.value} wallet. Please open your browser extension and select the account that you want to log in with.`)
   // }
-
   const result = await deposit({ 
     amount: formattedAmountToStakeOrWithdraw.value,
     walletProvider: selectedStakingProvider.value,
@@ -655,7 +654,7 @@ function setStakeOrWithdraw(option: "stake" | "withdraw") {
           || parseFloat(formattedAmountToStakeOrWithdraw) <= 0 
           || (stakeOrWithdraw === 'stake' && !termsOfServiceCheckbox)
       "
-      @click="stakeOrWithdraw === 'stake' ? handleDeposit() : handleWithdraw()"
+      @click="stakeOrWithdraw === 'stake' ? handleStake() : handleWithdraw()"
     >
       <div
         class="flex items-center justify-center gap-[5px]"