issue #27: fix bug 36, default tab = long, remove text 'Gas'

derion-io · Jun 23, 2023 · 89c3b28 · 89c3b28
1 parent f59b251
commit 89c3b28
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/src/Components/App/index.tsx b/src/Components/App/index.tsx
@@ -60,12 +60,8 @@ export const App = () => {
     switch (true) {
       case isMatchWithPath('/:tab(long|short|liquidity|swap)/:pool?'):
         return <Trade tab={detectTradeTab(location.pathname)} pool={detectPool(location.pathname)} />
-      // case isMatchWithPath('/pools'):
-      //   return <Pools />
-      // case isMatchWithPath('/:tab(add-liquidity|remove-liquidity)'):
-      //   return <Liquidity tab={detectLiquidityTab(location.pathname)} />
       default:
-        return <Trade tab={TRADE_TYPE.SWAP} />
+        return <Trade tab={TRADE_TYPE.LONG} />
     }
   }
 

diff --git a/src/Components/BuyPositionBox/index.tsx b/src/Components/BuyPositionBox/index.tsx
@@ -111,8 +111,8 @@ const Component = ({
   })
 
   const { value: valueOut } = useTokenValue({
-    amount: amountOut,
-    tokenAddress: outputTokenAddress
+    amount: amountIn,
+    tokenAddress: inputTokenAddress
   })
 
   const { value: valueOutBefore } = useTokenValue({

diff --git a/src/Components/SwapBox/components/TxFee.tsx b/src/Components/SwapBox/components/TxFee.tsx
@@ -16,7 +16,7 @@ export const TxFee = ({ gasUsed, txFee } : {gasUsed: BigNumber, txFee: BigNumber
     <InfoRow>
       <TextGrey>Gas Used</TextGrey>
       <span>
-        <Text>{formatWeiToDisplayNumber(gasUsed, 0, 0)} Gas</Text>
+        <Text>{formatWeiToDisplayNumber(gasUsed, 0, 0)}</Text>
       </span>
     </InfoRow>
     <InfoRow>

diff --git a/src/state/config/useInitConfig.ts b/src/state/config/useInitConfig.ts
@@ -4,7 +4,7 @@ import { setConfigs, setEngine } from './reducer'
 import configs from './configs'
 import { addTokensReduce } from '../token/reducer'
 import { Engine } from 'derivable-tools/dist/engine'
-import { DEFAULT_CHAIN } from '../../utils/constant'
+import { DEFAULT_CHAIN, ZERO_ADDRESS } from '../../utils/constant'
 
 export const useInitConfig = ({
   library,
@@ -49,12 +49,13 @@ export const useInitConfig = ({
   }, [location, useHistory, chainId, useSubPage, language, env])
 
   useEffect(() => {
+    console.log('khanh', chainId)
     if (!chainId) return
     if (!account) {
-      return console.log('=======await sync account========')
+      console.log('=======await sync account========')
     }
     const engine = new Engine(
-      account,
+      account || ZERO_ADDRESS,
       {
         storage: {
           // @ts-ignore

diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
@@ -163,6 +163,7 @@ export const isErc1155Address = (address: string) => {
 }
 
 export const decodeErc1155Address = (address: string) => {
+  if (!address) return { address: '', id: '' }
   return {
     address: address.split('-')[0],
     id: address.split('-')[1]