Merge branch 'develop'

dsrvlabs · May 27, 2024 · f10441b · f10441b
2 parents dabe3df + 446ffd8
commit f10441b
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 18 deletions.
diff --git a/src/components/arbitrum/Activate.tsx b/src/components/arbitrum/Activate.tsx
@@ -29,6 +29,8 @@ interface InterfaceProps {
   abi: AbiItem[];
   setContractName: Dispatch<React.SetStateAction<string>>;
   addNewContract: (contract: InterfaceContract) => void; // for SmartContracts
+  isActivated: boolean;
+  setIsActivated: Dispatch<React.SetStateAction<boolean>>;
 }
 
 export const Activate: React.FunctionComponent<InterfaceProps> = ({
@@ -41,8 +43,9 @@ export const Activate: React.FunctionComponent<InterfaceProps> = ({
   abi,
   setContractName,
   addNewContract,
+  isActivated,
+  setIsActivated,
 }) => {
-  const [isActivated, setIsActivated] = useState<boolean>(false);
   const [isLoading, setIsLoading] = useState<boolean>(false);
 
   const onActivate = async () => {
@@ -186,7 +189,7 @@ export const Activate: React.FunctionComponent<InterfaceProps> = ({
       <Button
         variant="primary"
         onClick={onActivate}
-        disabled={isActivated}
+        disabled={isActivated || isLoading}
         className="btn btn-primary btn-block d-block w-100 text-break remixui_disabled mb-1 mt-3"
       >
         <span>Activate</span>

diff --git a/src/components/arbitrum/Compiler.tsx b/src/components/arbitrum/Compiler.tsx
@@ -51,6 +51,8 @@ interface InterfaceProps {
   setContractName: Dispatch<React.SetStateAction<string>>;
   addNewContract: (contract: InterfaceContract) => void; // for SmartContracts
   setSelected: (select: InterfaceContract) => void; // for At Address
+  isActivated: boolean;
+  setIsActivated: Dispatch<React.SetStateAction<boolean>>;
 }
 
 const RCV_EVENT_LOG_PREFIX = `[==> EVENT_RCV]`;
@@ -66,11 +68,12 @@ export const Compiler: React.FunctionComponent<InterfaceProps> = ({
   providerNetwork,
   abi,
   setAbi,
-  contractAddr,
   setContractAddr,
   setContractName,
   addNewContract,
   setSelected,
+  isActivated,
+  setIsActivated,
 }) => {
   const [iconSpin, setIconSpin] = useState<string>('');
   const [deploymentTx, setDeploymentTx] = useState<string>('');
@@ -99,6 +102,7 @@ export const Compiler: React.FunctionComponent<InterfaceProps> = ({
   const init = () => {
     setDeploymentTx('');
     setIsReadToActivate(false);
+    setIsActivated(false);
     setDataFee('');
     setFileName('');
     setTxHash('');
@@ -612,12 +616,13 @@ export const Compiler: React.FunctionComponent<InterfaceProps> = ({
           providerNetwork={providerNetwork}
           isReadyToActivate={isReadyToActivate}
           dataFee={dataFee}
-          contractAddr={contractAddr}
           setContractAddr={setContractAddr}
           setContractName={setContractName}
           addNewContract={addNewContract}
           abi={abi}
           uploadCodeChecked={uploadCodeChecked}
+          isActivated={isActivated}
+          setIsActivated={setIsActivated}
         />
       ) : null}
     </>

diff --git a/src/components/arbitrum/Connect.tsx b/src/components/arbitrum/Connect.tsx
@@ -41,7 +41,6 @@ export const Connect: React.FunctionComponent<InterfaceProps> = ({ client }) =>
         />
         {providerNetwork === STYLUS_TESTNET_V2_CHAIN_ID ? (
           <Project
-            wallet={wallet}
             account={account}
             injectedProvider={injectedProvider}
             client={client}

diff --git a/src/components/arbitrum/Deploy.tsx b/src/components/arbitrum/Deploy.tsx
@@ -33,12 +33,13 @@ interface InterfaceProps {
   providerNetwork: string;
   isReadyToActivate: boolean;
   dataFee: string;
-  contractAddr: string;
   setContractAddr: Dispatch<React.SetStateAction<string>>;
   setContractName: Dispatch<React.SetStateAction<string>>;
   addNewContract: (contract: InterfaceContract) => void; // for SmartContracts
   abi: AbiItem[];
   uploadCodeChecked: boolean;
+  isActivated: boolean;
+  setIsActivated: Dispatch<React.SetStateAction<boolean>>;
 }
 
 export const Deploy: React.FunctionComponent<InterfaceProps> = ({
@@ -50,12 +51,13 @@ export const Deploy: React.FunctionComponent<InterfaceProps> = ({
   account,
   isReadyToActivate,
   dataFee,
-  contractAddr,
   setContractAddr,
   setContractName,
   addNewContract,
   abi,
   uploadCodeChecked,
+  isActivated,
+  setIsActivated,
 }) => {
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const [deployedContractAddress, setDeployedContractAddress] = useState<string>('');
@@ -223,6 +225,8 @@ export const Deploy: React.FunctionComponent<InterfaceProps> = ({
             setContractName={setContractName}
             abi={abi}
             addNewContract={addNewContract}
+            isActivated={isActivated}
+            setIsActivated={setIsActivated}
           ></Activate>
         ) : null}
       </Form>

diff --git a/src/components/arbitrum/Project.tsx b/src/components/arbitrum/Project.tsx
@@ -18,15 +18,13 @@ import Web3 from 'web3';
 import { AbiItem } from 'web3-utils';
 
 interface InterfaceProps {
-  wallet: string;
   account: string;
   client: Client<Api, Readonly<IRemixApi>>;
   injectedProvider: any;
   providerNetwork: string;
 }
 
 export const Project: React.FunctionComponent<InterfaceProps> = ({
-  wallet,
   account,
   injectedProvider,
   providerNetwork,
@@ -44,6 +42,7 @@ export const Project: React.FunctionComponent<InterfaceProps> = ({
   const [contractAddr, setContractAddr] = React.useState<string>('');
   const [contracts, setContracts] = React.useState<InterfaceContract[]>([]);
   const [selected, setSelected] = React.useState<InterfaceContract | null>(null);
+  const [isActivated, setIsActivated] = React.useState<boolean>(false);
 
   const templateList = ['hello-world'];
 
@@ -272,6 +271,8 @@ export const Project: React.FunctionComponent<InterfaceProps> = ({
         setContractName={setContractName}
         addNewContract={addNewContract}
         setSelected={setSelected}
+        isActivated={isActivated}
+        setIsActivated={setIsActivated}
       />
       {/*<p className="text-center mt-3">*/}
       {/*  <small>OR</small>*/}
@@ -311,15 +312,17 @@ export const Project: React.FunctionComponent<InterfaceProps> = ({
       {/*  </OverlayTrigger>*/}
       {/*</InputGroup>*/}
       <hr />
-      <SmartContracts
-        dapp={injectedProvider}
-        account={account}
-        busy={busy}
-        setBusy={setBusy}
-        contracts={contracts}
-        client={client}
-        web3={new Web3(injectedProvider)}
-      />
+      {isActivated ? (
+        <SmartContracts
+          dapp={injectedProvider}
+          account={account}
+          busy={busy}
+          setBusy={setBusy}
+          contracts={contracts}
+          client={client}
+          web3={new Web3(injectedProvider)}
+        />
+      ) : null}
     </div>
   );
 };