fix: Registry changes (#83)

* refactor: add 'safe contract address' as link * refactor: add new routes for my bonds * fix: test-cases for services * refactor: update table layout in 4thStepDeployed component to 100% * fix: minor updates
valory-xyz · Aug 27, 2024 · ba978bd · ba978bd
1 parent e34eae4
commit ba978bd
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 27 deletions.
diff --git a/apps/autonolas-registry/common-util/List/IpfsHashGenerationModal/index.jsx b/apps/autonolas-registry/common-util/List/IpfsHashGenerationModal/index.jsx
@@ -228,6 +228,7 @@ export const IpfsHashGenerationModal = ({
               <span>
                 {/* TODO: fetch from middleware constant */}
                 <ul style={{ margin: 0 }}>
+                  <li>{'ipfs://{IPFS_HASH}'}</li>
                   <li>https://gateway.autonolas.tech/ipfs/*</li>
                   <li>https://gateway.pinata.cloud/ipfs/*</li>
                   <li>https://*.arweave.net/</li>
@@ -236,7 +237,7 @@ export const IpfsHashGenerationModal = ({
             </Flex>
           }
         >
-          <Input />
+          <Input placeholder="ipfs://" />
         </Form.Item>
       </Form>
     </CustomModal>

diff --git a/...nolas-registry/components/ListServices/ServiceState/3rdStepFinishedRegistration/index.jsx b/...nolas-registry/components/ListServices/ServiceState/3rdStepFinishedRegistration/index.jsx
@@ -254,7 +254,7 @@ export const FinishedRegistration = ({
           className="mt-8"
         >
           {options.map((multisigAddress) => (
-            <div className="mb-12" key={`mutisig-${multisigAddress}`}>
+            <div className="mb-12" key={`multisig-${multisigAddress}`}>
               <RadioLabel disabled={btnProps.disabled}>
                 {multisigAddress === isMultiSig && OPTION_1}
                 {multisigAddress !== isMultiSig && OPTION_2}
@@ -377,6 +377,7 @@ export const FinishedRegistration = ({
                   console.error(error);
                 } finally {
                   setIsSubmitting(false);
+                  notifyError('Error occurred while updating multisig. Please try again.');
                 }
               }}
               {...getOtherBtnProps(STEP, {

diff --git a/apps/autonolas-registry/components/ListServices/ServiceState/4thStepDeployed/index.jsx b/apps/autonolas-registry/components/ListServices/ServiceState/4thStepDeployed/index.jsx
@@ -1,13 +1,15 @@
-import { useEffect, useMemo, useState } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
+import { Space, Table } from 'antd';
 import PropTypes from 'prop-types';
-import { Table, Space } from 'antd';
+import { useEffect, useMemo, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+
 import { AddressLink } from '@autonolas/frontend-library';
 
-import { setAgentInstancesAndOperators } from '../../../../store/service';
-import { useScreen } from 'common-util/hooks/useScreen';
-import { useHelpers } from 'common-util/hooks/useHelpers';
 import { SendTransactionButton } from 'common-util/TransactionHelpers/SendTransactionButton';
+import { useHelpers } from 'common-util/hooks/useHelpers';
+import { useScreen } from 'common-util/hooks/useScreen';
+
+import { setAgentInstancesAndOperators } from '../../../../store/service';
 import { useAgentInstanceAndOperator } from '../../hooks/useSvmService';
 import { getAgentInstanceAndOperator } from '../utils';
 
@@ -24,9 +26,7 @@ export const Deployed = ({
   const dispatch = useDispatch();
   const { account, chainId, isSvm, chainName } = useHelpers();
   const { isMobile } = useScreen();
-  const data = useSelector(
-    (state) => state?.service?.agentInstancesAndOperators,
-  );
+  const data = useSelector((state) => state?.service?.agentInstancesAndOperators);
   const [isTerminating, setIsTerminating] = useState(false);
   const { getSvmAgentInstanceAndOperator } = useAgentInstanceAndOperator();
 
@@ -47,14 +47,7 @@ export const Deployed = ({
     return () => {
       isMounted = false;
     };
-  }, [
-    serviceId,
-    chainId,
-    isSvm,
-    currentStep,
-    dispatch,
-    getSvmAgentInstanceAndOperator,
-  ]);
+  }, [serviceId, chainId, isSvm, currentStep, dispatch, getSvmAgentInstanceAndOperator]);
 
   const onTerminate = async () => {
     try {
@@ -78,7 +71,7 @@ export const Deployed = ({
 
   return (
     <div className="step-4-deployed" data-testid="step-deployed">
-      <Space direction="vertical" size={10}>
+      <Space direction="vertical" size={10} className="full-width">
         {isShowAgentInstanceVisible && (
           <Table
             dataSource={data}
@@ -90,23 +83,22 @@ export const Deployed = ({
                 title: 'Agent Instances',
                 dataIndex: 'agentInstance',
                 key: 'agentInstance',
-                render: (text) => (
-                  <AddressLink text={text} {...addressLinkProps} />
-                ),
+                render: (text) => <AddressLink text={text} {...addressLinkProps} />,
+                width: '50%',
               },
               {
                 title: 'Operators',
                 dataIndex: 'operatorAddress',
                 key: 'operatorAddress',
-                render: (text) => (
-                  <AddressLink text={text} {...addressLinkProps} />
-                ),
+                render: (text) => <AddressLink text={text} {...addressLinkProps} />,
+                width: '50%',
               },
             ]}
           />
         )}
         <div>
-          {`${isSvm ? 'Squads' : 'Safe'} contract address: ${multisig}`}
+          {`${isSvm ? 'Squads' : 'Safe'} contract address:`}
+          <AddressLink text={multisig} {...addressLinkProps} />
         </div>
         {getButton(
           <SendTransactionButton

diff --git a/apps/autonolas-registry/tests/components/ListServices/details.test.jsx b/apps/autonolas-registry/tests/components/ListServices/details.test.jsx
@@ -54,6 +54,17 @@ jest.mock('wagmi', () => ({
   },
 }));
 
+jest.mock('libs/common-contract-functions/src', () => ({
+  useClaimableIncentives: jest.fn().mockReturnValue({
+    reward: '0.25',
+    topUp: '111,555.70',
+  }),
+  getPendingIncentives: jest.fn().mockResolvedValue({
+    reward: '0.5',
+    topUp: '100,800.25',
+  }),
+}));
+
 jest.mock('common-util/List/IpfsHashGenerationModal/helpers', () => ({
   getIpfsHashHelper: jest.fn(() => mockV1Hash),
 }));

diff --git a/apps/tokenomics/next.config.js b/apps/tokenomics/next.config.js
@@ -47,6 +47,11 @@ const nextConfig = {
         source: '/manage-solana-liquidity',
         destination: 'https://bond.olas.network/manage-solana-liquidity',
         permanent: true,
+      },
+      {
+        source: '/my-bonds',
+        destination: 'https://bond.olas.network/my-bonds',
+        permanent: true,
       }
     ];
   },