Merge branch 'main' into oneclick-connect

burrowHQ · Feb 22, 2024 · 23d81ee · 23d81ee
2 parents 5a52eed + 7c08bc6
commit 23d81ee
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/components/Assets/index.tsx b/components/Assets/index.tsx
diff --git a/redux/selectors/getAccountRewards.ts b/redux/selectors/getAccountRewards.ts
@@ -49,7 +49,7 @@ export const getGains = (
   Object.keys(portfolio[source])
     .map((id) => {
       const asset = assets.data[id];
-      const netTvlMultiplier = asset.config.net_tvl_multiplier / 10000;
+      const netTvlMultiplier = (asset?.config.net_tvl_multiplier || 0) / 10000;
 
       const { balance } = portfolio[source][id];
       const apr = Number(portfolio[source][id].apr);

diff --git a/redux/utils.ts b/redux/utils.ts
@@ -19,7 +19,7 @@ export const listToMap = (list) =>
     .reduce((a, b) => ({ ...a, ...b }), {});
 
 export const toUsd = (balance: string, asset: Asset) =>
-  asset.price?.usd
+  asset?.price?.usd
     ? Number(shrinkToken(balance, asset.metadata.decimals + asset.config.extra_decimals)) *
       asset.price.usd
     : 0;

diff --git a/screens/Staking/index.tsx b/screens/Staking/index.tsx
@@ -87,7 +87,8 @@ const Staking = () => {
               <CustomButton
                 onClick={() => setModal({ name: "staking" })}
                 className="w-full"
-                disabled={!total}
+                // disabled={!total}
+                disabled
               >
                 Stake
               </CustomButton>

diff --git a/utils/index.ts b/utils/index.ts
@@ -3,7 +3,7 @@ import BN from "bn.js";
 import Decimal from "decimal.js";
 
 import { defaultNetwork, LOGIC_CONTRACT_NAME } from "./config";
-import { nearMetadata, wooMetadata } from "../components/Assets";
+import { nearMetadata, wooMetadata, sfraxMetadata, fraxMetadata } from "../components/Assets";
 
 import {
   ChangeMethodsLogic,
@@ -226,5 +226,11 @@ export function standardizeAsset(asset) {
   if (asset.symbol === "WOO") {
     asset.icon = wooMetadata.icon;
   }
+  if (asset.symbol === "sFRAX") {
+    asset.icon = sfraxMetadata.icon;
+  }
+  if (asset.symbol === "FRAX") {
+    asset.icon = fraxMetadata.icon;
+  }
   return asset;
 }