Skip to content

Commit d86d720

Browse files
Merge branch 'develop' into feat/integration-boba-network
2 parents 8a53f7c + 1d6a977 commit d86d720

File tree

18 files changed

+10
-774
lines changed

18 files changed

+10
-774
lines changed

packages/mask/shared-ui/locales/en-US.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,6 @@
429429
"plugin_trader_market_cap": "Market Cap",
430430
"plugin_trader_data_source": "Data Source",
431431
"plugin_trader_price_updated": "Price Updated",
432-
"plugin_trader_view_pair_analytics": "View pair analytics",
433432
"plugin_savings": "Savings",
434433
"plugin_savings_type": "Type",
435434
"plugin_no_protocol_available": "No savings protocols available on this network",
@@ -455,8 +454,6 @@
455454
"plugin_trader_table_price": "Price",
456455
"plugin_trader_table_volume": "Volume (24h)",
457456
"plugin_trader_table_updated": "Updated",
458-
"plugin_trader_route": "Route",
459-
"plugin_trader_portion": "Portion",
460457
"plugin_trader_error_amount_absence": "Enter an amount",
461458
"plugin_trader_error_insufficient_balance": "Insufficient {{symbol}} balance",
462459
"plugin_trader_error_insufficient_lp": "Insufficient liquidity for this trade",

packages/mask/shared-ui/locales/ja-JP.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,6 @@
180180
"plugin_trader_table_price": "価格",
181181
"plugin_trader_table_volume": "取引高(24時間)",
182182
"plugin_trader_table_updated": "更新",
183-
"plugin_trader_route": "ルート",
184-
"plugin_trader_portion": "分割",
185183
"plugin_trader_error_amount_absence": "量を入力してください。",
186184
"plugin_trader_error_insufficient_balance": "{{symbol}} の残高が足りません",
187185
"plugin_trader_error_insufficient_lp": "流動性が足りません",

packages/mask/shared-ui/locales/ko-KR.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,6 @@
332332
"plugin_trader_market_cap": "시가 총액",
333333
"plugin_trader_data_source": "데이터 소스",
334334
"plugin_trader_price_updated": "가격은 업데이트뒤었습니다",
335-
"plugin_trader_view_pair_analytics": "페어 분석 보기",
336335
"plugin_trader_swap": "스왑",
337336
"plugin_trader_wrap": "",
338337
"plugin_trader_unwrap": "언랩",
@@ -347,8 +346,6 @@
347346
"plugin_trader_table_price": "가격",
348347
"plugin_trader_table_volume": "거래량(24h)",
349348
"plugin_trader_table_updated": "업데이트",
350-
"plugin_trader_route": "경로",
351-
"plugin_trader_portion": "부분",
352349
"plugin_trader_error_amount_absence": "수액 입력",
353350
"plugin_trader_error_insufficient_balance": "{{symbol}}잔액 부족",
354351
"plugin_trader_error_insufficient_lp": "유동성 부족",

packages/mask/shared-ui/locales/qya-AA.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,6 @@
428428
"plugin_trader_market_cap": "crwdns10233:0crwdne10233:0",
429429
"plugin_trader_data_source": "crwdns10235:0crwdne10235:0",
430430
"plugin_trader_price_updated": "crwdns10237:0crwdne10237:0",
431-
"plugin_trader_view_pair_analytics": "crwdns10239:0crwdne10239:0",
432431
"plugin_savings": "crwdns13250:0crwdne13250:0",
433432
"plugin_savings_type": "crwdns13252:0crwdne13252:0",
434433
"plugin_no_protocol_available": "crwdns13254:0crwdne13254:0",
@@ -454,8 +453,6 @@
454453
"plugin_trader_table_price": "crwdns4903:0crwdne4903:0",
455454
"plugin_trader_table_volume": "crwdns4905:0crwdne4905:0",
456455
"plugin_trader_table_updated": "crwdns4907:0crwdne4907:0",
457-
"plugin_trader_route": "crwdns4911:0crwdne4911:0",
458-
"plugin_trader_portion": "crwdns4913:0crwdne4913:0",
459456
"plugin_trader_error_amount_absence": "crwdns4915:0crwdne4915:0",
460457
"plugin_trader_error_insufficient_balance": "crwdns4917:0{{symbol}}crwdne4917:0",
461458
"plugin_trader_error_insufficient_lp": "crwdns4919:0crwdne4919:0",

packages/mask/shared-ui/locales/zh-CN.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,6 @@
414414
"plugin_trader_market_cap": "市值",
415415
"plugin_trader_data_source": "数据源",
416416
"plugin_trader_price_updated": "价格已更新",
417-
"plugin_trader_view_pair_analytics": "查看交易对分析",
418417
"plugin_savings": "储蓄",
419418
"plugin_savings_type": "类型",
420419
"plugin_no_protocol_available": "储蓄功能尚未在此网络支持。",
@@ -439,8 +438,6 @@
439438
"plugin_trader_table_price": "价格",
440439
"plugin_trader_table_volume": "交易量 (24h)",
441440
"plugin_trader_table_updated": "更新时间",
442-
"plugin_trader_route": "路径",
443-
"plugin_trader_portion": "比例",
444441
"plugin_trader_error_amount_absence": "输入数额",
445442
"plugin_trader_error_insufficient_balance": "{{symbol}} 余额不足",
446443
"plugin_trader_error_insufficient_lp": "该交易的流动性不足",

packages/mask/shared-ui/locales/zh-TW.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,6 @@
310310
"plugin_trader_table_price": "價格",
311311
"plugin_trader_table_volume": "交易量 (24h)",
312312
"plugin_trader_table_updated": "已更新",
313-
"plugin_trader_route": "路由",
314-
"plugin_trader_portion": "比例",
315313
"plugin_trader_error_amount_absence": "輸入一個金額",
316314
"plugin_trader_error_insufficient_balance": "{{symbol}} 餘額不足",
317315
"plugin_trader_error_insufficient_lp": "本次交易流動性不足",

packages/mask/src/plugins/Trader/SNSAdaptor/balancer/TradeRoute.tsx

Lines changed: 0 additions & 99 deletions
This file was deleted.

packages/mask/src/plugins/Trader/SNSAdaptor/balancer/TradeRouteHop.tsx

Lines changed: 0 additions & 59 deletions
This file was deleted.

packages/mask/src/plugins/Trader/SNSAdaptor/dodo/TradePairViewer.tsx

Lines changed: 0 additions & 61 deletions
This file was deleted.

packages/mask/src/plugins/Trader/SNSAdaptor/trader/hooks/useGasConfig.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import type { ChainId, GasOptionConfig } from '@masknet/web3-shared-evm'
1+
import { useState } from 'react'
22
import { useAsync } from 'react-use'
3-
import { formatGweiToWei, isEIP1559Supported } from '@masknet/web3-shared-evm'
43
import BigNumber from 'bignumber.js'
4+
import type { ChainId, GasOptionConfig } from '@masknet/web3-shared-evm'
5+
import { formatGweiToWei, isEIP1559Supported } from '@masknet/web3-shared-evm'
56
import { WalletRPC } from '../../../../Wallet/messages'
6-
import { useState } from 'react'
77

88
export function useGasConfig(chainId: ChainId) {
99
const [gasConfig, setGasConfig] = useState<GasOptionConfig | undefined>()

0 commit comments

Comments
 (0)