Skip to content

Commit

Permalink
fix: ellipsify long NFT IDs (#25479)
Browse files Browse the repository at this point in the history
<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

Long token IDs will overflow the padding and breaking the styling. This
PR truncates long token IDs from the middle.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/25479?quickstart=1)

## **Related issues**

Fixes: #25370 

## **Manual testing steps**

1. Go to the send flow
2. Select an NFT (721 or 1155) with a token ID long enough to overflow
the component
3. Ensure that it is truncated with and ellipsis in the middle

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<img width="405" alt="Screenshot 2024-06-21 at 6 00 32 PM"
src="https://github.com/MetaMask/metamask-extension/assets/44588480/4c491710-f636-4980-8f9a-a22001e1380f">

<!-- [screenshots/recordings] -->

### **After**

<img width="405" alt="Screenshot 2024-06-21 at 6 01 51 PM"
src="https://github.com/MetaMask/metamask-extension/assets/44588480/911e494a-e940-49a6-9855-412babfc0557">

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
  • Loading branch information
BZahory authored and micaelae committed Jun 21, 2024
1 parent f7b4771 commit 3ddc5fd
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,46 @@ describe('AssetPicker', () => {
expect(getByText('?')).toBeInTheDocument();
});

it('nft: does not truncates if token ID is under length 13', () => {
const asset = {
type: AssetType.NFT,
details: {
address: 'token address',
decimals: 2,
tokenId: 1234567890,
},
balance: '100',
};
const mockAssetChange = jest.fn();

const { getByText } = render(
<Provider store={store()}>
<AssetPicker asset={asset} onAssetChange={() => mockAssetChange()} />
</Provider>,
);
expect(getByText('#1234567890')).toBeInTheDocument();
});

it('nft: truncates if token ID is too long', () => {
const asset = {
type: AssetType.NFT,
details: {
address: 'token address',
decimals: 2,
tokenId: 1234567890123456,
},
balance: '100',
};
const mockAssetChange = jest.fn();

const { getByText } = render(
<Provider store={store()}>
<AssetPicker asset={asset} onAssetChange={() => mockAssetChange()} />
</Provider>,
);
expect(getByText('#123456...3456')).toBeInTheDocument();
});

it('render if disabled', () => {
const asset = {
type: AssetType.token,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ import {
MetaMetricsEventCategory,
MetaMetricsEventName,
} from '../../../../../shared/constants/metametrics';
import { ellipsify } from '../../../../pages/confirmations/send/send.utils';

const ELLIPSIFY_LENGTH = 13; // 6 (start) + 4 (end) + 3 (...)

export type AssetPickerProps = {
asset: Asset;
Expand Down Expand Up @@ -168,7 +171,10 @@ export function AssetPicker({
variant={TextVariant.bodySm}
color={TextColor.textAlternative}
>
#{asset.details.tokenId}
#
{String(asset.details.tokenId).length < ELLIPSIFY_LENGTH
? asset.details.tokenId
: ellipsify(String(asset.details.tokenId), 6, 4)}
</Text>
)}
</Tooltip>
Expand Down

0 comments on commit 3ddc5fd

Please sign in to comment.