Loopring · johnloopring · May 15, 2024 · Apr 19, 2024 · Apr 22, 2024 · Apr 23, 2024
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
-    "@loopring-web/loopring-sdk": "3.8.23",
+    "@loopring-web/loopring-sdk": "3.8.26",
     "@loopring-web/recharts": "^2.0.10",
     "@loopring-web/web3-provider": "1.4.16",
     "@mui/lab": "5.0.0-alpha.45",

diff --git a/packages/common-resources/static-resources/src/constant/setting.ts b/packages/common-resources/static-resources/src/constant/setting.ts
@@ -137,13 +137,13 @@ export const { NetworkMap, ChainTests, MapChainId, ChainIdExtends } = (
         label: 'Görli',
         chainId: '5',
         isTest: true,
-        walletType: 'ETHEREUM',
+        walletType: 'GOERLI',
       },
       11155111: {
         label: 'Sepolia',
         chainId: '11155111',
         isTest: true,
-        walletType: 'ETHEREUM',
+        walletType: 'SEPOLIA',
       },
       // 421613: {
       //   label: 'ARBGOERLI',
@@ -171,6 +171,7 @@ if (window) {
 }
 
 export const HEBAO_CONTRACT_MAP = [
+  ['V3_0_0', sdk.AddressType.LOOPRING_HEBAO_CONTRACT_3_0_0],
   ['V2_2_0', sdk.AddressType.LOOPRING_HEBAO_CONTRACT_2_2_0],
   ['V2_1_0', sdk.AddressType.LOOPRING_HEBAO_CONTRACT_2_1_0],
   ['V2_0_0', sdk.AddressType.LOOPRING_HEBAO_CONTRACT_2_0_0],

diff --git a/packages/common-resources/static-resources/src/i18n/en_US/common.ts b/packages/common-resources/static-resources/src/i18n/en_US/common.ts
@@ -1631,7 +1631,7 @@ export default {
   labelBtradePool: 'Loopring Pool',
   labelBtradeToleranceTooltips:
     'Your trade will revert if the price changes unfavorably by more than this percentage.',
-  labelBtradeFeeTooltips: 'The trading fee is fixed at 0.3%.',
+  labelBtradeFeeTooltips: 'The trading fee is fixed at {{feeRate}}.',
   labelBtradeMinReceiveTooltips:
     'The price in other liquidity source changes dynamically, the price you see when placing an order may be inconsistent with the final transaction price; also the received amount needs to deduct the fees from converted amount. The protocol can guarantee that the received token is at least this amount.',
   labelBtradeInsufficient: 'Insufficient',

diff --git a/packages/common-resources/static-resources/src/i18n/zh_CN/common.ts b/packages/common-resources/static-resources/src/i18n/zh_CN/common.ts
@@ -1618,7 +1618,7 @@ export default {
   labelBtradePool: 'Loopring Pool',
   labelBtradeToleranceTooltips:
     'Your trade will revert if the price changes unfavorably by more than this percentage.',
-  labelBtradeFeeTooltips: 'The trading fee is fixed at 0.3%.',
+  labelBtradeFeeTooltips: 'The trading fee is fixed at {{feeRate}}.',
   labelBtradeMinReceiveTooltips:
     'The price in other liquidity source changes dynamically, the price you see when placing an order may be inconsistent with the final transaction price; also the received amount needs to deduct the fees from converted amount. The protocol can guarantee that the received token is at least this amount.',
   labelBtradeInsufficient: 'Insufficient',

diff --git a/packages/component-lib/src/components/basic-lib/tags/index.tsx b/packages/component-lib/src/components/basic-lib/tags/index.tsx
@@ -61,6 +61,7 @@ export const AddressTypeTag = ({ addressType }: { addressType }) => {
     case sdk.AddressType.LOOPRING_HEBAO_CONTRACT_2_0_0:
     case sdk.AddressType.LOOPRING_HEBAO_CONTRACT_2_1_0:
     case sdk.AddressType.LOOPRING_HEBAO_CONTRACT_2_2_0:
+    case sdk.AddressType.LOOPRING_HEBAO_CONTRACT_3_0_0:
       return (
         <ChipStyle
           label={t('labelLoopringWallet')}

diff --git a/packages/component-lib/src/components/charts/scaleAreaChart/KlineChart/KlineChart.tsx b/packages/component-lib/src/components/charts/scaleAreaChart/KlineChart/KlineChart.tsx
@@ -173,7 +173,7 @@ class StockChart extends React.Component<StockChartProps & IndicatorProps & Stoc
                 }
                 return d
               })
-              .accessor((d: any = {}) => d[`sma${periodMA}`])
+              .accessor((d: any = {}) => d && d[`sma${periodMA}`])
             mainIndicatorLst.push({ func: indMA, type: item.indicator })
             maToolTipOptions.push({
               yAccessor: indMA.accessor(),
@@ -188,9 +188,9 @@ class StockChart extends React.Component<StockChartProps & IndicatorProps & Stoc
               .id(id++)
               .options({ windowSize: periodEMA })
               .merge((d: any, c: any) => {
-                d[`ema${periodEMA}`] = c
+                d && (d[`ema${periodEMA}`] = c)
               })
-              .accessor((d: any = {}) => d[`ema${periodEMA}`])
+              .accessor((d: any = {}) => d && d[`ema${periodEMA}`])
             mainIndicatorLst.push({ func: indEMA, type: item.indicator })
             maToolTipOptions.push({
               yAccessor: indEMA.accessor(),
@@ -203,9 +203,9 @@ class StockChart extends React.Component<StockChartProps & IndicatorProps & Stoc
             const indBOLL = bollingerBand()
               .id(id++)
               .merge((d: any, c: any) => {
-                d.bb = c
+                d && (d.bb = c)
               })
-              .accessor((d: any = {}) => d.bb)
+              .accessor((d: any = {}) => d && d.bb)
             mainIndicatorLst.push({ func: indBOLL, type: item.indicator })
             bollToolTipOption = indBOLL.options()
             break
@@ -229,7 +229,7 @@ class StockChart extends React.Component<StockChartProps & IndicatorProps & Stoc
               .merge((d: any, c: any) => {
                 d.macd = c
               })
-              .accessor((d: any = {}) => d.macd)
+              .accessor((d: any = {}) => d && d.macd)
             subIndicatorLst.push({
               func: macdCalculator,
               type: item.indicator,
@@ -241,7 +241,7 @@ class StockChart extends React.Component<StockChartProps & IndicatorProps & Stoc
               .merge((d: any, c: any) => {
                 d.rsi = c
               })
-              .accessor((d: any = {}) => d.rsi)
+              .accessor((d: any = {}) => d && d.rsi)
             subIndicatorLst.push({
               func: rsiCalculator,
               type: item.indicator,
@@ -257,7 +257,7 @@ class StockChart extends React.Component<StockChartProps & IndicatorProps & Stoc
               .merge((d: any, c: any) => {
                 d.sar = c
               })
-              .accessor((d: any = {}) => d.sar)
+              .accessor((d: any = {}) => d && d.sar)
             subIndicatorLst.push({
               func: sarCalculator,
               type: item.indicator,
@@ -412,7 +412,7 @@ class StockChart extends React.Component<StockChartProps & IndicatorProps & Stoc
               <BollingerSeries strokeStyle={bbStroke} />
               <BollingerBandTooltip
                 origin={[8, 64]}
-                yAccessor={(d) => d.bb}
+                yAccessor={(d) => d && d.bb}
                 options={bollToolTipOption}
                 textFill={colorBase.textPrimary}
               />

diff --git a/packages/component-lib/src/components/tableList/QuoteTable/MarketDetail.tsx b/packages/component-lib/src/components/tableList/QuoteTable/MarketDetail.tsx
@@ -441,15 +441,6 @@ export const MarketDetail = ({
         ) : (
           <></>
         )}
-        <Typography
-          component={'p'}
-          display={'inline-flex'}
-          justifyContent={'space-between'}
-          marginTop={2}
-          whiteSpace={'pre-line'}
-        >
-          {tokenInfo.description}
-        </Typography>
       </Box>
     </>
   ) : (

diff --git a/packages/component-lib/src/components/tradePanel/components/SwapWrap/SwapTradeWrap.tsx b/packages/component-lib/src/components/tradePanel/components/SwapWrap/SwapTradeWrap.tsx
@@ -226,6 +226,8 @@ export const SwapTradeWrap = <
     tradeCalcData && tradeCalcData.fee
       ? `${tradeCalcData.fee} ${buySymbol}` //(parseFloat(tradeCalcData.fee) / 100).toString() + "%"
       : EmptyValueTag
+  myLog('tradeCalcDatatradeCalcData', tradeCalcData)
+  myLog('tradeCalcDatatradeCalcData', tradeData)
 
   const userTakerRate =
     tradeCalcData && tradeCalcData.feeTakerRate
@@ -474,8 +476,7 @@ export const SwapTradeWrap = <
             >
               <Tooltip
                 title={t('labelBtradeFeeTooltips', {
-                  rate: userTakerRate,
-                  value: tradeCostMin,
+                  feeRate: `${(tradeCalcData as any).maxFeeBips / 100}%`,
                 }).toString()}
                 placement={'top'}
               >

diff --git a/packages/core/src/hooks/common/useAddrCheck.ts b/packages/core/src/hooks/common/useAddrCheck.ts
@@ -202,7 +202,7 @@ export const useAddressCheck = (checkLayer2Status: boolean = true) => {
         })
       }
     }
-  }, [])
+  }, [defaultNetwork])
 
   const debounceCheck = _.debounce(
     async (address) => {
@@ -217,6 +217,7 @@ export const useAddressCheck = (checkLayer2Status: boolean = true) => {
         sdk.AddressType.LOOPRING_HEBAO_CONTRACT_2_0_0,
         sdk.AddressType.LOOPRING_HEBAO_CONTRACT_2_1_0,
         sdk.AddressType.LOOPRING_HEBAO_CONTRACT_2_2_0,
+        sdk.AddressType.LOOPRING_HEBAO_CONTRACT_3_0_0,
         sdk.AddressType.EXCHANGE_OTHER,
         sdk.AddressType.EXCHANGE_BINANCE,
         sdk.AddressType.EXCHANGE_OKX,
@@ -241,7 +242,8 @@ export const useAddressCheck = (checkLayer2Status: boolean = true) => {
           case sdk.AddressType.LOOPRING_HEBAO_CONTRACT_1_2_0:
           case sdk.AddressType.LOOPRING_HEBAO_CONTRACT_2_0_0:
           case sdk.AddressType.LOOPRING_HEBAO_CONTRACT_2_1_0:
-          case sdk.AddressType.LOOPRING_HEBAO_CONTRACT_2_2_0: {
+          case sdk.AddressType.LOOPRING_HEBAO_CONTRACT_2_2_0:
+          case sdk.AddressType.LOOPRING_HEBAO_CONTRACT_3_0_0: {
             if (found.addressType === sdk.AddressType.LOOPRING_HEBAO_CF) {
               // recheck CF Wallet
               const walletTypeResponse = await LoopringAPI.walletAPI?.getWalletType({

diff --git a/packages/core/src/hooks/common/useAllowances.ts b/packages/core/src/hooks/common/useAllowances.ts
@@ -1,10 +1,11 @@
 import BigNumber from 'bignumber.js'
-import { LoopringAPI, useTokenMap } from '../../index'
+import { LoopringAPI, useSystem, useTokenMap } from '../../index'
 import React from 'react'
 import * as sdk from '@loopring-web/loopring-sdk'
 
 export function useAllowances({ owner, symbol }: { owner: string; symbol: string }) {
   const { tokenMap } = useTokenMap()
+  const { status: systemStatus } = useSystem()
 
   const [allowanceInfo, setAllowanceInfo] = React.useState<{
     allowance: BigNumber
@@ -45,7 +46,7 @@ export function useAllowances({ owner, symbol }: { owner: string; symbol: string
 
   React.useEffect(() => {
     updateAllowance(symbol)
-  }, [owner, symbol])
+  }, [owner, symbol, systemStatus])
 
   return {
     allowanceInfo,

diff --git a/packages/core/src/hooks/common/useInjectWeb3Modal.ts b/packages/core/src/hooks/common/useInjectWeb3Modal.ts
@@ -91,7 +91,7 @@ export const useInjectWeb3Modal = (type: 'MAIN' | 'EARN' | 'BRIDGE' | 'GUARDIAN'
   }, [event])
   React.useEffect(() => {
     ;(async () => {
-      if (address && walletProvider ) {
+      if (address && walletProvider) {
         const { defaultNetwork } = store.getState().settings
         const accAddress = store.getState().account.accAddress
         if (address.toLowerCase() !== accAddress.toLowerCase() || chainId !== defaultNetwork) {
@@ -102,13 +102,23 @@ export const useInjectWeb3Modal = (type: 'MAIN' | 'EARN' | 'BRIDGE' | 'GUARDIAN'
           )
           store.dispatch(setDefaultNetwork(chainId))
         }
-        if (type === 'BRIDGE') {
-          updateWalletLayer1()
-        }
         checkAccount(address, chainId)
       }
+      if (type === 'BRIDGE' && address && status === SagaStatus.DONE) {
+        updateWalletLayer1()
+      }
     })()
   }, [address, walletProvider, chainId, status])
+  React.useEffect(() => {
+    if (type === 'BRIDGE') {
+      store.dispatch(
+        updateSystem({
+          chainId,
+        }),
+      )
+      store.dispatch(setDefaultNetwork(chainId))
+    }
+  }, [])
   React.useEffect(() => {
     if (walletProvider) {
       if (walletProvider.isMetaMask) {

diff --git a/packages/core/src/hooks/useractions/hookSwap.ts b/packages/core/src/hooks/useractions/hookSwap.ts
@@ -816,7 +816,7 @@ export const useSwap = <
           // @ts-ignore
           const [, _coinA] = market.match(/(\w+)-(\w+)/i)
           btos = getValuePrecisionThousand(
-            1 / Number(close.replaceAll(sdk.SEP, '')),
+            1 / Number(typeof close === 'number' ? close : close.replaceAll(sdk.SEP, '')),
             tokenMap[_coinA].precision,
             tokenMap[_coinA].precision,
             tokenMap[_coinA].precision,

diff --git a/packages/core/src/hooks/useractions/useContact.ts b/packages/core/src/hooks/useractions/useContact.ts
@@ -147,6 +147,13 @@ export const useContact = ({ viewHeightRatio = 0.85, viewHeightOffset = 130 }) =
           type: ToastType.error,
           content: t('labelContactsDeleteFailed'),
         })
+        return
+      }
+      // setPage to page - 1 if there is only one contact on this page when page >= 1
+      if (
+        page > 1 && page === Math.ceil(contacts.length / pageSize) && contacts.length % pageSize === 1 
+      ) {
+        setPage(page - 1)
       }
       updateContacts()
       setToastOpen({
@@ -158,7 +165,7 @@ export const useContact = ({ viewHeightRatio = 0.85, viewHeightOffset = 130 }) =
       onCloseDelete()
       // if(result as sdk.RESULT_INFO)
     },
-    [contacts],
+    [contacts, page, pageSize],
   )
   return {
     contacts:

diff --git a/packages/core/src/hooks/useractions/useDeposit.ts b/packages/core/src/hooks/useractions/useDeposit.ts
@@ -644,7 +644,7 @@ export const useDeposit = <
     return () => {
       subscription.unsubscribe()
     }
-  }, [subject])
+  }, [subject, accountStatus, systemStatus])
 
   const title =
     account.readyState === AccountStatus.NO_ACCOUNT

diff --git a/packages/core/src/stores/contacts/saga.ts b/packages/core/src/stores/contacts/saga.ts
@@ -3,9 +3,11 @@ import { updateContacts, getContactsStatus } from './reducer'
 
 import { LoopringAPI, store } from '../../index'
 import * as sdk from '@loopring-web/loopring-sdk'
+import { NetworkMap } from '@loopring-web/common-resources'
 
 const getContractsApi = async ({ limit = 100 }: { limit?: number }) => {
   const { isContractAddress, isCFAddress, accountId, apiKey } = store.getState().account
+  const { defaultNetwork } = store.getState().settings
   let contacts: any[] = []
   if (apiKey && LoopringAPI.contactAPI && accountId) {
     const response = await LoopringAPI.contactAPI?.getContacts(
@@ -14,6 +16,8 @@ const getContractsApi = async ({ limit = 100 }: { limit?: number }) => {
         accountId,
         limit,
         offset: 0,
+        // @ts-ignore
+        network: NetworkMap[defaultNetwork].walletType,
       },
       apiKey,
     )

diff --git a/packages/core/src/utils/addressTypeMap.ts b/packages/core/src/utils/addressTypeMap.ts
@@ -17,6 +17,7 @@ const addressToExWalletMap: [
   [sdk.AddressType.LOOPRING_HEBAO_CONTRACT_2_0_0, WALLET_TYPE.Loopring],
   [sdk.AddressType.LOOPRING_HEBAO_CONTRACT_2_1_0, WALLET_TYPE.Loopring],
   [sdk.AddressType.LOOPRING_HEBAO_CONTRACT_2_2_0, WALLET_TYPE.Loopring],
+  [sdk.AddressType.LOOPRING_HEBAO_CONTRACT_3_0_0, WALLET_TYPE.Loopring],
   [sdk.AddressType.CONTRACT, WALLET_TYPE.OtherSmart],
 ]
 export const addressToExWalletMapFn = (a: (typeof sdk.AddressType)[sdk.AddressTypeKeys]) => {

diff --git a/packages/webapp/src/pages/QuotePage/hook.ts b/packages/webapp/src/pages/QuotePage/hook.ts
@@ -54,14 +54,19 @@ export function useTickList<C extends { [key: string]: string }>() {
           }, [] as QuoteTableRawDataItem[])
         : []
 
-    const newTickListWithPrecision = _tickList.map((o: any) => {
-      const pair = o.__rawTicker__.symbol
-      const precision = marketMap ? marketMap[pair]?.precisionForPrice : undefined
-      return {
-        ...o,
-        precision,
-      }
-    })
+    const newTickListWithPrecision = _tickList
+      .filter((o: any) => {
+        const pair = o.__rawTicker__.symbol
+        return marketMap ? marketMap[pair]?.enabled : undefined
+      })
+      .map((o: any) => {
+        const pair = o.__rawTicker__.symbol
+        const precision = marketMap ? marketMap[pair]?.precisionForPrice : undefined
+        return {
+          ...o,
+          precision,
+        }
+      })
 
     setTickList(newTickListWithPrecision)
     while (_recommendationsFloat.length < 4) {