Skip to content

Commit

Permalink
fix: ui customizations for redesigned transactions (#28443) (#28457)
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**

Cherry pick:
072c8c7

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/28443?quickstart=1)

## **Related issues**

Fixes: #28322
Fixes: #28339

## **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.

Co-authored-by: Vinicius Stevam <[email protected]>
  • Loading branch information
cryptotavares and vinistevam authored Nov 14, 2024
1 parent 5e7e9c2 commit f0d2588
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion app/scripts/lib/transaction/metrics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,7 @@ async function buildEventFragmentProperties({
}
const isRedesignedConfirmationsDeveloperSettingEnabled =
transactionMetricsRequest.getIsRedesignedConfirmationsDeveloperEnabled() ||
Boolean(process.env.ENABLE_CONFIRMATION_REDESIGN);
process.env.ENABLE_CONFIRMATION_REDESIGN === 'true';

const isRedesignedTransactionsUserSettingEnabled =
transactionMetricsRequest.getRedesignedTransactionsEnabled();
Expand Down
6 changes: 4 additions & 2 deletions app/scripts/metamask-controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -6529,10 +6529,12 @@ export default class MetamaskController extends EventEmitter {
);
},
getRedesignedConfirmationsEnabled: () => {
return this.preferencesController.getRedesignedConfirmationsEnabled;
return this.preferencesController.state.preferences
.redesignedConfirmationsEnabled;
},
getRedesignedTransactionsEnabled: () => {
return this.preferencesController.getRedesignedTransactionsEnabled;
return this.preferencesController.state.preferences
.redesignedTransactionsEnabled;
},
getMethodData: (data) => {
if (!data) {
Expand Down

0 comments on commit f0d2588

Please sign in to comment.