Merge pull request #334 from invariant-labs/staging

Update prod

Author: p6te

src/components/NewPosition/PoolInit/PoolInit.tsx

@@ -407,7 +407,7 @@ export const PoolInit: React.FC<IPoolInit> = ({
             />
           </Grid>
         ) : (
-          <Grid container className={classes.buttons}>
+          <Grid container className={classes.buttons} justifyContent='center' alignItems='center'>
             <Button className={classes.button} onClick={resetRange}>
               Reset range
             </Button>

src/components/NewPosition/PoolInit/style.ts

@@ -77,8 +77,9 @@ const useStyles = makeStyles()(theme => {
       }
     },
     buttons: {
-      marginTop: 38,
+      marginTop: 4,
       width: '100%',
+      height: 70,
       flexDirection: 'row',
       gap: 16,
       alignItems: 'center'

src/components/Swap/ExchangeRate/ExchangeRate.tsx

@@ -29,7 +29,12 @@ const ExchangeRate: React.FC<iProps> = ({
       </Box>
     ) : (
       <Typography className={classes.rateText}>
-        1 {tokenFromSymbol} = {isNaN(amount) ? 0 : formatNumber(amount.toFixed(tokenToDecimals))}{' '}
+        1 {tokenFromSymbol} ={' '}
+        {isNaN(amount)
+          ? 0
+          : formatNumber(amount.toFixed(tokenToDecimals)) === '0'
+            ? '~0'
+            : formatNumber(amount.toFixed(tokenToDecimals))}{' '}
         {tokenToSymbol}
       </Typography>
     )

src/components/Swap/TransactionDetailsBox/TransactionDetailsBox.tsx

@@ -39,7 +39,7 @@ const TransactionDetailsBox: React.FC<IProps> = ({
             <Typography className={classes.value}>
               {exchangeRate.val === Infinity
                 ? '-'
-                : `${formatNumber(exchangeRate.val.toFixed(exchangeRate.decimal))} ${exchangeRate.symbol}`}
+                : `${formatNumber(exchangeRate.val.toFixed(exchangeRate.decimal)) === '0' ? '~0' : formatNumber(exchangeRate.val.toFixed(exchangeRate.decimal))} ${exchangeRate.symbol}`}
             </Typography>
           )}
         </Grid>

src/containers/NewPositionWrapper/NewPositionWrapper.tsx

@@ -255,14 +255,24 @@ export const NewPositionWrapper: React.FC<IProps> = ({
   }, [isWaitingForNewPool, tokenA, tokenB, feeIndex, poolKey, allPoolKeys, allPools.length])
 
   useEffect(() => {
-    if (poolKey !== '') {
-      dispatch(
-        positionsActions.getCurrentPlotTicks({
-          poolKey: allPoolKeys[poolKey],
-          isXtoY,
-          fetchTicksAndTickmap: true
-        })
-      )
+    if (poolKey !== '' && !isWaitingForNewPool) {
+      const isCurrentTokenX = isXtoY
+        ? allPoolKeys[poolKey].tokenX === tokenA
+        : allPoolKeys[poolKey].tokenX === tokenB
+
+      const isCurrentTokenY = isXtoY
+        ? allPoolKeys[poolKey].tokenY === tokenB
+        : allPoolKeys[poolKey].tokenY === tokenA
+
+      if (isCurrentTokenX && isCurrentTokenY) {
+        dispatch(
+          positionsActions.getCurrentPlotTicks({
+            poolKey: allPoolKeys[poolKey],
+            isXtoY,
+            fetchTicksAndTickmap: true
+          })
+        )
+      }
     }
   }, [isWaitingForNewPool, tokenA, tokenB, poolKey, allPoolKeys])
 

src/containers/SinglePositionWrapper/SinglePositionWrapper.tsx

@@ -272,7 +272,7 @@ export const SinglePositionWrapper: React.FC<IProps> = ({ id }) => {
   }
 
   useEffect(() => {
-    dispatch(actions.getRemainingPositions())
+    dispatch(actions.getRemainingPositions({ setLoaded: false }))
     const timer = setTimeout(() => {
       setIsFinishedDelayRender(true)
     }, 1000)

src/containers/WrappedPositionsList/WrappedPositionsList.tsx

@@ -187,7 +187,7 @@ export const WrappedPositionsList: React.FC = () => {
       length={length}
       loadedPages={loadedPages}
       getRemainingPositions={() => {
-        dispatch(actions.getRemainingPositions())
+        dispatch(actions.getRemainingPositions({ setLoaded: true }))
       }}
       noInitialPositions={list.length === 0}
     />

src/hideErrors.ts

@@ -6,6 +6,8 @@ export const messagesToHide: string[] = [
   '<path> attribute d: Expected moveto path command'
 ]
 
+if (process.env.NODE_ENV === 'production') console.log = () => {}
+
 export function filterConsoleMessages(hideMessages: string[]): void {
   if (typeof window === 'undefined') {
     return

src/store/reducers/pools.ts

@@ -77,6 +77,7 @@ export interface FetchTicksAndTickMaps {
   tokenFrom: string
   tokenTo: string
   allPools: PoolWithPoolKey[]
+  poolKey?: PoolKey
 }
 
 const network =

src/store/reducers/positions.ts

@@ -161,7 +161,7 @@ const positionsSlice = createSlice({
       state.positionsList.loading = true
       return state
     },
-    getRemainingPositions(state, _action: PayloadAction<void>) {
+    getRemainingPositions(state, _action: PayloadAction<{ setLoaded: boolean }>) {
       state.positionsList.loading = true
       return state
     },