test redisign conflicts

package.json

@@ -243,7 +243,7 @@
     "ts-jest-resolver": "^2.0.1",
     "videostream": "^3.2.2",
     "web3": "1.2.4",
-    "web3-utils": "^1.2.4",
+    "web3-utils": "^4.2.1",
     "worker-url": "^1.1.0"
   },
   "prec-commit": [

src/components/account/account.tsx

@@ -104,15 +104,16 @@ function Account({
       }}
     >
       {avatar && (
-        <div
+        <Link
+          to={linkAddress}
           className={cx(styles.avatar, avatarClassName)}
           style={{
             width: sizeAvatar,
             height: sizeAvatar,
           }}
         >
           <AvataImgIpfs addressCyber={address} cidAvatar={cidAvatar} />
-        </div>
+        </Link>
       )}
       {!onlyAvatar && (
         <Link

src/constants/app.ts

@@ -8,3 +8,4 @@ export const PATTERN_CYBER = new RegExp(
   `^${BECH32_PREFIX_ACC_ADDR_CYBER}[a-zA-Z0-9]{39}$`,
   'g'
 );
+export const PATTERN_IPFS_HASH = /^Qm[a-zA-Z0-9]{44}$/g;

src/containers/Search/ActionBarContainer.tsx

@@ -1,6 +1,5 @@
 /* eslint-disable */
 import React, { Component } from 'react';
-import { Link as LinkRoute } from 'react-router-dom';
 import { Pane, ActionBar } from '@cybercongress/gravity';
 import { connect } from 'react-redux';
 import {
@@ -15,16 +14,14 @@ import {
 
 import { getTxs } from '../../utils/search/utils';
 
-import {
-  LEDGER,
-  CYBER,
-  PATTERN_IPFS_HASH,
-  DEFAULT_GAS_LIMITS,
-} from '../../utils/config';
+import { LEDGER } from '../../utils/config';
+import { PATTERN_IPFS_HASH } from 'src/constants/app';
 import { trimString } from '../../utils/utils';
 import withIpfsAndKeplr from 'src/hocs/withIpfsAndKeplr';
 import { DefaultAccount } from 'src/types/defaultAccount';
 import { BackgroundWorker } from 'src/services/backend/workers/background/worker';
+import { SenseApi } from 'src/contexts/backend/services/senseApi';
+import { sendCyberlink } from 'src/services/neuron/neuronApi';
 
 const imgKeplr = require('../../image/keplr-icon.svg');
 const imgLedger = require('../../image/ledger.svg');
@@ -52,6 +49,7 @@ interface Props {
   update: () => void;
   signer: any;
   ipfsApi: BackgroundWorker['ipfsApi'];
+  senseApi: SenseApi;
   signingClient: any;
   keywordHash: string;
 }
@@ -164,7 +162,7 @@ class ActionBarContainer extends Component<Props, any> {
 
   generateTx = async () => {
     try {
-      const { signer, signingClient } = this.props;
+      const { signer, signingClient, senseApi } = this.props;
       const { fromCid, toCid, addressLocalStor } = this.state;
 
       this.setState({
@@ -175,36 +173,23 @@ class ActionBarContainer extends Component<Props, any> {
 
         console.log('address', address);
         if (addressLocalStor !== null && addressLocalStor.address === address) {
-          const fee = {
-            amount: [],
-            gas: DEFAULT_GAS_LIMITS.toString(),
-          };
-          const result = await signingClient.cyberlink(
-            address,
-            fromCid,
-            toCid,
-            fee
-          );
-          if (result.code === 0) {
-            const hash = result.transactionHash;
-            console.log('hash :>> ', hash);
-            this.setState({ stage: STAGE_SUBMITTED, txHash: hash });
-            this.timeOut = setTimeout(this.confirmTx, 1500);
-          } else if (result.code === 4) {
-            this.setState({
-              txHash: null,
-              stage: STAGE_ERROR,
-              errorMessage:
-                'Cyberlinking and investmint are not working. Wait for updates.',
-            });
-          } else {
-            this.setState({
-              txHash: null,
-              stage: STAGE_ERROR,
-              errorMessage: result.rawLog.toString(),
+          const txHash = await sendCyberlink(address, fromCid, toCid, {
+            signingClient,
+            senseApi,
+          })
+            .then((txHash) => {
+              console.log('hash :>> ', txHash);
+              this.setState({ stage: STAGE_SUBMITTED, txHash });
+              this.timeOut = setTimeout(this.confirmTx, 1500);
+            })
+            .catch((e) => {
+              this.setState({
+                txHash: null,
+                stage: STAGE_ERROR,
+                errorMessage: e.message,
+              });
+              console.log('result: ', e.message, e);
             });
-          }
-          console.log('result: ', result);
         } else {
           this.setState({
             stage: STAGE_ERROR,

src/containers/Search/SearchResults.tsx

@@ -9,7 +9,7 @@ import { getIpfsHash } from 'src/utils/ipfs/helpers';
 import { encodeSlash } from '../../utils/utils';
 import { NoItems } from '../../components';
 import ActionBarContainer from './ActionBarContainer';
-import { PATTERN_IPFS_HASH } from '../../utils/config';
+import { PATTERN_IPFS_HASH } from 'src/constants/app';
 import { MainContainer } from '../portal/components';
 import FirstItems from './_FirstItems.refactor';
 import useSearchData from './hooks/useSearchData';

src/containers/application/Header/Commander/Commander.tsx

@@ -3,7 +3,7 @@ import { useNavigate, useParams } from 'react-router-dom';
 import { Color } from 'src/components/LinearGradientContainer/LinearGradientContainer';
 import { routes } from 'src/routes';
 import { getIpfsHash } from 'src/utils/ipfs/helpers';
-import { PATTERN_IPFS_HASH } from 'src/utils/config';
+import { PATTERN_IPFS_HASH } from 'src/constants/app';
 import { useAppDispatch, useAppSelector } from 'src/redux/hooks';
 import { setFocus, setValue } from './commander.redux';
 import styles from './Commander.module.scss';

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

@@ -8,17 +8,17 @@ import useOnClickOutside from 'src/hooks/useOnClickOutside';
 import { routes } from 'src/routes';
 import usePassportByAddress from 'src/features/passport/hooks/usePassportByAddress';
 
-import { useAppDispatch, useAppSelector } from 'src/redux/hooks';
+import { useAppSelector } from 'src/redux/hooks';
 import Pill from 'src/components/Pill/Pill';
 import { useSigningClient } from 'src/contexts/signerClient';
+import BroadcastChannelSender from 'src/services/backend/channels/BroadcastChannelSender';
+import { useBackend } from 'src/contexts/backend/backend';
 import { AvataImgIpfs } from '../../../portal/components/avataIpfs';
 import styles from './SwitchAccount.module.scss';
 import networkStyles from '../SwitchNetwork/SwitchNetwork.module.scss';
 import useMediaQuery from '../../../../hooks/useMediaQuery';
 import robot from '../../../../image/temple/robot.png';
 import Karma from '../../Karma/Karma';
-import { setDefaultAccount } from '../../../../redux/features/pocket';
-import { useBackend } from 'src/contexts/backend/backend';
 
 // should be refactored
 function AccountItem({
@@ -96,7 +96,6 @@ function SwitchAccount() {
   const [controlledVisible, setControlledVisible] = React.useState(false);
 
   const { defaultAccount, accounts } = useAppSelector((state) => state.pocket);
-  const dispatch = useAppDispatch();
 
   const useGetAddress = defaultAccount?.account?.cyber?.bech32 || null;
 
@@ -121,11 +120,8 @@ function SwitchAccount() {
   const isReadOnly = defaultAccount.account?.cyber.keys === 'read-only';
 
   const onClickChangeActiveAcc = async (key: string) => {
-    dispatch(
-      setDefaultAccount({
-        name: key,
-      })
-    );
+    const broadcastChannel = new BroadcastChannelSender();
+    broadcastChannel.postSetDefaultAccount(key);
     setControlledVisible(false);
   };
 

src/containers/governance/proposalsDetail.jsx

@@ -21,12 +21,12 @@ import ActionBarDetail from './actionBarDatail';
 
 import { formatNumber } from '../../utils/utils';
 
-import ProposalsIdDetail from './proposalsIdDetail';
 import ProposalsDetailProgressBar from './proposalsDetailProgressBar';
-import ProposalsIdDetailTableVoters from './proposalsDetailTableVoters';
 import { PROPOSAL_STATUS } from '../../utils/config';
 import useSetActiveAddress from '../../hooks/useSetActiveAddress';
 import { MainContainer } from '../portal/components';
+import ProposalsRoutes from './proposalsRoutes';
+import { useLocation, useNavigate } from 'react-router-dom';
 
 const finalTallyResult = (item) => {
   const finalVotes = {
@@ -181,8 +181,14 @@ function ProposalsDetail({ defaultAccount }) {
     return string;
   };
 
-  console.log(`proposals`, proposals);
-  console.log(`addressActive`, addressActive);
+  const location = useLocation();
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    if (location.pathname === `/senate/${proposalId}`) {
+      navigate(`/senate/${proposalId}/comments`);
+    }
+  }, [location.pathname]);
 
   return (
     <>
@@ -192,7 +198,6 @@ function ProposalsDetail({ defaultAccount }) {
             {proposals.title && ` #${proposalId} ${proposals.title}`}
           </Text>
         </Pane>
-
         {proposals.status && (
           <Pane>
             <IconStatus status={proposals.status} text marginRight={8} />
@@ -275,31 +280,27 @@ function ProposalsDetail({ defaultAccount }) {
             />
           )}
         </ContainerGradientText>
-
-        <ProposalsIdDetail
+        <ProposalsDetailProgressBar
           proposals={proposals}
+          totalDeposit={totalDeposit}
+          minDeposit={minDeposit}
           tallying={tallying}
           tally={tally}
-          totalDeposit={totalDeposit}
-          marginBottom={20}
         />
 
-        <ProposalsDetailProgressBar
+        <ProposalsRoutes
+          proposalId={proposalId}
           proposals={proposals}
-          totalDeposit={totalDeposit}
-          minDeposit={minDeposit}
           tallying={tallying}
           tally={tally}
+          totalDeposit={totalDeposit}
+          updateFunc={updateFunc}
+          proposalStatus={PROPOSAL_STATUS}
         />
-
-        {proposals.status > PROPOSAL_STATUS.PROPOSAL_STATUS_DEPOSIT_PERIOD && (
-          <ProposalsIdDetailTableVoters
-            proposalId={proposalId}
-            updateFunc={updateFunc}
-          />
-        )}
       </MainContainer>
-      {addressActive !== null && addressActive.keys === 'keplr' ? (
+      {addressActive !== null &&
+      addressActive.keys === 'keplr' &&
+      location.pathname === `/senate/${proposalId}/voters` ? (
         <ActionBarDetail
           id={proposalId}
           proposals={proposals}
@@ -308,7 +309,7 @@ function ProposalsDetail({ defaultAccount }) {
           update={() => setUpdateFunc((item) => item + 1)}
           addressActive={addressActive}
         />
-      ) : (
+      ) : addressActive === null ? (
         <ActionBar>
           <Pane>
             <Link
@@ -318,13 +319,13 @@ function ProposalsDetail({ defaultAccount }) {
                 display: 'block',
               }}
               className="btn"
-              to="/"
+              to="/keys"
             >
-              add address to your pocket from keplr
+              connect
             </Link>
           </Pane>
         </ActionBar>
-      )}
+      ) : null}
     </>
   );
 }