m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Show account name when qr scan in send screen (#16204)

Browse Source 
Co-authored-by: Brad Decker <bhdecker84@gmail.com>
This commit is contained in:
amerkadicE 2022-11-30 16:24:28 +01:00 committed by GitHub
parent b1fd7f7796
commit 08ddd4fb0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ui/ducks/send/send.test.js
View File

@ -3114,7 +3114,14 @@ describe('Send Slice', () => {
expect( expect(
getSendTo({ getSendTo({
send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT, send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
metamask: { ensResolutionsByAddress: {} }, metamask: {
ensResolutionsByAddress: {},
identities: {},
addressBook: {},
provider: {
chainId: '0x5',
},
},
}), }),
).toBe(''); ).toBe('');
expect( expect(
@ -3122,7 +3129,14 @@ describe('Send Slice', () => {
send: getInitialSendStateWithExistingTxState({ send: getInitialSendStateWithExistingTxState({
recipient: { address: '0xb' }, recipient: { address: '0xb' },
}), }),
metamask: { ensResolutionsByAddress: {} }, metamask: {
ensResolutionsByAddress: {},
addressBook: {},
identities: {},
provider: {
chainId: '0x5',
},
},
}), }),
).toBe('0xb'); ).toBe('0xb');
}); });
@ -3163,7 +3177,14 @@ describe('Send Slice', () => {
expect( expect(
getRecipient({ getRecipient({
send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT, send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
metamask: { ensResolutionsByAddress: {} }, metamask: {
ensResolutionsByAddress: {},
identities: {},
addressBook: {},
provider: {
chainId: '0x5',
},
},
}), }),
).toMatchObject( ).toMatchObject(
getTestUUIDTx(INITIAL_SEND_STATE_FOR_EXISTING_DRAFT).recipient, getTestUUIDTx(INITIAL_SEND_STATE_FOR_EXISTING_DRAFT).recipient,

12
ui/selectors/selectors.js
View File

@ -392,7 +392,17 @@ export function getAddressBook(state) {
} }
export function getEnsResolutionByAddress(state, address) { export function getEnsResolutionByAddress(state, address) {
return state.metamask.ensResolutionsByAddress[address] || ''; if (state.metamask.ensResolutionsByAddress[address]) {
return state.metamask.ensResolutionsByAddress[address];
}
const entry =
getAddressBookEntry(state, address) ||
Object.values(state.metamask.identities).find((identity) =>
isEqualCaseInsensitive(identity.address, toChecksumHexAddress(address)),
);
return entry?.name || '';
} }
export function getAddressBookEntry(state, address) { export function getAddressBookEntry(state, address) {