fix(sigma, keys ): owner balance, double add (#1072)

src/containers/application/Header/SwitchAccount/SwitchAccount.tsx

@@ -1,6 +1,6 @@
 import React, { useMemo, useRef } from 'react';
 import cx from 'classnames';
-import { Link } from 'react-router-dom';
+import { Link, useLocation } from 'react-router-dom';
 import { usePopperTooltip } from 'react-popper-tooltip';
 import { Transition } from 'react-transition-group';
 
@@ -28,6 +28,7 @@ function AccountItem({
   link,
 }) {
   const address = data?.cyber?.bech32;
+  const location = useLocation();
 
   const { passport } = usePassportByAddress(address);
 
@@ -41,13 +42,15 @@ function AccountItem({
     setControlledVisible(false);
   }
 
+  const robotPath = nickname
+    ? routes.robotPassport.getLink(nickname)
+    : routes.robot.path;
+
+  const linkToRobot = location.pathname.includes('@') ? robotPath : undefined;
+
   return (
     <Link
-      to={
-        link ||
-        (nickname && routes.robotPassport.getLink(nickname)) ||
-        routes.robot.path
-      }
+      to={link || linkToRobot}
       onClick={handleClick}
       className={cx(
         styles.containerSwichAccount,

src/containers/sigma/hooks/useGetBalanceBostrom.ts

@@ -2,12 +2,13 @@ import { useEffect, useState, useMemo, useCallback } from 'react';
 import BigNumber from 'bignumber.js';
 import { useIbcDenom } from 'src/contexts/ibcDenom';
 import { useAppData } from 'src/contexts/appData';
+import { Nullable } from 'src/types';
 import useGetBalanceMainToken from './useGetBalanceMainToken';
 import useBalanceToken from './useBalanceToken';
 import { convertAmount } from '../../../utils/utils';
 import { CYBER } from '../../../utils/config';
 
-function useGetBalanceBostrom(address) {
+function useGetBalanceBostrom(address: Nullable<string>) {
   const { marketData } = useAppData();
   const { traseDenom } = useIbcDenom();
   const { balance: balanceMainToken, loading: loadingMalin } =
@@ -24,22 +25,23 @@ function useGetBalanceBostrom(address) {
   const [balances, setBalances] = useState({});
 
   useEffect(() => {
-    if (address !== null) {
-      const { bech32 } = address;
-      const keyLs = `lastBalances-${bech32}`;
+    if (address) {
+      const keyLs = `lastBalances-${address}`;
       const lastBalancesLs = localStorage.getItem(keyLs);
 
-      if (!loadingToken && !loadingMalin) {
+      if (!loadingMalin && !loadingToken) {
         let dataResult = {};
-        const mainToken = { [CYBER.DENOM_CYBER]: { ...balanceMainToken } };
+        const mainToken = {
+          [CYBER.DENOM_CYBER]: { ...balanceMainToken },
+        };
         const dataResultTemp = { ...mainToken, ...balanceToken };
         const tempData = getBalanceMarket(dataResultTemp);
         dataResult = { ...tempData };
         setBalances(dataResult);
         if (Object.keys(dataResult).length > 0) {
           localStorage.setItem(keyLs, JSON.stringify(dataResult));
         }
-      } else if (lastBalancesLs !== null) {
+      } else if (lastBalancesLs) {
         const dataLs = JSON.parse(lastBalancesLs);
         setBalances(dataLs);
       }
@@ -105,12 +107,11 @@ function useGetBalanceBostrom(address) {
   }, [balances]);
 
   useEffect(() => {
-    if (address !== null) {
-      const { bech32 } = address;
-      const keyLs = `lastCap-${bech32}`;
+    if (address) {
+      const keyLs = `lastCap-${address}`;
       const lastCapLs = localStorage.getItem(keyLs);
       let lastCap = new BigNumber(0);
-      if (lastCapLs !== null) {
+      if (lastCapLs) {
         lastCap = lastCap.plus(JSON.parse(lastCapLs));
       }
 
@@ -136,7 +137,7 @@ function useGetBalanceBostrom(address) {
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [useGetCapTokens]);
+  }, [useGetCapTokens, address]);
 
   return {
     totalAmountInLiquid,

src/containers/sigma/hooks/useGetBalanceMainToken.js

@@ -1,38 +1,12 @@
-import BigNumber from 'bignumber.js';
-import { useEffect, useState } from 'react';
 import { useQueryClient } from 'src/contexts/queryClient';
 import { useGetBalance, initValueMainToken } from './utils';
 
 function useGetBalanceMainToken(address) {
   const queryClient = useQueryClient();
   const addressActive = address?.bech32 || address;
-  const [balance, setBalance] = useState({ ...initValueMainToken });
   const data = useGetBalance(queryClient, addressActive);
-  const [loading, setLoading] = useState(true);
 
-  useEffect(() => {
-    setLoading(true);
-    if (data !== undefined) {
-      setBalance({ ...initValueMainToken });
-      Object.keys(data).forEach((key) => {
-        if (data[key] && data[key].amount > 0) {
-          setBalance((item) => ({
-            ...item,
-            [key]: { ...data[key] },
-            total: {
-              ...item.total,
-              amount: new BigNumber(item.total.amount)
-                .plus(data[key].amount)
-                .toNumber(),
-            },
-          }));
-        }
-      });
-      setLoading(false);
-    }
-  }, [data]);
-
-  return { balance, loading };
+  return { balance: data || { ...initValueMainToken }, loading: !data };
 }
 
 export default useGetBalanceMainToken;

src/containers/sigma/hooks/utils.js

@@ -118,12 +118,27 @@ export const useGetBalance = (client, addressBech32) => {
           responsevalidatorCommission
         );
 
-        return {
+        const resultBalance = {
           liquid: responsegetBalance,
           frozen: delegationsAmount,
           melting: unbondingAmount,
           growth: rewardsAmount,
-          commission: commissionAmount,
+        };
+
+        if (commissionAmount.amount > 0) {
+          resultBalance.commission = commissionAmount;
+        }
+
+        const total = Object.values(resultBalance).reduce((acc, item) => {
+          return new BigNumber(acc).plus(item.amount).toString();
+        }, 0);
+
+        return {
+          ...resultBalance,
+          total: {
+            denom: DENOM_CYBER,
+            amount: total,
+          },
         };
       },
       {

src/containers/sigma/index.tsx

@@ -109,7 +109,7 @@ function Sigma() {
   const updateDataCap = (newData) => {
     setValue((item) => ({
       ...item,
-      dataCap: { ...item.dataCap, ...newData },
+      dataCap: superSigma ? { ...item.dataCap, ...newData } : { ...newData },
     }));
   };
 

src/features/adviser/AdviserContainer.module.scss

@@ -1,12 +1,15 @@
 .wrapper {
   position: sticky;
   top: 75px;
+  width: 60%;
 
   z-index: 3;
   min-height: 90px; // 3 lines
 
   margin-top: -45px;
   margin-bottom: 15px;
+  margin-left: auto;
+  margin-right: auto;
 
   display: flex;
   justify-content: center;