fix: Finalize for bermuda pre-launch

OwshenNetwork · Jan 20, 2024 · af4d2ca · af4d2ca · RestlessHavoc · Jan 21, 2024
1 parent bb1f0b0
commit af4d2ca
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 33 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "owshen"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 
 [dependencies]

diff --git a/client/src/components/DropDown/index.js b/client/src/components/DropDown/index.js
@@ -60,7 +60,7 @@ const Dropdown = ({
           className="absolute w-full py-2 mt-1 space-y-1 text-sm bg-blue-100 border border-blue-500 rounded-lg shadow-lg z-50 not"
           aria-label="submenu"
         >
-          {options.map(({ title, value, img }, id) => {
+          {options?.map(({ title, value, img }, id) => {
             return (
               <button
                 className="flex items-center justify-center w-full  py-1 font-medium border-b border-blue-500 last:border-0 transition-colors duration-150  hover:text-gray-900 focus:outline-none focus:shadow-outline hover:bg-gray-100"

diff --git a/client/src/components/Main/index.js b/client/src/components/Main/index.js
@@ -124,7 +124,7 @@ const Main = ({ children }) => {
     if (isTest) {
       return setIsInprogress(true);
     }
-    address ? setIsOpen(true) : toast.error("Connect your wallet first");
+    address ? setIsOpen(true) : toast.error("Connect your wallet first!");
   };
   const diveAmount = () => {
     let totalAmount = 0;
@@ -184,10 +184,10 @@ const Main = ({ children }) => {
             <button data-tooltip-id="Send" onClick={canOpenModal}>
               <img src={SendIcon} />
             </button>
-            <Tooltip id="swap" place="bottom" content="swap" />
+            <Tooltip id="Swap" place="bottom" content="Swap" />
             <button
               onClick={() => setIsInprogress(true)}
-              data-tooltip-id="swap"
+              data-tooltip-id="Swap"
               // onClick={openWithdraw}
             >
               <img src={SwapIcon} />

diff --git a/client/src/components/Modal/TransactionModal.js b/client/src/components/Modal/TransactionModal.js
@@ -10,6 +10,7 @@ import {
   setReceivedCoins,
   selectReceivedCoins,
   selectNetwork,
+  selectIsTest,
 } from "../../store/containerSlice";
 import { useAccount } from "wagmi";
 import { getERC20Balance } from "../../utils/helper";
@@ -43,13 +44,16 @@ const TransactionModal = ({
   const [tokenOptions, setTokenOptions] = useState([]);
   const [MaxBalanceOfWithdraw, setMaxBalanceOfWithdraw] = useState("");
   const [selectedContract, setSelectedContract] = useState("");
+  const isTest = useSelector(selectIsTest);
 
   const walletOptions = [
-    {
-      title: "Your Ethereum Account",
-      value: "Your Ethereum Account",
-      img: MetaMaskLogo,
-    },
+    isTest
+      ? {
+          title: "Your Ethereum Account",
+          value: "Your Ethereum Account",
+          img: MetaMaskLogo,
+        }
+      : {},
     { title: "Your Owshen Account", value: "Your Owshen Account", img: Logo },
   ];
   useEffect(() => {
@@ -120,10 +124,10 @@ const TransactionModal = ({
     return toast.error("No matching coin is found");
   };
   const getStealth = async () => {
-    if (!address) return toast.error("Connect your wallet first");
-    if (!destOwshenWallet) return toast.error("Enter your Destination");
-    if (!tokenContract) return toast.error("Select your token");
-    if (!tokenAmount) return toast.error("Enter amount of token");
+    if (!address) return toast.error("Connect your wallet first!");
+    if (!destOwshenWallet) return toast.error("Enter your destination!");
+    if (!tokenContract) return toast.error("Select your token!");
+    if (!tokenAmount) return toast.error("Enter amount of token!");
     if (network.chainId !== chainId)
       return toast.error(
         `Please change your wallet network to ${network.name}`
@@ -169,20 +173,20 @@ const TransactionModal = ({
             setIsOpen(false);
           });
         } catch (error) {
-          toast.error("Error while getting approve or deposit flow");
+          toast.error("Error while transferring tokens!");
 
-          console.log(error, "Error while getting approve or deposit flow");
+          console.log(error, "Error while transferring tokens!");
         }
       })
       .catch((error) => {
         return toast.error(`Internal server error: ${error}`);
       });
   };
   const send = async () => {
-    if (!address) return toast.error("Connect your wallet first");
-    if (!destOwshenWallet) return toast.error("Enter your Destination");
-    if (!tokenContract) return toast.error("Select your token");
-    if (!tokenAmount) return toast.error("Enter amount of token");
+    if (!address) return toast.error("Connect your wallet first!");
+    if (!destOwshenWallet) return toast.error("Enter your destination!");
+    if (!tokenContract) return toast.error("Select your token!");
+    if (!tokenAmount) return toast.error("Enter amount of token!");
     if (network.chainId !== chainId)
       return toast.error(
         `Please change your wallet network to ${network.name}`
@@ -256,8 +260,8 @@ const TransactionModal = ({
           const txReceipt = await txResponse.wait();
           console.log("Transaction receipt", txReceipt);
         } catch (error) {
-          toast.error("Error while getting withdraw flow");
-          console.log(error, "Error while getting withdraw flow");
+          toast.error("Error while transferring tokens!");
+          console.log(error, "Error while transferring tokens!");
         }
       })
       .catch((error) => {
@@ -267,12 +271,12 @@ const TransactionModal = ({
 
   const callSend = async () => {
     OwshenWallet.wallet === destOwshenWallet
-      ? await getStealth()
+      ? toast.error("You can't send to yourself!")
       : await send();
   };
 
   const withdrawal = async (index, owshen, address) => {
-    if (!address) return toast.error("Connect your wallet first");
+    if (!address) return toast.error("Connect your wallet first!");
     // if (tokenAmount > trueAmount(MaxBalanceOfWithdraw)) {
     //   return toast.error(
     //     "your entered amount for withdraw is grater than max value of the selected token"
@@ -334,7 +338,7 @@ const TransactionModal = ({
           console.log("Transaction receipt", txReceipt);
           setIsOpen(false);
         } catch (error) {
-          toast.error("Error while getting withdraw flow");
+          toast.error("Error while transferring tokens!");
           setIsOpen(false);
         }
       })
@@ -380,7 +384,7 @@ const TransactionModal = ({
           <b>Token: </b>
         </label>
         <Dropdown
-          label={isDataSet ? "DIVE" : "choose your token"}
+          label={isDataSet ? "DIVE" : "Choose your token"}
           options={tokenOptions}
           select={setTokenContract}
           style={`py-5 ${isDataSet ? "pointer-events-none" : ""}`}

diff --git a/client/src/components/ReceivedCoins/index.js b/client/src/components/ReceivedCoins/index.js
@@ -134,7 +134,8 @@ const ReceivedCoinList = () => {
                   </button>
 
                   <button
-                    onClick={() => withdrawHandler(coin)}
+                    // onClick={() => withdrawHandler(coin)}
+                    onClick={() => setIsInprogress(true)}
                     className="ml-2"
                   >
                     <img alt="" src={SwapIcon} />

diff --git a/client/src/components/SelectNetwork/index.js b/client/src/components/SelectNetwork/index.js
@@ -13,21 +13,23 @@ const SelectNetwork = () => {
     process.env.REACT_APP_OWSHEN_ENDPOINT || "http://127.0.0.1:9000";
   const accountData = useAccount();
   const chainId = accountData ? accountData.chainId : undefined;
-  const [network, setNetWork] = useState("select network");
+  const [network, setNetWork] = useState("Select Network");
 
   useEffect(() => {}, []);
 
   const isTest = useSelector(selectIsTest);
   const netWorkOptions = [
+    isTest
+      ? {
+          title: "Goerli",
+          value: "Goerli",
+        }
+      : {},
     !isTest && {
-      title: "Goerli",
-      value: "Goerli",
-    },
-    {
       title: "Sepolia",
       value: "Sepolia",
     },
-    !isTest && { title: "Localhost", value: "Localhost" },
+    isTest ? { title: "Localhost", value: "Localhost" } : {},
   ];
   useEffect(() => {
     checkNetwork(chainId);