User to be able to edit approval amount in simulation section of batched confirmation #15572

jpuri · 2025-05-23T05:14:59Z

Description

User to be able to edit approval amount in simulation section of batched confirmation

Related issues

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/4972

Manual testing steps

Enable 7702 locally
Submit a batched approval
Edit approval amount in simulation section, ensure it works as expected

Screenshots/Recordings

Screen.Recording.2025-05-23.at.6.08.34.PM.mov

Pre-merge author checklist

I’ve followed MetaMask Contributor Docs and MetaMask Mobile Coding Standards.
I've completed the PR template to the best of my ability
I’ve included tests if applicable
I’ve documented my code using JSDoc format if applicable
I’ve applied the right labels on the PR (see labeling guidelines). 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.

…ions

…tions

…hed confirmation

github-actions · 2025-05-23T05:15:11Z

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

github-actions · 2025-05-29T09:54:43Z

Bitrise

❌❌❌ pr_smoke_e2e_pipeline failed on Bitrise! ❌❌❌

Commit hash: f1548dd
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/dd8d29b2-6bb8-486b-8177-d9e8ece9e4c3

Note

You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

Tip

Check the documentation if you have any doubts on how to understand the failure on bitrise

digiwand

hey @jpuri, the new feature is looking great! a couple of requests and suggestions above

locales/languages/en.json

app/components/Views/confirmations/components/edit-row-value/edit-row-value.tsx

app/components/UI/SimulationDetails/BatchApprovalRow/BatchApprovalRow.test.tsx

…ovalRow.test.tsx Co-authored-by: digiwand <[email protected]>

…tamask-mobile into approval_amt_editing

OGPoyraz · 2025-05-30T05:41:38Z

app/components/Views/confirmations/hooks/7702/useBatchApproveBalanceChanges.test.ts

+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        balance: '0x5' as any,


Suggested change

// eslint-disable-next-line @typescript-eslint/no-explicit-any

balance: '0x5' as any,

balance: '0x5' as Hex,

Does Hex works here?

I need to check

I found that it does not work, it actually needs an instance of BN but it is not in dependency in project so I am not able to use it like new BN('0x5') or '0x5' as BN

app/components/UI/SimulationDetails/useBalanceChanges.ts

app/components/UI/SimulationDetails/EditRowValue/EditRowValue.styles.ts

OGPoyraz · 2025-05-30T05:57:12Z

app/components/UI/SimulationDetails/EditRowValue/EditRowValue.tsx

+            <Text
+              style={styles.text}
+              color={TextColor.Alternative}
+              variant={TextVariant.BodyMD}
+            >
+              {editTexts?.description}
+            </Text>
+            <TextField
+              style={styles.input}
+              value={updatedAmount}
+              onChange={(evt) => setUpdatedAmount(evt.nativeEvent.text)}
+            />


What do we think of re-using TextFieldWithLabel?

In this case input does not really have a label, it is description in modal.

app/components/Views/confirmations/hooks/7702/useBatchApproveBalanceChanges.test.ts

OGPoyraz · 2025-05-30T06:26:41Z

app/components/Views/confirmations/hooks/7702/useBatchApproveBalanceChanges.ts

Just for curiosity - have we ever tried this for approval that has NFTs?

Not yep, I tried approvals of ERC20 only, these changes need to be tested.

app/components/Views/confirmations/utils/approvals.ts

OGPoyraz · 2025-05-30T06:29:53Z

app/components/Views/confirmations/utils/approvals.ts

+const SIGNATURE_LEGACY = 'function approve(address,uint256)';
+const SIGNATURE_PERMIT2 = 'function approve(address,address,uint160,uint48)';
+const SIGNATURE_INCREASE_ALLOWANCE =
+  'function increaseAllowance(address,uint256)';


Would it make sense to put them into app/components/Views/confirmations/constants/approvals.ts? Also maybe INCREASE_ALLOWANCE_SIGNATURE maybe a better naming here.

I moved the constants, I would prefer to keep name same as extension.

OGPoyraz · 2025-05-30T06:30:59Z

app/components/Views/confirmations/utils/approvals.ts

+    args?._value ?? // ERC-20 - approve
+    args?.increment ?? // Fiat Token V2 - increaseAllowance
+    args?.amount; // Permit2 - approve


Thank you for noting those ❤️

…alanceChanges.test.ts Co-authored-by: OGPoyraz <[email protected]>

…styles.ts Co-authored-by: OGPoyraz <[email protected]>

sonarqubecloud · 2025-05-30T11:19:03Z

Quality Gate passed

Issues
2 New issues
0 Accepted issues

Measures
0 Security Hotspots
91.3% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

jpuri added 22 commits May 14, 2025 19:16

Adding confirmation page for dapp request to upgrade+batched transact…

ed6ade8

…ions

update

85177fc

Adding splash page to upgrade account request

2f7b358

update

5cb8272

update

f15eac1

Changes in activity list for smart account upgrade/downgrade confirma…

dc368a8

…tions

update

014d9c4

Changes in activity list for smart account upgrade/downgrade confirma…

5538ad8

…tions

update

8b1b44f

Display tag with batched transaction count.

b02996a

Display tag with batched transaction count.

cd371db

Display tag with batched transaction count.

558b1e4

update

d3e7d86

Implementing features in simulation section for batched transactions

d24d1d0

Adding unit test coverage

ad8d351

Adding unit test coverage

8535b81

Adding unit test coverage

72047da

Adding unit test coverage

6125b13

Adding unit test coverage

4b9398c

Adding unit test coverage

2e978f9

Adding unit test coverage

2c337cf

User to be able to edit approval amount in simulation section of batc…

b55b034

…hed confirmation

metamaskbot added the team-confirmations Push issues to confirmations team label May 23, 2025

jpuri added 3 commits May 23, 2025 14:05

Update

fe62d75

update

978d037

Unit test coverage

f9b922b

jpuri marked this pull request as ready for review May 23, 2025 12:40

jpuri requested a review from a team as a code owner May 23, 2025 12:40

Unit test coverage

c8ac96f

jpuri added 5 commits May 28, 2025 15:27

merge

3cf1306

update

8cbcccd

update

f8df478

update

b174552

update

f1548dd

jpuri enabled auto-merge May 28, 2025 11:05

jpuri added the Run Smoke E2E Requires smoke E2E testing label May 29, 2025

bschorchit requested review from OGPoyraz and digiwand May 29, 2025 14:19

digiwand requested changes May 29, 2025

View reviewed changes

locales/languages/en.json Outdated Show resolved Hide resolved

app/components/Views/confirmations/components/edit-row-value/edit-row-value.tsx Outdated Show resolved Hide resolved

app/components/UI/SimulationDetails/BatchApprovalRow/BatchApprovalRow.test.tsx Outdated Show resolved Hide resolved

jpuri and others added 4 commits May 30, 2025 10:16

Update app/components/UI/SimulationDetails/BatchApprovalRow/BatchAppr…

e560bc0

…ovalRow.test.tsx Co-authored-by: digiwand <[email protected]>

update

bcfd092

Merge branch 'approval_amt_editing' of https://github.com/MetaMask/me…

74fcc74

…tamask-mobile into approval_amt_editing

update

bff7228

jpuri requested a review from digiwand May 30, 2025 05:03

Merge branch 'main' into approval_amt_editing

9a2e438

OGPoyraz requested changes May 30, 2025

View reviewed changes

jpuri and others added 7 commits May 30, 2025 13:31

Update app/components/Views/confirmations/hooks/7702/useBatchApproveB…

103d701

…alanceChanges.test.ts Co-authored-by: OGPoyraz <[email protected]>

Update app/components/Views/confirmations/hooks/7702/useBatchApproveB…

06b0ee6

…alanceChanges.test.ts Co-authored-by: OGPoyraz <[email protected]>

Update app/components/UI/SimulationDetails/EditRowValue/EditRowValue.…

9bf54df

…styles.ts Co-authored-by: OGPoyraz <[email protected]>

update

ca213b9

update

802178b

update

11192b6

update

b9c80be

jpuri requested a review from OGPoyraz May 30, 2025 10:38

jpuri added 3 commits May 30, 2025 16:16

update

58ffafd

update

137d330

update

f746caf

		// eslint-disable-next-line @typescript-eslint/no-explicit-any
		balance: '0x5' as any,

	// eslint-disable-next-line @typescript-eslint/no-explicit-any
	balance: '0x5' as any,
	balance: '0x5' as Hex,

Uh oh!

User to be able to edit approval amount in simulation section of batched confirmation #15572

Are you sure you want to change the base?

User to be able to edit approval amount in simulation section of batched confirmation #15572

Conversation

jpuri commented May 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Related issues

Manual testing steps

Screenshots/Recordings

Pre-merge author checklist

Pre-merge reviewer checklist

Uh oh!

github-actions bot commented May 23, 2025

Uh oh!

github-actions bot commented May 29, 2025 • edited by metamaskbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Bitrise

Uh oh!

digiwand left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented May 30, 2025

Quality Gate passed

Uh oh!

Uh oh!

jpuri commented May 23, 2025 •

edited

Loading

github-actions bot commented May 29, 2025 •

edited by metamaskbot

Loading