Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: swap+send bugs in Version v12.0.0 release #25307

Merged
merged 8 commits into from
Jun 15, 2024
Merged

fix: swap+send bugs in Version v12.0.0 release #25307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1eafe56
fix: non-native token switching inconsistency [25159]
micaelae Jun 10, 2024
82a7550
fix: swap+send to native token shows incorrect primaryCurrency value
micaelae Jun 11, 2024
440b167
test: new unit tests for swap+send activity
micaelae Jun 11, 2024
6db66c2
fix: show input amount correctly in firefox
micaelae Jun 12, 2024
4cc3639
fix: show truncated token amount when fiat is primary
micaelae Jun 12, 2024
7675962
fix: unit tests
micaelae Jun 13, 2024
b3166bb
chore: add expected swaps-api send query
micaelae Jun 13, 2024
9ba153e
fix: show correct fiat amount in activity
micaelae Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,388 changes: 1,388 additions & 0 deletions test/data/transaction-data.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion test/e2e/tests/swap-send/swap-send-erc20.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ describe('Swap-Send ERC20', function () {
getSwapSendFixtures(
this.test?.fullTitle(),
SWAP_SEND_QUOTES_RESPONSE_TST_ETH,
'?sourceAmount=100000&sourceToken=0x581c3C1A2A4EBDE2A0Df29B5cf4c116E42945947&destinationToken=0x0000000000000000000000000000000000000000&sender=0x5cfe73b6021e818b776b421b1c4db2474086a7e1&recipient=0xc427D562164062a23a5cFf596A4a3208e72Acd28&slippage=2',
),
async ({
driver,
Expand Down Expand Up @@ -104,7 +105,7 @@ describe('Swap-Send ERC20', function () {
'Send TST as ETH',
'Confirmed',
'-10 TST',
'-$0.00',
'',
);

driver.summarizeErrorsAndExceptions();
Expand Down
6 changes: 4 additions & 2 deletions test/e2e/tests/swap-send/swap-send-eth.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,18 +71,20 @@ describe('Swap-Send ETH', function () {
'≈ $38.84',
);

// TODO assert swap api request payload

await swapSendPage.submitSwap();
await swapSendPage.verifyHistoryEntry(
'Send ETH as TST',
'Pending',
'-1 ETH',
'-$3,010.00',
'',
);
await swapSendPage.verifyHistoryEntry(
'Send ETH as TST',
'Confirmed',
'-1 ETH',
'-$3,010.00',
'',
);

driver.summarizeErrorsAndExceptions();
Expand Down
8 changes: 5 additions & 3 deletions test/e2e/tests/swap-send/swap-send-test-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,11 @@ export class SwapSendPage {
}

export const mockSwapsApi =
(quotes = SWAP_SEND_QUOTES_RESPONSE_ETH_TST) =>
(quotes: typeof SWAP_SEND_QUOTES_RESPONSE_ETH_TST, query: string) =>
async (mockServer: Mockttp) => {
return await mockServer
await mockServer
.forGet(`${SWAPS_API_V2_BASE_URL}/v2/networks/1337/quotes`)
.withExactQuery(query)
.always()
.thenCallback(() => {
return {
Expand All @@ -261,6 +262,7 @@ export const mockSwapsApi =
export const getSwapSendFixtures = (
title?: string,
swapsQuotes = SWAP_SEND_QUOTES_RESPONSE_ETH_TST,
swapsQuery = '?sourceAmount=1000000000000000000&sourceToken=0x0000000000000000000000000000000000000000&destinationToken=0x581c3C1A2A4EBDE2A0Df29B5cf4c116E42945947&sender=0x5cfe73b6021e818b776b421b1c4db2474086a7e1&recipient=0xc427D562164062a23a5cFf596A4a3208e72Acd28&slippage=2',
) => {
const ETH_CONVERSION_RATE_USD = 3010;
return {
Expand Down Expand Up @@ -296,7 +298,7 @@ export const getSwapSendFixtures = (
.build(),
smartContract: SMART_CONTRACTS.HST,
ethConversionInUsd: ETH_CONVERSION_RATE_USD,
testSpecificMock: mockSwapsApi(swapsQuotes),
testSpecificMock: mockSwapsApi(swapsQuotes, swapsQuery),
ganacheOptions: generateGanacheOptions({ hardfork: 'london' }),
title,
};
Expand Down
12 changes: 10 additions & 2 deletions ui/components/multichain/asset-picker-amount/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
.unit-input__inputs {
// primary (i.e., input) and secondary (i.e., subtext) input sections
& > div {
max-width: 125px;
max-width: 138px;
white-space: nowrap;
text-overflow: ellipsis;
}
Expand All @@ -51,7 +51,15 @@

text-overflow: ellipsis;
overflow: hidden;
display: inline;
flex-wrap: nowrap;

& > span.currency-display-component__text {
width: max-content;
}

& > span.currency-display-component__suffix {
width: max-content;
}
}

// secondary field elements (e.g., value, symbols)
Expand Down
7 changes: 5 additions & 2 deletions ui/components/multichain/pages/send/components/recipient-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import {
getUseExternalServices,
} from '../../../../../selectors';
import type { Quote } from '../../../../../ducks/send/swap-and-send-utils';
import { isEqualCaseInsensitive } from '../../../../../../shared/modules/string-utils';
import { SendHexData, SendPageRow, QuoteCard } from '.';

export const SendPageRecipientContent = ({
Expand Down Expand Up @@ -59,8 +60,10 @@ export const SendPageRecipientContent = ({

const isLoadingInitialQuotes = !bestQuote && isSwapQuoteLoading;

const isBasicSend =
receiveAsset.details?.address === sendAsset.details?.address;
const isBasicSend = isEqualCaseInsensitive(
receiveAsset.details?.address ?? '',
sendAsset.details?.address ?? '',
);

const amount = isBasicSend
? sendAmount
Expand Down
1 change: 1 addition & 0 deletions ui/components/ui/unit-input/unit-input.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ export default class UnitInput extends PureComponent {
}

this.props.onBlur && this.props.onBlur(value);
this.unitInput.scrollTo && this.unitInput.scrollTo(0, 0);
};

handleChange = (event) => {
Expand Down
33 changes: 23 additions & 10 deletions ui/hooks/useSwappedTokenValue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@ export function useSwappedTokenValue(transactionGroup, currentAsset) {
const chainId = useSelector(getCurrentChainId);

const isViewingReceivedTokenFromSwap =
currentAsset?.symbol === primaryTransaction.destinationTokenSymbol ||
(isSwapsDefaultTokenAddress(currentAsset.address, chainId) &&
isSwapsDefaultTokenSymbol(
primaryTransaction.destinationTokenSymbol,
chainId,
));
type === TransactionType.swap &&
(currentAsset?.symbol === primaryTransaction.destinationTokenSymbol ||
(isSwapsDefaultTokenAddress(currentAsset.address, chainId) &&
isSwapsDefaultTokenSymbol(
primaryTransaction.destinationTokenSymbol,
chainId,
)));

const swapTokenValue =
[TransactionType.swap, TransactionType.swapAndSend].includes(type) &&
isViewingReceivedTokenFromSwap
[TransactionType.swap].includes(type) && isViewingReceivedTokenFromSwap
? getSwapsTokensReceivedFromTxMeta(
primaryTransaction.destinationTokenSymbol,
initialTransaction,
Expand All @@ -69,8 +69,21 @@ export function useSwappedTokenValue(transactionGroup, currentAsset) {
swapTokenValue || '',
symbol,
);
const swapTokenFiatAmount =
swapTokenValue && isViewingReceivedTokenFromSwap && _swapTokenFiatAmount;
const _swapAndSendTokenFiatAmount = useTokenFiatAmount(
primaryTransaction.sourceTokenAddress,
swapTokenValue,
primaryTransaction.sourceTokenSymbol,
);

let swapTokenFiatAmount;
if (swapTokenValue) {
if (isViewingReceivedTokenFromSwap) {
swapTokenFiatAmount = _swapTokenFiatAmount;
} else if (type === TransactionType.swapAndSend) {
swapTokenFiatAmount = _swapAndSendTokenFiatAmount;
}
}

return {
swapTokenValue,
swapTokenFiatAmount,
Expand Down
3 changes: 2 additions & 1 deletion ui/hooks/useTransactionDisplayData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@ export function useTransactionDisplayData(transactionGroup) {
recipientAddress,
secondaryCurrency:
(isTokenCategory && !tokenFiatAmount) ||
(type === TransactionType.swap && !swapTokenFiatAmount)
([TransactionType.swap, TransactionType.swapAndSend].includes(type) &&
!swapTokenFiatAmount)
? undefined
: secondaryCurrency,
displayedStatusKey,
Expand Down
30 changes: 28 additions & 2 deletions ui/hooks/useTransactionDisplayData.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,36 @@ const expectedResults = [
subtitle: 'metamask',
subtitleContainsOrigin: true,
date: formatDateWithYearContext(1585088013000),
primaryCurrency: '-0 BAT',
primaryCurrency: '-33.425656732428330864 BAT',
senderAddress: '0x0a985a957b490f4d05bef05bc7ec556dd8535946',
recipientAddress: '0xc6f6ca03d790168758285264bcbf7fb30d27322b',
secondaryCurrency: '-0 ETH',
secondaryCurrency: undefined,
isPending: false,
displayedStatusKey: TransactionStatus.confirmed,
},
{
title: 'Send USDC as DAI',
category: TransactionType.swapAndSend,
subtitle: 'metamask',
subtitleContainsOrigin: true,
date: formatDateWithYearContext(1585088013000),
primaryCurrency: '-5 USDC',
senderAddress: '0x141d32a89a1e0a5ef360034a2f60a4b917c18838',
recipientAddress: '0x141d32a89a1e0a5ef360034a2f60a4b917c18838',
secondaryCurrency: undefined,
isPending: false,
displayedStatusKey: TransactionStatus.confirmed,
},
{
title: 'Send BNB as USDC',
category: TransactionType.swapAndSend,
subtitle: 'metamask',
subtitleContainsOrigin: true,
date: formatDateWithYearContext(1585088013000),
primaryCurrency: '-0.05 BNB',
senderAddress: '0x141d32a89a1e0a5ef360034a2f60a4b917c18838',
recipientAddress: '0x141d32a89a1e0a5ef360034a2f60a4b917c18838',
secondaryCurrency: undefined,
isPending: false,
displayedStatusKey: TransactionStatus.confirmed,
},
Expand Down