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

Jump to bottom

Fix ENS name displayed on confirm send page #6350

Merged
merged 7 commits into from
May 18, 2023
Merged

Fix ENS name displayed on confirm send page #6350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
49c5d33
Fix ENS name displayed on confirm send page
jpuri May 8, 2023
038f0ca
merge
jpuri May 12, 2023
9057b2f
Merge branch 'main' into ens_fix
jpuri May 15, 2023
00c4931
fix
jpuri May 17, 2023
ca5bd0c
Merge branch 'ens_fix' of github.com:MetaMask/metamask-mobile into en…
jpuri May 17, 2023
ffe21d9
Merge branch 'main' into ens_fix
jpuri May 17, 2023
0851294
Merge branch 'main' into ens_fix
jpuri May 18, 2023
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
27 changes: 26 additions & 1 deletion app/components/UI/AccountFromToInfoCard/AccountFromToInfoCard.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import { shallow } from 'enzyme';
import configureMockStore from 'redux-mock-store';

import renderWithProvider from '../../../util/test/renderWithProvider';
import AccountFromToInfoCard from '.';
import { ENSCache } from '../../../util/ENSUtils';
import { Transaction } from './AccountFromToInfoCard.types';
import AccountFromToInfoCard from '.';

jest.mock('react-redux', () => ({
...jest.requireActual('react-redux'),
Expand Down Expand Up @@ -185,4 +186,28 @@ describe('AccountFromToInfoCard', () => {
);
expect(await findByText('0xF4e8...287B')).toBeDefined();
});

it('should display ens name', async () => {
const txState: Transaction = {
...transactionState,
transaction: { from: '0x0', to: '0x3' },
transactionTo: '0x3',
};
(ENSCache.cache as any) = {
'10x1': {
name: 'test1.eth',
timestamp: new Date().getTime(),
},
'10x3': {
name: 'test3.eth',
timestamp: new Date().getTime(),
},
};
const { queryByText } = renderWithProvider(
<AccountFromToInfoCard transactionState={txState} />,
{ state: initialState },
);
expect(await queryByText('test1.eth')).toBeDefined();
expect(await queryByText('test3.eth')).toBeDefined();
});
});
23 changes: 14 additions & 9 deletions app/components/UI/AccountFromToInfoCard/AccountFromToInfoCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,28 @@ const AccountFromToInfoCard = (props: AccountFromToInfoCardProps) => {
return;
}
(async () => {
const { name: fromName } = identities[fromAddress];
const fromEns = await doENSReverseLookup(fromAddress);
setFromAccountName(fromEns || fromName);
const fromEns = await doENSReverseLookup(fromAddress, network);
if (fromEns) {
setFromAccountName(fromEns);
} else {
const { name: fromName } = identities[fromAddress];
setFromAccountName(fromName);
}
})();
}, [fromAddress, identities, transactionFromName]);
}, [fromAddress, identities, transactionFromName, network]);
jpuri marked this conversation as resolved.
Show resolved Hide resolved

useEffect(() => {
if (existingToAddress) {
setToAccountName(existingToAddress?.name);
return;
}
(async () => {
if (identities[toAddress]) {
const toEns = await doENSReverseLookup(toAddress);
if (toEns) {
setToAccountName(toEns);
}
const toEns = await doENSReverseLookup(toAddress, network);
if (toEns) {
setToAccountName(toEns);
} else if (identities[toAddress]) {
const { name: toName } = identities[toAddress];
setToAccountName(toName);
}
})();
}, [existingToAddress, identities, network, toAddress, transactionToName]);
Expand Down