@rango-dev/widget-embedded 0.27.4-next.0 → 0.27.4-next.2

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.
Files changed (9) hide show
  1. package/dist/components/Quote/Quote.d.ts.map +1 -1
  2. package/dist/index.js +2 -2
  3. package/dist/index.js.map +3 -3
  4. package/package.json +3 -3
  5. package/src/components/ConfirmWalletsModal/ConfirmWalletsModal.tsx +1 -1
  6. package/src/components/Quote/Quote.tsx +50 -43
  7. package/src/hooks/useWalletList.ts +1 -1
  8. package/src/utils/meta.ts +1 -1
  9. package/src/utils/wallets.ts +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rango-dev/widget-embedded",
3
- "version": "0.27.4-next.0",
3
+ "version": "0.27.4-next.2",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "source": "./src/index.ts",
@@ -25,11 +25,11 @@
25
25
  "@lingui/core": "4.2.1",
26
26
  "@lingui/react": "4.2.1",
27
27
  "@rango-dev/logging-core": "^0.2.1-next.1",
28
- "@rango-dev/provider-all": "^0.32.2-next.2",
28
+ "@rango-dev/provider-all": "^0.32.2-next.3",
29
29
  "@rango-dev/queue-manager-core": "^0.26.0",
30
30
  "@rango-dev/queue-manager-rango-preset": "^0.32.1-next.0",
31
31
  "@rango-dev/queue-manager-react": "^0.26.0",
32
- "@rango-dev/ui": "^0.33.1-next.2",
32
+ "@rango-dev/ui": "^0.33.1-next.4",
33
33
  "@rango-dev/wallets-react": "^0.18.1-next.0",
34
34
  "@rango-dev/wallets-shared": "^0.32.1-next.0",
35
35
  "bignumber.js": "^9.1.1",
package/src/components/ConfirmWalletsModal/ConfirmWalletsModal.tsx CHANGED
@@ -437,7 +437,6 @@ export function ConfirmWalletsModal(props: PropTypes) {
437
437
  }>
438
438
  <Divider size={4} />
439
439
  <StyledTextField
440
- autoFocus
441
440
  placeholder={i18n.t('Your destination address')}
442
441
  value={customDestination || ''}
443
442
  onChange={(e) => {
@@ -449,6 +448,7 @@ export function ConfirmWalletsModal(props: PropTypes) {
449
448
  setCustomDestination(value.length ? value : null);
450
449
  }
451
450
  }}
451
+ {...(!customDestination && { autoFocus: true })}
452
452
  />
453
453
  </CustomCollapsible>
454
454
 
package/src/components/Quote/Quote.tsx CHANGED
@@ -90,6 +90,8 @@ export function Quote(props: QuoteProps) {
90
90
  const blockchains = useAppStore().blockchains();
91
91
  const tokens = useAppStore().tokens();
92
92
  const swappers = useAppStore().swappers();
93
+ const { customSlippage, slippage } = useAppStore();
94
+ const userSlippage = customSlippage || slippage;
93
95
  const [expanded, setExpanded] = useState(props.expanded);
94
96
  const quoteRef = useRef<HTMLButtonElement | null>(null);
95
97
  const roundedInput = numberToString(
@@ -149,7 +151,7 @@ export function Quote(props: QuoteProps) {
149
151
  : i18n.t('Slippage Warning');
150
152
 
151
153
  if (hasBridgeLimitError) {
152
- alertTitle = error?.recommendation;
154
+ alertTitle = i18n.t('Bridge Limit Error');
153
155
  }
154
156
 
155
157
  return {
@@ -229,50 +231,43 @@ export function Quote(props: QuoteProps) {
229
231
  type={stepHasError ? 'error' : 'warning'}
230
232
  title={alertTitle}
231
233
  footer={
232
- !fullExpandedMode ? (
233
- <FooterAlert>
234
- {hasBridgeLimitError && (
235
- <>
236
- <Typography
237
- size="xsmall"
238
- variant="body"
239
- color="neutral900">
240
- {error.fromAmountRangeError}
241
- </Typography>
242
- <Divider direction="horizontal" size={8} />
243
- <Typography
244
- size="xsmall"
245
- variant="body"
246
- color="neutral900">
247
- |
248
- </Typography>
249
- <Divider direction="horizontal" size={8} />
250
- <Typography
251
- size="xsmall"
252
- variant="body"
253
- color="neutral900">
254
- {i18n.t({
255
- id: 'Yours: {amount} {symbol}',
256
- values: {
257
- amount: numberToString(
258
- swap.fromAmount,
259
- TOKEN_AMOUNT_MIN_DECIMALS,
260
- TOKEN_AMOUNT_MAX_DECIMALS
261
- ),
262
- symbol: swap?.from.symbol,
263
- },
264
- })}
265
- </Typography>
266
- </>
267
- )}
268
- {(hasSlippageError || hasSlippageWarning) &&
269
- !hasBridgeLimitError && (
234
+ <FooterAlert>
235
+ {hasBridgeLimitError && (
236
+ <div>
237
+ <Typography
238
+ size="xsmall"
239
+ variant="body"
240
+ color="neutral900">
241
+ {error.fromAmountRangeError}
242
+ </Typography>
243
+ <Divider direction="vertical" size={2} />
244
+ <Typography
245
+ size="xsmall"
246
+ variant="body"
247
+ color="neutral900">
248
+ {i18n.t({
249
+ id: 'Yours: {amount} {symbol}',
250
+ values: {
251
+ amount: numberToString(
252
+ swap.fromAmount,
253
+ TOKEN_AMOUNT_MIN_DECIMALS,
254
+ TOKEN_AMOUNT_MAX_DECIMALS
255
+ ),
256
+ symbol: swap?.from.symbol,
257
+ },
258
+ })}
259
+ </Typography>
260
+ </div>
261
+ )}
262
+ {(hasSlippageError || hasSlippageWarning) &&
263
+ !hasBridgeLimitError && (
264
+ <div>
270
265
  <Typography
271
266
  size="xsmall"
272
267
  variant="body"
273
268
  color="neutral900">
274
269
  {i18n.t({
275
- id: 'Minimum required slippage is {minRequiredSlippage}',
270
+ id: 'Minimum required slippage: {minRequiredSlippage}',
276
271
  values: {
277
272
  ...(error?.type ===
278
273
  QuoteErrorType.INSUFFICIENT_SLIPPAGE && {
@@ -287,9 +282,21 @@ export function Quote(props: QuoteProps) {
287
282
  },
288
283
  })}
289
284
  </Typography>
290
- )}
291
- </FooterAlert>
292
- ) : null
285
+ <Divider direction="vertical" size={2} />
286
+ <Typography
287
+ size="xsmall"
288
+ variant="body"
289
+ color="neutral900">
290
+ {i18n.t({
291
+ id: 'Yours: {userSlippage}',
292
+ values: {
293
+ userSlippage,
294
+ },
295
+ })}
296
+ </Typography>
297
+ </div>
298
+ )}
299
+ </FooterAlert>
293
300
  }
294
301
  />
295
302
  </FooterStepAlarm>
package/src/hooks/useWalletList.ts CHANGED
@@ -82,7 +82,7 @@ export function useWalletList(params: Params) {
82
82
  const atLeastOneWalletIsConnected = !!wallets.find(
83
83
  (w) => w.state === WalletState.CONNECTED
84
84
  );
85
- if (!config?.multiWallets && atLeastOneWalletIsConnected) {
85
+ if (config?.multiWallets === false && atLeastOneWalletIsConnected) {
86
86
  return;
87
87
  }
88
88
  onBeforeConnect?.(type);
package/src/utils/meta.ts CHANGED
@@ -21,7 +21,7 @@ export function getSwapperDisplayName(
21
21
  swapperId: string,
22
22
  swappers: SwapperMeta[]
23
23
  ) {
24
- return swappers.find((swapper) => swapper.id === swapperId)?.swapperGroup;
24
+ return swappers.find((swapper) => swapper.id === swapperId)?.title;
25
25
  }
26
26
 
27
27
  export function findToken(t: Asset, tokens: Token[]) {
package/src/utils/wallets.ts CHANGED
@@ -427,8 +427,8 @@ export function areTokensEqual(
427
427
  ) {
428
428
  return (
429
429
  tokenA?.blockchain === tokenB?.blockchain &&
430
- tokenA?.symbol === tokenB?.symbol &&
431
- tokenA?.address === tokenB?.address
430
+ tokenA?.symbol.toLowerCase() === tokenB?.symbol.toLowerCase() &&
431
+ tokenA?.address?.toLowerCase() === tokenB?.address?.toLowerCase()
432
432
  );
433
433
  }
434
434