Skip to content

Commit 07329c4

Browse files
committed
minor fix
1 parent 0e54494 commit 07329c4

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

apps/extension/src/pages/ibc-swap/hooks/use-swap-price-impact.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export const useSwapPriceImpact = (
3737
amountConfig.outCurrency.coinMinimalDenom,
3838
]);
3939

40-
const unableToPopulatePrice = (() => {
40+
const unableToPopulatePrices = (() => {
4141
const r: string[] = [];
4242

4343
const inCurrency = amountConfig.currency;
@@ -157,6 +157,6 @@ export const useSwapPriceImpact = (
157157

158158
return {
159159
isHighPriceImpact,
160-
unableToPopulatePrice,
160+
unableToPopulatePrices,
161161
};
162162
};

apps/extension/src/pages/ibc-swap/index.tsx

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ export const IBCSwapPage: FunctionComponent = observer(() => {
217217
);
218218

219219
const swapFeeBps = useSwapFeeBps(swapConfigs.amountConfig);
220-
const { isHighPriceImpact, unableToPopulatePrice } = useSwapPriceImpact(
220+
const { isHighPriceImpact, unableToPopulatePrices } = useSwapPriceImpact(
221221
swapConfigs.amountConfig
222222
);
223223

@@ -575,7 +575,7 @@ export const IBCSwapPage: FunctionComponent = observer(() => {
575575
}[] = [];
576576
let provider: SwapProvider | undefined;
577577
let routeDurationSeconds: number | undefined;
578-
let isMultiEcosystemSwap: boolean = false;
578+
let isInterChainSwap: boolean = false;
579579

580580
// queryRoute는 ibc history를 추적하기 위한 채널 정보 등을 얻기 위해서 사용된다.
581581
// /msgs_direct로도 얻을 순 있지만 따로 데이터를 해석해야되기 때문에 좀 힘들다...
@@ -596,15 +596,15 @@ export const IBCSwapPage: FunctionComponent = observer(() => {
596596

597597
// multi-ecosystem swap인지 여부를 확인 (bridge가 필요한 경우)
598598
const steps = queryRoute.response.data.steps;
599-
isMultiEcosystemSwap = steps.some(
599+
isInterChainSwap = steps.some(
600600
(step) => step.type === RouteStepType.BRIDGE
601601
);
602602
provider = queryRoute.response.data.provider;
603603

604604
// 브릿지를 사용하는 경우, ibc swap channel까지 보여주면 ui가 너무 복잡해질 수 있으므로 (operation이 최소 3개 이상)
605605
// evm -> osmosis -> destination 식으로 뭉퉁그려서 보여주는 것이 좋다고 판단, 경로를 간소화한다.
606606
// 문제는 chain_ids에 이미 ibc swap channel이 포함되어 있을 가능성 (아직 확인은 안됨)
607-
if (isMultiEcosystemSwap) {
607+
if (isInterChainSwap) {
608608
routeDurationSeconds = queryRoute.response.data.estimated_time;
609609

610610
for (const chainId of queryRoute.response.data
@@ -898,7 +898,7 @@ export const IBCSwapPage: FunctionComponent = observer(() => {
898898
sendTx: async (chainId, tx, mode) => {
899899
if (
900900
swapConfigs.amountConfig.type === "transfer" &&
901-
!isMultiEcosystemSwap
901+
!isInterChainSwap
902902
) {
903903
const msg: Message<Uint8Array> = new SendTxAndRecordMsg(
904904
"ibc-swap/ibc-transfer",
@@ -959,7 +959,7 @@ export const IBCSwapPage: FunctionComponent = observer(() => {
959959
currencies:
960960
chainStore.getChain(outChainId).currencies,
961961
},
962-
!isMultiEcosystemSwap // multi-ecosystem swap인 경우, ibc swap history에 추가하는 대신 skip swap history를 추가한다.
962+
!isInterChainSwap // multi-ecosystem swap인 경우, ibc swap history에 추가하는 대신 skip swap history를 추가한다.
963963
);
964964

965965
return await new InExtensionMessageRequester().sendMessage(
@@ -971,7 +971,7 @@ export const IBCSwapPage: FunctionComponent = observer(() => {
971971
},
972972
{
973973
onBroadcasted: (txHash) => {
974-
if (isMultiEcosystemSwap) {
974+
if (isInterChainSwap) {
975975
const msg = new RecordTxWithSwapV2Msg(
976976
inChainId,
977977
outChainId,
@@ -1803,7 +1803,6 @@ export const IBCSwapPage: FunctionComponent = observer(() => {
18031803

18041804
<VerticalCollapseTransition collapsed={shouldTopUp}>
18051805
<WarningGuideBox
1806-
slippageTolerancePercent={uiConfigStore.ibcSwapConfig.slippageNum}
18071806
showUSDNWarning={showUSDNWarning}
18081807
showCelestiaWarning={showCelestiaWarning}
18091808
amountConfig={swapConfigs.amountConfig}
@@ -1841,14 +1840,14 @@ export const IBCSwapPage: FunctionComponent = observer(() => {
18411840
}
18421841
forceError={calculatingTxError}
18431842
forceWarning={(() => {
1844-
if (unableToPopulatePrice.length > 0) {
1843+
if (unableToPopulatePrices.length > 0) {
18451844
return new Error(
18461845
intl.formatMessage(
18471846
{
18481847
id: "page.ibc-swap.warning.unable-to-populate-price",
18491848
},
18501849
{
1851-
assets: unableToPopulatePrice.join(", "),
1850+
assets: unableToPopulatePrices.join(", "),
18521851
}
18531852
)
18541853
);
@@ -1924,7 +1923,6 @@ export const IBCSwapPage: FunctionComponent = observer(() => {
19241923
});
19251924

19261925
const WarningGuideBox: FunctionComponent<{
1927-
slippageTolerancePercent: number;
19281926
amountConfig: SwapAmountConfig;
19291927
feeConfig: IFeeConfig;
19301928
gasConfig: IGasConfig;
@@ -1937,7 +1935,6 @@ const WarningGuideBox: FunctionComponent<{
19371935
showCelestiaWarning?: boolean;
19381936
}> = observer(
19391937
({
1940-
slippageTolerancePercent,
19411938
amountConfig,
19421939
feeConfig,
19431940
gasConfig,

apps/hooks-internal/src/swap/amount.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ export class SwapAmountConfig extends AmountConfig {
284284
}
285285
}
286286

287+
// CHECK: skip의 경우 swap venue chainId들도 필요할 수 있다.
287288
const requiredChainIds = routeResponse.data.required_chain_ids;
288289

289290
const chainIdsToAddresses: Record<string, string> = {};

0 commit comments

Comments
 (0)