fix conflict

burrowHQ · Feb 26, 2024 · 0b45cc4 · 0b45cc4
2 parents 48d933c + e4ee4bc
commit 0b45cc4
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 7 deletions.
diff --git a/components/Assets/index.tsx b/components/Assets/index.tsx
diff --git a/components/BetaInfo/index.tsx b/components/BetaInfo/index.tsx
@@ -14,7 +14,7 @@ const BetaInfo = () => {
         mainnet:{" "}
         <Link
           href="https://app.burrow.cash"
-          title="Burrow Cash"
+          title="Burrow Finance"
           target="_blank"
           fontWeight="bold"
           color={theme.palette.primary.main}

diff --git a/pages/_app.tsx b/pages/_app.tsx
@@ -83,7 +83,7 @@ export default function MyApp({ Component, pageProps }: AppProps) {
         <PersistGate loading={null} persistor={persistor}>
           <Head>
             <meta name="viewport" content="width=device-width, initial-scale=1" />
-            <title>Burrow Cash</title>
+            <title>Burrow Finance</title>
           </Head>
           <Layout>
             <Init />

diff --git a/redux/selectors/getAccountRewards.ts b/redux/selectors/getAccountRewards.ts
@@ -50,7 +50,7 @@ export const getGains = (
   const data = portfolio[source];
   const res = Object.keys(data).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 } = data[id];
     const apr = Number(data[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 getConfig, { defaultNetwork, LOGIC_CONTRACT_NAME } from "./config";
-import { nearMetadata, wooMetadata } from "../components/Assets";
+import { nearMetadata, wooMetadata, sfraxMetadata, fraxMetadata } from "../components/Assets";
 
 import {
   ChangeMethodsLogic,
@@ -245,5 +245,17 @@ export function standardizeAsset(asset) {
   if (serializationAsset.metadata?.symbol === "WOO") {
     serializationAsset.metadata.icon = wooMetadata.icon;
   }
+  if (serializationAsset.symbol === "sFRAX") {
+    serializationAsset.icon = sfraxMetadata.icon;
+  }
+  if (serializationAsset.metadata?.symbol === "sFRAX") {
+    serializationAsset.metadata.icon = sfraxMetadata.icon;
+  }
+  if (serializationAsset.symbol === "FRAX") {
+    serializationAsset.icon = fraxMetadata.icon;
+  }
+  if (serializationAsset.metadata?.symbol === "FRAX") {
+    serializationAsset.metadata.icon = fraxMetadata.icon;
+  }
   return serializationAsset;
 }
diff --git a/utils/wallet-selector-compat.ts b/utils/wallet-selector-compat.ts
@@ -56,7 +56,7 @@ let selector: WalletSelector | null = null;
 const walletConnect = setupWalletConnect({
   projectId: WALLET_CONNECT_ID,
   metadata: {
-    name: "Burrow Cash",
+    name: "Burrow Finance",
     description: "Burrow with NEAR Wallet Selector",
     url: "https://github.com/near/wallet-selector",
     icons: ["https://avatars.githubusercontent.com/u/37784886"],