feat: enable all networks and improve buttons display

forbole · Apr 10, 2024 · 83993c1 · 83993c1
1 parent b539478
commit 83993c1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/...s/staking/components/networks/components/network_grid/components/network_card/popover.tsx b/...s/staking/components/networks/components/network_grid/components/network_card/popover.tsx
@@ -179,17 +179,20 @@ const PopOver = ({
   const accountsWithRewards = accounts?.filter(accountHasRewards);
 
   const shouldDisplayRewardsButton =
+    hasInit &&
     !!claimableRewards &&
     !!accountsWithRewards?.length &&
     stakingNetworkId &&
     networksWithRewards.has(stakingNetworkId);
 
   const shouldDisplayWithdrawUnstakeButton =
+    hasInit &&
     !!inactiveStakeAccounts?.length &&
     stakingNetworkId &&
     !networksWithRewards.has(stakingNetworkId);
 
   const shouldDisplayUnstakeButton =
+    hasInit &&
     !!accountsWithDelegations?.length &&
     stakingNetworkId &&
     (!networksWithStakeAccounts.has(stakingNetworkId) ||

diff --git a/src/screens/staking/lib/staking_sdk/core/cosmos.ts b/src/screens/staking/lib/staking_sdk/core/cosmos.ts
@@ -8,18 +8,17 @@ import {
 export const keplrNetworks = new Set<StakingNetworkId>(
   [
     StakingNetworkId.Akash,
-    // StakingNetworkId.Celestia,
-    // StakingNetworkId.CelestiaTestnet,
-    // StakingNetworkId.ComposableFinance,
-    // StakingNetworkId.CosmosHub,
-    // StakingNetworkId.CosmosHubTestnet,
-    // StakingNetworkId.DyDx,
-    // StakingNetworkId.Kava,
-    // StakingNetworkId.KavaTestnet,
-    // StakingNetworkId.Osmosis,
-    // StakingNetworkId.Regen,
-    // StakingNetworkId.Stargaze,
-    // StakingNetworkId.StargazeTestnet,
+    StakingNetworkId.Celestia,
+    StakingNetworkId.CelestiaTestnet,
+    StakingNetworkId.ComposableFinance,
+    StakingNetworkId.CosmosHub,
+    StakingNetworkId.CosmosHubTestnet,
+    StakingNetworkId.DyDx,
+    StakingNetworkId.Kava,
+    StakingNetworkId.KavaTestnet,
+    StakingNetworkId.Osmosis,
+    StakingNetworkId.Stargaze,
+    StakingNetworkId.StargazeTestnet,
   ].filter(
     ENABLE_TESTNETS ? () => true : (network) => !testnetNetworks.has(network),
   ),

diff --git a/src/screens/staking/lib/staking_sdk/staking_client.ts b/src/screens/staking/lib/staking_sdk/staking_client.ts
@@ -29,7 +29,6 @@ const fetchJson = <A = any>(uri: string, opts?: Options): Promise<A> =>
     },
   }).then((res) => res.json());
 
-// @TODO: Review with cosmos chains
 const getRewardsDivisor = (denom: string) => {
   const network = unnormalisedDenomToNetwork[denom.toUpperCase()];
 

diff --git a/src/screens/staking/lib/staking_sdk/wallet_operations/solana.ts b/src/screens/staking/lib/staking_sdk/wallet_operations/solana.ts
@@ -90,7 +90,7 @@ export const tryToConnectSolflare = async (
           };
 
           setUserWallet(context, WalletId.Solflare, {
-            name: "", // @TODO
+            name: "Solflare Wallet",
             networks: {
               ...context.state.wallets[WalletId.Solflare]?.networks,
               [networkId]: {
@@ -214,7 +214,7 @@ export const tryToConnectPhantom = async (
         };
 
         setUserWallet(context, WalletId.Phantom, {
-          name: "", // @TODO
+          name: "Phantom Wallet",
           networks: {
             ...context.state.wallets[WalletId.Phantom]?.networks,
             [networkId]: {