From 8109dd2f9cb3362c1da4f0a88c806eff7cd6b2d8 Mon Sep 17 00:00:00 2001
From: tjs <tjshipe@gmail.com>
Date: Thu, 25 Aug 2022 14:22:54 -0400
Subject: [PATCH] allow skipping creating an account

leverage slider will work after disconnecting
---
 components/modals/BorrowModal.tsx    |  2 --
 components/modals/DepositModal.tsx   |  2 --
 components/modals/UserSetupModal.tsx | 26 +++++++++++++++++---------
 components/modals/WithdrawModal.tsx  |  2 --
 components/swap/LeverageSlider.tsx   |  4 ++--
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/components/modals/BorrowModal.tsx b/components/modals/BorrowModal.tsx
index ecfaf3e0..2b1e8da8 100644
--- a/components/modals/BorrowModal.tsx
+++ b/components/modals/BorrowModal.tsx
@@ -97,8 +97,6 @@ function BorrowModal({ isOpen, onClose, token }: ModalCombinedProps) {
   )
 
   const handleSelectToken = (token: string) => {
-    setInputAmount('')
-    setSizePercentage('')
     setSelectedToken(token)
     setShowTokenList(false)
   }
diff --git a/components/modals/DepositModal.tsx b/components/modals/DepositModal.tsx
index b55df83f..1e315d53 100644
--- a/components/modals/DepositModal.tsx
+++ b/components/modals/DepositModal.tsx
@@ -104,8 +104,6 @@ function DepositModal({ isOpen, onClose, token }: ModalCombinedProps) {
   )
 
   const handleSelectToken = (token: string) => {
-    setInputAmount('')
-    setSizePercentage('')
     setSelectedToken(token)
     setShowTokenList(false)
   }
diff --git a/components/modals/UserSetupModal.tsx b/components/modals/UserSetupModal.tsx
index 8e174e57..ca2b1fb1 100644
--- a/components/modals/UserSetupModal.tsx
+++ b/components/modals/UserSetupModal.tsx
@@ -59,7 +59,6 @@ const UserSetupModal = ({ isOpen, onClose }: ModalProps) => {
     if (wallet) {
       try {
         await handleWalletConnect(wallet)
-        setIsOnboarded(true)
         setShowSetupStep(2)
       } catch (e) {
         notify({
@@ -101,7 +100,8 @@ const UserSetupModal = ({ isOpen, onClose }: ModalProps) => {
       })
       console.error(e)
     }
-  }, [accountName, wallet, t])
+    setIsOnboarded(true)
+  }, [accountName, wallet, t, setIsOnboarded])
 
   const handleDeposit = useCallback(async () => {
     const client = mangoStore.getState().client
@@ -351,13 +351,21 @@ const UserSetupModal = ({ isOpen, onClose }: ModalProps) => {
               </div>
               <div className="space-y-6">
                 <InlineNotification type="info" desc={t('insufficient-sol')} />
-                <Button
-                  className="mb-4 w-full"
-                  onClick={() => handleCreateAccount()}
-                  size="large"
-                >
-                  Create Account
-                </Button>
+                <div className="">
+                  <Button
+                    className="w-full"
+                    onClick={() => handleCreateAccount()}
+                    size="large"
+                  >
+                    Create Account
+                  </Button>
+                  <LinkButton
+                    className="mt-2 flex w-full justify-center"
+                    onClick={onClose}
+                  >
+                    <div className=" text-th-fgd-4 underline">Skip for now</div>
+                  </LinkButton>
+                </div>
               </div>
             </div>
           )}
diff --git a/components/modals/WithdrawModal.tsx b/components/modals/WithdrawModal.tsx
index 71ce8637..ed6899b9 100644
--- a/components/modals/WithdrawModal.tsx
+++ b/components/modals/WithdrawModal.tsx
@@ -124,8 +124,6 @@ function WithdrawModal({ isOpen, onClose, token }: ModalCombinedProps) {
   }
 
   const handleSelectToken = (token: string) => {
-    setInputAmount('')
-    setSizePercentage('')
     setSelectedToken(token)
     setShowTokenList(false)
   }
diff --git a/components/swap/LeverageSlider.tsx b/components/swap/LeverageSlider.tsx
index 6997448f..d9245c76 100644
--- a/components/swap/LeverageSlider.tsx
+++ b/components/swap/LeverageSlider.tsx
@@ -72,12 +72,12 @@ export const SwapLeverageSlider = ({
   amount: number
   onChange: (x: string) => void
 }) => {
-  const mangoAccountNotLoaded = mangoStore((s) => s.mangoAccount.initialLoad)
+  const mangoAccount = mangoStore((s) => s.mangoAccount.current)
   const { amountWithBorrow } = useTokenMax()
 
   return (
     <>
-      {mangoAccountNotLoaded ? (
+      {!mangoAccount ? (
         <LeverageSlider amount={amount} leverageMax={100} onChange={onChange} />
       ) : (
         <LeverageSlider