@rango-dev/widget-embedded 0.1.11-next.10 → 0.1.11-next.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/pages/Home.d.ts.map +1 -1
- package/dist/utils/swap.d.ts +2 -2
- package/dist/utils/swap.d.ts.map +1 -1
- package/dist/widget-embedded.cjs.development.js +18 -18
- package/dist/widget-embedded.cjs.development.js.map +1 -1
- package/dist/widget-embedded.cjs.production.min.js +18 -18
- package/dist/widget-embedded.cjs.production.min.js.map +1 -1
- package/dist/widget-embedded.esm.js +18 -18
- package/dist/widget-embedded.esm.js.map +1 -1
- package/package.json +1 -1
- package/src/components/TokenInfo.tsx +5 -5
- package/src/hooks/useConfirmSwap.ts +2 -2
- package/src/pages/ConfirmSwapPage.tsx +2 -2
- package/src/pages/Home.tsx +1 -2
- package/src/store/bestRoute.ts +2 -2
- package/src/store/wallets.ts +1 -1
- package/src/utils/swap.ts +16 -5
package/dist/pages/Home.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Home.d.ts","sourceRoot":"","sources":["../src/pages/Home.tsx"],"names":[],"mappings":";AAkEA,wBAAgB,IAAI,
|
|
1
|
+
{"version":3,"file":"Home.d.ts","sourceRoot":"","sources":["../src/pages/Home.tsx"],"names":[],"mappings":";AAkEA,wBAAgB,IAAI,gBA+JnB"}
|
package/dist/utils/swap.d.ts
CHANGED
|
@@ -15,7 +15,7 @@ export declare function LimitErrorMessage(bestRoute: BestRouteResponse | null):
|
|
|
15
15
|
fromAmountRangeError: string;
|
|
16
16
|
recommendation: string;
|
|
17
17
|
};
|
|
18
|
-
export declare function getSwapButtonState(loadingMetaStatus: LoadingStatus, accounts: Account[], loading: boolean, bestRoute: BestRouteResponse | null, hasLimitError: boolean, highValueLoss: boolean, priceImpactCanNotBeComputed: boolean, needsToWarnEthOnPath: boolean,
|
|
18
|
+
export declare function getSwapButtonState(loadingMetaStatus: LoadingStatus, accounts: Account[], loading: boolean, bestRoute: BestRouteResponse | null, hasLimitError: boolean, highValueLoss: boolean, priceImpactCanNotBeComputed: boolean, needsToWarnEthOnPath: boolean, inputAmount: string): SwapButtonState;
|
|
19
19
|
export declare function canComputePriceImpact(bestRoute: BestRouteResponse | null, inputAmount: string, inputUsdValue: BigNumber, outputUsdValue: BigNumber): boolean;
|
|
20
20
|
export declare function requiredWallets(route: BestRouteResponse | null): string[];
|
|
21
21
|
export declare const getUsdPrice: (blockchain: string, symbol: string, address: string | null, allTokens: Token[]) => number | null;
|
|
@@ -27,7 +27,7 @@ export declare function getMinRequiredSlippage(route: BestRouteResponse): string
|
|
|
27
27
|
export declare function hasProperSlippage(userSlippage: string, minRequiredSlippage: string | null): boolean;
|
|
28
28
|
export declare function hasEnoughBalance(route: BestRouteResponse, selectedWallets: SelectedWallet[]): boolean;
|
|
29
29
|
export declare function hasEnoughBalanceAndProperSlippage(route: BestRouteResponse, selectedWallets: SelectedWallet[], userSlippage: string, minRequiredSlippage: string | null): boolean;
|
|
30
|
-
export declare function createBestRouteRequestBody(fromToken: Token, toToken: Token, inputAmount: string, wallets: Account[], selectedWallets: SelectedWallet[], disabledLiquiditySources: string[], slippage: number,
|
|
30
|
+
export declare function createBestRouteRequestBody(fromToken: Token, toToken: Token, inputAmount: string, wallets: Account[], selectedWallets: SelectedWallet[], disabledLiquiditySources: string[], slippage: number, affiliateRef: string | null, initialRoute?: BestRouteResponse): BestRouteRequest;
|
|
31
31
|
export declare function getWalletsForNewSwap(selectedWallets: SelectedWallet[]): {
|
|
32
32
|
[p: string]: {
|
|
33
33
|
address: string;
|
package/dist/utils/swap.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swap.d.ts","sourceRoot":"","sources":["../src/utils/swap.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,UAAU,EACV,KAAK,EACN,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAG3C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAqB,cAAc,EAAE,MAAM,WAAW,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3D,OAAO,EAEL,eAAe,EAChB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"swap.d.ts","sourceRoot":"","sources":["../src/utils/swap.ts"],"names":[],"mappings":"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"}
|
|
@@ -430,7 +430,7 @@ function LimitErrorMessage(bestRoute) {
|
|
|
430
430
|
recommendation
|
|
431
431
|
};
|
|
432
432
|
}
|
|
433
|
-
function getSwapButtonState(loadingMetaStatus, accounts, loading, bestRoute, hasLimitError, highValueLoss, priceImpactCanNotBeComputed, needsToWarnEthOnPath,
|
|
433
|
+
function getSwapButtonState(loadingMetaStatus, accounts, loading, bestRoute, hasLimitError, highValueLoss, priceImpactCanNotBeComputed, needsToWarnEthOnPath, inputAmount) {
|
|
434
434
|
if (loadingMetaStatus !== 'success') return {
|
|
435
435
|
title: 'Connect Wallet',
|
|
436
436
|
disabled: true
|
|
@@ -442,7 +442,7 @@ function getSwapButtonState(loadingMetaStatus, accounts, loading, bestRoute, has
|
|
|
442
442
|
if (loading) return {
|
|
443
443
|
title: 'Finding Best Route...',
|
|
444
444
|
disabled: true
|
|
445
|
-
};else if (
|
|
445
|
+
};else if (!inputAmount || inputAmount === '0') return {
|
|
446
446
|
title: 'Enter an amount',
|
|
447
447
|
disabled: true
|
|
448
448
|
};else if (!bestRoute || !bestRoute.result) return {
|
|
@@ -511,7 +511,7 @@ function hasProperSlippage(userSlippage, minRequiredSlippage) {
|
|
|
511
511
|
if (!minRequiredSlippage) return true;
|
|
512
512
|
return parseFloat(userSlippage) >= parseFloat(minRequiredSlippage);
|
|
513
513
|
}
|
|
514
|
-
function createBestRouteRequestBody(fromToken, toToken, inputAmount, wallets, selectedWallets, disabledLiquiditySources, slippage,
|
|
514
|
+
function createBestRouteRequestBody(fromToken, toToken, inputAmount, wallets, selectedWallets, disabledLiquiditySources, slippage, affiliateRef, initialRoute) {
|
|
515
515
|
const selectedWalletsMap = selectedWallets.reduce((selectedWalletsMap, selectedWallet) => (selectedWalletsMap[selectedWallet.chain] = selectedWallet.address, selectedWalletsMap), {});
|
|
516
516
|
const connectedWallets = [];
|
|
517
517
|
wallets.forEach(wallet => {
|
|
@@ -521,7 +521,8 @@ function createBestRouteRequestBody(fromToken, toToken, inputAmount, wallets, se
|
|
|
521
521
|
addresses: [wallet.address]
|
|
522
522
|
});
|
|
523
523
|
});
|
|
524
|
-
const
|
|
524
|
+
const checkPrerequisites = !!initialRoute;
|
|
525
|
+
const filteredBlockchains = removeDuplicateFrom((initialRoute?.result?.swaps || []).reduce((blockchains, swap) => (blockchains.push(swap.from.blockchain, swap.to.blockchain), blockchains), []));
|
|
525
526
|
const requestBody = {
|
|
526
527
|
amount: inputAmount.toString(),
|
|
527
528
|
affiliateRef,
|
|
@@ -868,7 +869,7 @@ const useWalletsStore = /*#__PURE__*/createSelectors( /*#__PURE__*/zustand.creat
|
|
|
868
869
|
}
|
|
869
870
|
});
|
|
870
871
|
return {
|
|
871
|
-
selectedWallets: selectedWallets
|
|
872
|
+
selectedWallets: state.selectedWallets.concat(selectedWallets)
|
|
872
873
|
};
|
|
873
874
|
}),
|
|
874
875
|
setSelectedWallet: wallet => set(state => ({
|
|
@@ -1059,7 +1060,7 @@ const bestRoute = (bestRouteStore, settingsStore) => {
|
|
|
1059
1060
|
abortController?.abort();
|
|
1060
1061
|
abortController = new AbortController();
|
|
1061
1062
|
const userSlippage = !!customSlippage ? customSlippage : slippage;
|
|
1062
|
-
const requestBody = createBestRouteRequestBody(fromToken, toToken, inputAmount, [], [], disabledLiquiditySources, userSlippage,
|
|
1063
|
+
const requestBody = createBestRouteRequestBody(fromToken, toToken, inputAmount, [], [], disabledLiquiditySources, userSlippage, affiliateRef);
|
|
1063
1064
|
if (!bestRouteStore.getState().loading) bestRouteStore.setState({
|
|
1064
1065
|
loading: true,
|
|
1065
1066
|
bestRoute: null,
|
|
@@ -1093,7 +1094,9 @@ const bestRoute = (bestRouteStore, settingsStore) => {
|
|
|
1093
1094
|
inputAmount,
|
|
1094
1095
|
inputUsdValue
|
|
1095
1096
|
} = useBestRouteStore.getState();
|
|
1096
|
-
if (!inputAmount || inputAmount === '0' || inputUsdValue.eq(0)) return
|
|
1097
|
+
if (!inputAmount || inputAmount === '0' || inputUsdValue.eq(0)) return bestRouteStore.setState({
|
|
1098
|
+
loading: false
|
|
1099
|
+
});
|
|
1097
1100
|
if (tokensAreEqual(fromToken, toToken)) return bestRouteStore.setState({
|
|
1098
1101
|
loading: false,
|
|
1099
1102
|
bestRoute: null,
|
|
@@ -1406,6 +1409,7 @@ function TokenInfo(props) {
|
|
|
1406
1409
|
const bestRoute = useBestRouteStore.use.bestRoute();
|
|
1407
1410
|
const inputAmount = useBestRouteStore.use.inputAmount();
|
|
1408
1411
|
const balances = useWalletsStore.use.balances();
|
|
1412
|
+
const fetchingBestRoute = useBestRouteStore.use.loading();
|
|
1409
1413
|
const navigate = reactRouterDom.useNavigate();
|
|
1410
1414
|
const {
|
|
1411
1415
|
t
|
|
@@ -1514,7 +1518,7 @@ function TokenInfo(props) {
|
|
|
1514
1518
|
} : undefined
|
|
1515
1519
|
}) : React__default.createElement(OutputContainer, null, React__default.createElement(ui.Typography, {
|
|
1516
1520
|
variant: "h4"
|
|
1517
|
-
},
|
|
1521
|
+
}, fetchingBestRoute && '?', !!bestRoute?.result && `≈ ${numberToString(props.outputAmount)}`, (!inputAmount || inputAmount === '0') && '0'))))));
|
|
1518
1522
|
}
|
|
1519
1523
|
|
|
1520
1524
|
const Container$1 = /*#__PURE__*/theme.styled('div', {
|
|
@@ -1698,8 +1702,7 @@ function Home() {
|
|
|
1698
1702
|
swap
|
|
1699
1703
|
} = LimitErrorMessage(bestRoute);
|
|
1700
1704
|
const priceImpactCanNotBeComputed = !canComputePriceImpact(bestRoute, inputAmount, inputUsdValue, outputUsdValue);
|
|
1701
|
-
const
|
|
1702
|
-
const swapButtonState = getSwapButtonState(loadingMetaStatus, accounts, fetchingBestRoute, bestRoute, hasLimitError(bestRoute), highValueLoss, priceImpactCanNotBeComputed, needsToWarnEthOnPath, inputIsZero);
|
|
1705
|
+
const swapButtonState = getSwapButtonState(loadingMetaStatus, accounts, fetchingBestRoute, bestRoute, hasLimitError(bestRoute), highValueLoss, priceImpactCanNotBeComputed, needsToWarnEthOnPath, inputAmount);
|
|
1703
1706
|
const totalFeeInUsd = getTotalFeeInUsd(bestRoute, tokens);
|
|
1704
1707
|
const highFee = hasHighFee(totalFeeInUsd);
|
|
1705
1708
|
React.useEffect(() => {
|
|
@@ -2061,7 +2064,7 @@ function useConfirmSwap() {
|
|
|
2061
2064
|
}
|
|
2062
2065
|
abortControllerRef.current = new AbortController();
|
|
2063
2066
|
setLoading(true);
|
|
2064
|
-
const requestBody = createBestRouteRequestBody(fromToken, toToken, inputAmount, accounts, selectedWallets, disabledLiquiditySources, userSlippage,
|
|
2067
|
+
const requestBody = createBestRouteRequestBody(fromToken, toToken, inputAmount, accounts, selectedWallets, disabledLiquiditySources, userSlippage, affiliateRef, initialRoute);
|
|
2065
2068
|
try {
|
|
2066
2069
|
const confiremedRoute = await httpService().getBestRoute(requestBody, {
|
|
2067
2070
|
signal: abortControllerRef.current?.signal
|
|
@@ -2304,6 +2307,7 @@ function ConfirmSwapPage() {
|
|
|
2304
2307
|
const customSlippage = useSettingsStore.use.customSlippage();
|
|
2305
2308
|
const inputUsdValue = useBestRouteStore.use.inputUsdValue();
|
|
2306
2309
|
const outputUsdValue = useBestRouteStore.use.outputUsdValue();
|
|
2310
|
+
const setInputAmount = useBestRouteStore.use.setInputAmount();
|
|
2307
2311
|
const bestRouteloadingStatus = getBestRouteStatus(fetchingBestRoute, !!fetchingBestRouteError);
|
|
2308
2312
|
const {
|
|
2309
2313
|
manager
|
|
@@ -2334,10 +2338,7 @@ function ConfirmSwapPage() {
|
|
|
2334
2338
|
getKeplrCompatibleConnectedWallets(selectableWallets).forEach(compatibleWallet => connect?.(compatibleWallet, network));
|
|
2335
2339
|
};
|
|
2336
2340
|
const totalFeeInUsd = getTotalFeeInUsd(bestRoute, tokens);
|
|
2337
|
-
return React__default.createElement(ui.ConfirmSwap
|
|
2338
|
-
// @ts-ignore
|
|
2339
|
-
, {
|
|
2340
|
-
// @ts-ignore
|
|
2341
|
+
return React__default.createElement(ui.ConfirmSwap, {
|
|
2341
2342
|
requiredWallets: getRequiredChains(bestRoute),
|
|
2342
2343
|
selectableWallets: selectableWallets,
|
|
2343
2344
|
onBack: navigateBackFrom.bind(null, navigationRoutes.confirmSwap),
|
|
@@ -2346,15 +2347,14 @@ function ConfirmSwapPage() {
|
|
|
2346
2347
|
if (swap) {
|
|
2347
2348
|
manager?.create('swap', {
|
|
2348
2349
|
swapDetails: swap
|
|
2349
|
-
},
|
|
2350
|
-
// @ts-ignore
|
|
2351
|
-
{
|
|
2350
|
+
}, {
|
|
2352
2351
|
id: swap.requestId
|
|
2353
2352
|
});
|
|
2354
2353
|
setSelectedSwap(swap.requestId);
|
|
2355
2354
|
navigate(navigationRoutes.swaps + `/${swap.requestId}`, {
|
|
2356
2355
|
replace: true
|
|
2357
2356
|
});
|
|
2357
|
+
setInputAmount('');
|
|
2358
2358
|
}
|
|
2359
2359
|
});
|
|
2360
2360
|
},
|