From c1d050d9647403ed1a2511d09d9abfba6e21cede Mon Sep 17 00:00:00 2001
From: Rohitkk432 <74586376+Rohitkk432@users.noreply.github.com>
Date: Sat, 29 Jul 2023 15:11:43 +0530
Subject: [PATCH] minor ui changes

---
 src/components/issues/open-issues-expand.tsx | 36 +++++++++-----------
 src/components/swaps/BuyConsole.tsx          |  2 +-
 src/components/swaps/SwapConsole.tsx         |  2 +-
 src/pages/onboarding.tsx                     |  6 ++--
 4 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/components/issues/open-issues-expand.tsx b/src/components/issues/open-issues-expand.tsx
index a100d51..4bbfc65 100644
--- a/src/components/issues/open-issues-expand.tsx
+++ b/src/components/issues/open-issues-expand.tsx
@@ -131,9 +131,9 @@ const OpenIssueExpand: React.FC<OpenIssueExpandProps> = ({
   const [selectedPR, setSelectedPR] = useState<any>();
 
   const userInfo = useAppSelector((state) => state.userInfo.githubInfo);
-  const [userTokenInfo, setUserTokenInfo] = useState<any>(null);
+  const [userTokenInfo, setUserTokenInfo] = useState<any>();
 
-  const refetchPart = useAppSelector((state)=> state.refetch.refetchPart);
+  const refetchPart = useAppSelector((state) => state.refetch.refetchPart);
 
   const [PRSort, setPRSort] = useState<any>([
     {
@@ -762,8 +762,10 @@ const OpenIssueExpand: React.FC<OpenIssueExpandProps> = ({
   }, [link]);
 
   useEffect(() => {
-    if(refetchPart==='issue'){
-      setTokenStakingState();
+    if (refetchPart === 'issue') {
+      setTimeout(() => {
+        setTokenStakingState();
+      }, 1000);
       setStakeAmount(0);
       setPRStakeAmount(0);
     }
@@ -822,12 +824,7 @@ const OpenIssueExpand: React.FC<OpenIssueExpandProps> = ({
                   shape="rounded"
                   onClick={handleIssueStake}
                   isLoading={stateLoading === 'loading'}
-                  disabled={
-                    userTokenInfo === null ||
-                    parseInt(userTokenInfo.amount) /
-                      10 ** userTokenInfo.decimals ===
-                      0
-                  }
+                  disabled={userTokenInfo === null}
                 >
                   Stake
                 </Button>
@@ -845,10 +842,12 @@ const OpenIssueExpand: React.FC<OpenIssueExpandProps> = ({
               <div className="mt-3">
                 {userTokenInfo === null
                   ? "User doesn't have tokens."
-                  : userTokenInfo.amount && userTokenInfo.decimals
+                  : userTokenInfo !== undefined &&
+                    userTokenInfo.amount &&
+                    userTokenInfo.decimals
                   ? `Balance: ${
-                      parseInt(userTokenInfo.amount) /
-                      10 ** userTokenInfo.decimals
+                      parseInt(userTokenInfo?.amount) /
+                      10 ** userTokenInfo?.decimals
                     }`
                   : null}
               </div>
@@ -898,12 +897,7 @@ const OpenIssueExpand: React.FC<OpenIssueExpandProps> = ({
                     shape="rounded"
                     onClick={handlePRStake}
                     isLoading={stateLoading === 'loading'}
-                    disabled={
-                      userTokenInfo === null ||
-                      parseInt(userTokenInfo.amount) /
-                        10 ** userTokenInfo.decimals ===
-                        0
-                    }
+                    disabled={userTokenInfo === null}
                   >
                     Stake
                   </Button>
@@ -921,7 +915,9 @@ const OpenIssueExpand: React.FC<OpenIssueExpandProps> = ({
                 <div className="mt-3">
                   {userTokenInfo === null
                     ? "User doesn't have tokens."
-                    : userTokenInfo.amount && userTokenInfo.decimals
+                    : userTokenInfo !== undefined &&
+                      userTokenInfo?.amount &&
+                      userTokenInfo?.decimals
                     ? `Balance: ${
                         parseInt(userTokenInfo.amount) /
                         10 ** userTokenInfo.decimals
diff --git a/src/components/swaps/BuyConsole.tsx b/src/components/swaps/BuyConsole.tsx
index fc3a692..ff5408b 100644
--- a/src/components/swaps/BuyConsole.tsx
+++ b/src/components/swaps/BuyConsole.tsx
@@ -252,7 +252,7 @@ const BuyConsole: React.FC<BuyConsoleProps> = ({ setConsoleType }) => {
             Announcement
           </div>
           <div className="mb-1 text-sm xl:mb-1.5 xl:text-base 3xl:mb-2 3xl:text-lg">
-            Between 24th July and 31st July the following devnet tokens
+            Between 24th July and 4th August the following devnet tokens
           </div>
           <div className="mb-1 flex items-center text-xs xl:mb-1.5 xl:text-sm 3xl:mb-2 3xl:text-base">
             <AnchorLink
diff --git a/src/components/swaps/SwapConsole.tsx b/src/components/swaps/SwapConsole.tsx
index 5ed113c..6330d02 100644
--- a/src/components/swaps/SwapConsole.tsx
+++ b/src/components/swaps/SwapConsole.tsx
@@ -308,7 +308,7 @@ const SwapConsole: React.FC<SwapConsoleProps> = ({ setConsoleType }) => {
             Announcement
           </div>
           <div className="mb-1 text-sm xl:mb-1.5 xl:text-base 3xl:mb-2 3xl:text-lg">
-            Between 24th July and 31st July the following devnet tokens
+            Between 24th July and 4th August the following devnet tokens
           </div>
           <div className="mb-1 flex items-center text-xs xl:mb-1.5 xl:text-sm 3xl:mb-2 3xl:text-base">
             <AnchorLink
diff --git a/src/pages/onboarding.tsx b/src/pages/onboarding.tsx
index 6bae0d3..71199d8 100644
--- a/src/pages/onboarding.tsx
+++ b/src/pages/onboarding.tsx
@@ -105,7 +105,7 @@ const Onboarding: React.FC<OnboardingProps> = ({}) => {
               Contributor
             </div>
             <div className="text-wrap xl:w-68 w-64 text-center text-xs xl:text-sm 3xl:w-72 3xl:text-base">
-              Best if you are working on existing open source projects or
+              if you are working on existing open source projects or
               staking money on open issues.
             </div>
           </div>
@@ -130,7 +130,7 @@ const Onboarding: React.FC<OnboardingProps> = ({}) => {
               Repo Owner
             </div>
             <div className="text-wrap xl:w-68 w-64 text-center text-xs xl:text-sm 3xl:w-72 3xl:text-base">
-              Best for people who own and operate multiple open source
+              For people who own and operate multiple open source
               repositories and want a management console.
             </div>
           </div>
@@ -141,7 +141,7 @@ const Onboarding: React.FC<OnboardingProps> = ({}) => {
           setUserRole('unchoosen');
           handleSumbitType();
         }}
-        className="absolute top-5 right-5 text-sm text-gray-400 xl:text-base 3xl:text-lg"
+        className="absolute top-5 right-5 cursor-pointer text-sm text-gray-400 xl:text-base 3xl:text-lg"
       >
         Skip
       </div>