fix: use confirmedQuote.opportunityId as routing source of truth for

confirm and status routes
shapeshift · Jan 17, 2024 · ada4b06 · ada4b06
1 parent a708afd
commit ada4b06
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 18 deletions.
diff --git a/src/lib/utils/thorchain/lp/types.ts b/src/lib/utils/thorchain/lp/types.ts
@@ -192,4 +192,5 @@ export type ConfirmedQuote = {
   runeFiatLiquidityAmount: string
   shareOfPoolDecimalPercent: string
   slippageRune: string
+  opportunityId: string
 }
diff --git a/src/pages/ThorChainLP/components/AddLiquitity/AddLiquidity.tsx b/src/pages/ThorChainLP/components/AddLiquitity/AddLiquidity.tsx
@@ -61,19 +61,13 @@ export const AddLiquidityRoutes: React.FC<AddLiquidityRoutesProps> = ({
     [confirmedQuote, headerComponent, opportunityId, setConfirmedQuote],
   )
   const renderAddLiquidityConfirm = useCallback(
-    () =>
-      confirmedQuote ? (
-        <AddLiquidityConfirm opportunityId={opportunityId} confirmedQuote={confirmedQuote} />
-      ) : null,
-    [confirmedQuote, opportunityId],
+    () => (confirmedQuote ? <AddLiquidityConfirm confirmedQuote={confirmedQuote} /> : null),
+    [confirmedQuote],
   )
 
   const renderAddLiquidityStatus = useCallback(
-    () =>
-      confirmedQuote ? (
-        <AddLiquidityStatus opportunityId={opportunityId} confirmedQuote={confirmedQuote} />
-      ) : null,
-    [confirmedQuote, opportunityId],
+    () => (confirmedQuote ? <AddLiquidityStatus confirmedQuote={confirmedQuote} /> : null),
+    [confirmedQuote],
   )
 
   return (

diff --git a/src/pages/ThorChainLP/components/AddLiquitity/AddLiquidityConfirm.tsx b/src/pages/ThorChainLP/components/AddLiquitity/AddLiquidityConfirm.tsx
@@ -46,18 +46,16 @@ const dividerStyle = {
 }
 
 type AddLiquidityConfirmProps = {
-  opportunityId?: string
   confirmedQuote: ConfirmedQuote
 }
 
-export const AddLiquidityConfirm = ({
-  confirmedQuote,
-  opportunityId,
-}: AddLiquidityConfirmProps) => {
+export const AddLiquidityConfirm = ({ confirmedQuote }: AddLiquidityConfirmProps) => {
   const translate = useTranslate()
   const history = useHistory()
   const backIcon = useMemo(() => <ArrowBackIcon />, [])
 
+  const { opportunityId } = confirmedQuote
+
   const { data: parsedPools } = usePools()
 
   const foundPool = useMemo(() => {

diff --git a/src/pages/ThorChainLP/components/AddLiquitity/AddLiquidityInput.tsx b/src/pages/ThorChainLP/components/AddLiquitity/AddLiquidityInput.tsx
@@ -287,7 +287,8 @@ export const AddLiquidityInput: React.FC<AddLiquidityInputProps> = ({
         runeCryptoLiquidityAmount &&
         runeFiatLiquidityAmount &&
         shareOfPoolDecimalPercent &&
-        slippageRune
+        slippageRune &&
+        activeOpportunityId
       )
     )
       return
@@ -299,8 +300,10 @@ export const AddLiquidityInput: React.FC<AddLiquidityInputProps> = ({
       runeFiatLiquidityAmount,
       shareOfPoolDecimalPercent,
       slippageRune,
+      opportunityId: activeOpportunityId,
     })
   }, [
+    activeOpportunityId,
     assetCryptoLiquidityAmount,
     assetFiatLiquidityAmount,
     runeCryptoLiquidityAmount,

diff --git a/src/pages/ThorChainLP/components/AddLiquitity/AddLiquityStatus.tsx b/src/pages/ThorChainLP/components/AddLiquitity/AddLiquityStatus.tsx
@@ -33,17 +33,18 @@ import { useAppSelector } from 'state/store'
 import { AddLiquidityRoutePaths } from './types'
 
 type AddLiquidityStatusProps = {
-  opportunityId?: string
   confirmedQuote: ConfirmedQuote
 }
 
-export const AddLiquidityStatus = ({ confirmedQuote, opportunityId }: AddLiquidityStatusProps) => {
+export const AddLiquidityStatus = ({ confirmedQuote }: AddLiquidityStatusProps) => {
   const translate = useTranslate()
   const history = useHistory()
   const [firstTx, setFirstTx] = useState(TxStatus.Unknown)
   const [secondTx, setSecondTx] = useState(TxStatus.Pending)
   const [isComplete, setIsComplete] = useState(false)
 
+  const { opportunityId } = confirmedQuote
+
   const { data: parsedPools } = usePools()
 
   const foundPool = useMemo(() => {