Merge into main from develop

modules/stonks/ui/StonksGridWrapper/StonksGridWrapper.tsx

@@ -0,0 +1,36 @@
+import { Button } from '@lidofinance/lido-ui'
+import { useWeb3 } from 'modules/blockChain/hooks/useWeb3'
+import { useConnectWalletModal } from 'modules/wallet/ui/ConnectWalletModal'
+import { useStonksData } from 'modules/stonks/hooks/useStonksData'
+import { PageLoader } from 'modules/shared/ui/Common/PageLoader'
+import { MessageBox } from 'modules/stonks/ui/StonksOrderForm'
+import { StonksGrid } from 'modules/stonks/ui/StonksGridWrapper/StonksGrid'
+
+export function StonksGridWrapper() {
+  const { isWalletConnected } = useWeb3()
+  const openConnectWalletModal = useConnectWalletModal()
+  const { stonksData, isStonksDataLoading } = useStonksData()
+
+  if (!isWalletConnected) {
+    return (
+      <Button
+        type="submit"
+        fullwidth
+        children="Connect wallet to proceed"
+        onClick={openConnectWalletModal}
+      />
+    )
+  }
+
+  if (isStonksDataLoading) {
+    return <PageLoader />
+  }
+
+  if (!stonksData) {
+    return (
+      <MessageBox>Only Stonks Managers can create Stonks Orders</MessageBox>
+    )
+  }
+
+  return <StonksGrid stonksData={stonksData} />
+}

modules/stonks/ui/StonksGridWrapper/index.ts

@@ -0,0 +1 @@
+export { StonksGridWrapper } from './StonksGridWrapper'

modules/stonks/ui/StonksOrderCard/StonksOrderCardCreateButton/StonksOrderCardCreateButton.tsx

@@ -35,12 +35,12 @@ export function StonksOrderCardCreateButton({
       }
 
       await createOffChainOrder(orderInput, chainId)
-      onSuccess?.()
     } catch (error: any) {
       console.error(error)
       ToastError(error?.message ?? 'Something went wrong', {})
     } finally {
       setIsSubmitting(false)
+      onSuccess?.()
     }
   }
 

modules/stonks/ui/StonksOrderCard/StonksOrderCardRecoverButton/StonksOrderCardRecoverButton.tsx

@@ -3,6 +3,7 @@ import { StonksOrderAbi__factory } from 'generated'
 import { useTransactionSender } from 'modules/blockChain/hooks/useTransactionSender'
 import { useWeb3 } from 'modules/blockChain/hooks/useWeb3'
 import { estimateGasFallback } from 'modules/motions/utils'
+import { useConnectWalletModal } from 'modules/wallet/ui/ConnectWalletModal'
 import { ButtonWrap } from '../StonksOrderCardStyle'
 
 type Props = {
@@ -17,6 +18,7 @@ export function StonksOrderCardRecoverButton({
   onFinish,
 }: Props) {
   const { library, isWalletConnected } = useWeb3()
+  const openConnectWalletModal = useConnectWalletModal()
 
   const populateRecover = async () => {
     if (!library) {
@@ -40,15 +42,24 @@ export function StonksOrderCardRecoverButton({
 
   return (
     <ButtonWrap>
-      <Button
-        onClick={txRecover.isEmpty ? txRecover.send : undefined}
-        loading={txRecover.isPending}
-        disabled={!isWalletConnected || !txRecover.isEmpty}
-        fullwidth
-        variant={variant}
-      >
-        Recover funds
-      </Button>
+      {isWalletConnected ? (
+        <Button
+          onClick={txRecover.isEmpty ? txRecover.send : undefined}
+          loading={txRecover.isPending}
+          disabled={!txRecover.isEmpty}
+          fullwidth
+          variant={variant}
+        >
+          Recover funds
+        </Button>
+      ) : (
+        <Button
+          type="submit"
+          fullwidth
+          children="Connect wallet to recover funds"
+          onClick={openConnectWalletModal}
+        />
+      )}
     </ButtonWrap>
   )
 }

modules/stonks/ui/StonksOrderResolverForm/StonksOrderResolverForm.tsx

@@ -11,13 +11,16 @@ import { Fieldset } from './StonksOrderResolverFormStyle'
 import { Form } from 'modules/shared/ui/Controls/Form'
 import { InputControl } from 'modules/shared/ui/Controls/Input'
 import { validateAddress } from 'modules/motions/utils/validateAddress'
+import { getBackendRpcUrl } from 'modules/blockChain/utils/getBackendRpcUrl'
+import { getStaticRpcBatchProvider } from '@lido-sdk/providers'
+import { useMemo } from 'react'
 
 type FormData = {
   txHashOrAddress: string
 }
 
 export function StonksOrderResolverForm() {
-  const { chainId, library } = useWeb3()
+  const { chainId } = useWeb3()
   const router = useRouter()
 
   const formMethods = useForm<FormData>({
@@ -31,8 +34,12 @@ export function StonksOrderResolverForm() {
 
   const { isSubmitting } = formMethods.formState
 
+  const library = useMemo(
+    () => getStaticRpcBatchProvider(chainId, getBackendRpcUrl(chainId)),
+    [chainId],
+  )
+
   const handleSubmit = async (values: FormData) => {
-    if (!library) return
     try {
       const isAddress = utils.isAddress(values.txHashOrAddress)
       if (isAddress) {
@@ -91,7 +98,7 @@ export function StonksOrderResolverForm() {
           loading={isSubmitting}
           disabled={!formMethods.formState.isValid}
         >
-          Go to order
+          Find order
         </Button>
       </Fieldset>
     </Form>

modules/stonks/utils/fetchCowApi.ts

@@ -32,8 +32,11 @@ export const fetchCowApi = async <T extends unknown>({
     headers: {
       'Content-Type': 'application/json',
     },
+    next: {
+      revalidate: 0,
+    },
     body,
-  })
+  } as any)
 
   const data = await requested.json()
 

pages/stonks/index.tsx

@@ -1,68 +1,21 @@
-import { Button } from '@lidofinance/lido-ui'
-import { useWeb3 } from 'modules/blockChain/hooks/useWeb3'
-import { useConnectWalletModal } from 'modules/wallet/ui/ConnectWalletModal'
-import { StonksPageContainer } from 'modules/stonks/ui/StonksPageContainer'
-import { useStonksData } from 'modules/stonks/hooks/useStonksData'
-import { PageLoader } from 'modules/shared/ui/Common/PageLoader'
-import { MessageBox, Subtitle } from 'modules/stonks/ui/StonksOrderForm'
+import { Subtitle } from 'modules/stonks/ui/StonksOrderForm'
 import { Title } from 'modules/shared/ui/Common/Title'
 import { StonksOrderResolverForm } from 'modules/stonks/ui/StonksOrderResolverForm'
-import { StonksGrid } from 'modules/stonks/ui/StonksGrid'
+import { StonksGridWrapper } from 'modules/stonks/ui/StonksGridWrapper'
+import { StonksPageContainer } from 'modules/stonks/ui/StonksPageContainer'
 
 export default function StonksCreateOrderPage() {
-  const { isWalletConnected } = useWeb3()
-  const openConnectWalletModal = useConnectWalletModal()
-  const { stonksData, isStonksDataLoading } = useStonksData()
-
-  if (!isWalletConnected) {
-    return (
-      <StonksPageContainer>
-        <Title title="Do stonks" />
-        <MessageBox>Connect your wallet first</MessageBox>
-        <br />
-        <Button
-          type="submit"
-          fullwidth
-          children="Connect wallet"
-          onClick={openConnectWalletModal}
-        />
-      </StonksPageContainer>
-    )
-  }
-
-  if (isStonksDataLoading) {
-    return (
-      <StonksPageContainer>
-        <Title title="Do stonks" />
-        <PageLoader />
-      </StonksPageContainer>
-    )
-  }
-
-  if (!stonksData) {
-    return (
-      <StonksPageContainer>
-        <Title title="Do stonks" />
-        <MessageBox>Only Stonks Managers have access to Stonks</MessageBox>
-      </StonksPageContainer>
-    )
-  }
-
   return (
     <StonksPageContainer>
       <Title title="Do stonks" />
       <Subtitle size={20} weight={800} isCentered>
         Manage existing order
       </Subtitle>
       <StonksOrderResolverForm />
-      {stonksData.length ? (
-        <>
-          <Subtitle size={20} weight={800} isCentered>
-            Create on-chain order
-          </Subtitle>
-          <StonksGrid stonksData={stonksData} />
-        </>
-      ) : null}
+      <Subtitle size={20} weight={800} isCentered>
+        Create on-chain order
+      </Subtitle>
+      <StonksGridWrapper />
     </StonksPageContainer>
   )
 }