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(cherry-pick) : selector getKnownMethodData should return empty object if user has opted out for using 4Byte Resolution #27213

Merged
merged 1 commit into from
Sep 17, 2024
Merged

fix(cherry-pick) : selector getKnownMethodData should return empty object if user has opted out for using 4Byte Resolution #27213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ui/pages/confirmations/components/confirm/info/hooks/useFourByte.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe('useFourByte', () => {
expect(result.current.params).toEqual([]);
});

it('returns undefined if resolution is turned off', () => {
it('returns empty object if resolution is turned off', () => {
const currentConfirmation = genUnapprovedContractInteractionConfirmation({
address: CONTRACT_INTERACTION_SENDER_ADDRESS,
txData: depositHexData,
Expand All @@ -54,7 +54,7 @@ describe('useFourByte', () => {
},
);

expect(result.current).toBeUndefined();
expect(result.current).toEqual({});
});

it("returns undefined if it's not known even if resolution is enabled", () => {
Expand All @@ -75,6 +75,6 @@ describe('useFourByte', () => {
},
);

expect(result.current).toBeUndefined();
expect(result.current).toEqual({});
});
});
2 changes: 1 addition & 1 deletion .../confirmations/components/confirm/info/shared/transaction-details/transaction-details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const MethodDataRow = () => {

const methodData = useFourByte(currentConfirmation);

if (!methodData) {
if (!methodData?.name) {
return null;
}

Expand Down
2 changes: 1 addition & 1 deletion ui/selectors/selectors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1236,7 +1236,7 @@ export function getKnownMethodData(state, data) {
const fourBytePrefix = prefixedData.slice(0, 10);
const { knownMethodData, use4ByteResolution } = state.metamask;
// If 4byte setting is off, we do not want to return the knownMethodData
return use4ByteResolution ? knownMethodData?.[fourBytePrefix] : undefined;
return use4ByteResolution ? knownMethodData?.[fourBytePrefix] ?? {} : {};
}

export function getFeatureFlags(state) {
Expand Down