Skip to content

Feat/trigger gator permissions revoke transaction #34373

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

Merged
V00D00-child merged 10 commits into from
Aug 14, 2025
Merged

Feat/trigger gator permissions revoke transaction #34373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f3c997e
Add useRevokeGatorPermissions to trigger transactions to revoke gator…
V00D00-child Jul 17, 2025
1acdd06
Encode calldata to the DelegationManager contract disableDelegation f…
V00D00-child Jul 21, 2025
e43f5ca
Add test coverage for revokeGatorPermission function
V00D00-child Jul 23, 2025
3791b08
Use 7702 batch transaction to batch revoke gator permissions
V00D00-child Jul 24, 2025
2b5004c
Merge branch 'feat/gator-permissions-revoke-ui' of github.com:MetaMas…
V00D00-child Jul 25, 2025
1199e77
Make sure internal account matches the delegator in the delegation to…
V00D00-child Jul 28, 2025
1d8aa84
Remove batch revoke
V00D00-child Jul 29, 2025
84e359f
Process each revoke gator permission as sequential transactions
V00D00-child Jul 30, 2025
b614843
Reduce duplication of logic
V00D00-child Aug 12, 2025
0bd705c
Remove temporary button to revoke all token streams
V00D00-child Aug 12, 2025
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
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@
"@metamask/contract-metadata": "^2.5.0",
"@metamask/controller-utils": "^11.9.0",
"@metamask/delegation-controller": "^0.4.0",
"@metamask/delegation-core": "0.1.0",
"@metamask/delegation-deployments": "^0.11.0",
"@metamask/design-tokens": "^7.1.0",
"@metamask/ens-controller": "^15.0.2",
Expand Down
29 changes: 11 additions & 18 deletions ...onents/multichain/pages/gator-permissions-page/token-streams/review-token-streams-page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { getNetworkConfigurationsByChainId } from '../../../../../../shared/modu
import { getGatorPermissionByPermissionTypeAndChainId } from '../../../../../selectors/gator-permissions/gator-permissions';
import { extractNetworkName } from '../gator-permissions-page-helper';
import { ReviewGatorAssetItem } from '../components';
import { useRevokeGatorPermissions } from '../../../../../hooks/gator-permissions/useRevokeGatorPermissions';

export const ReviewTokenStreamsPage = () => {
const t = useI18nContext();
Expand All @@ -35,6 +36,10 @@ export const ReviewTokenStreamsPage = () => {
const [networkName, setNetworkName] = useState('');
const [totalTokenStreams, setTotalTokenStreams] = useState(0);

const { revokeGatorPermission } = useRevokeGatorPermissions({
chainId,
});

const networks = useSelector(getNetworkConfigurationsByChainId);
const nativeTokenStreams = useSelector((state) =>
getGatorPermissionByPermissionTypeAndChainId(
Expand All @@ -56,17 +61,11 @@ export const ReviewTokenStreamsPage = () => {
setTotalTokenStreams(nativeTokenStreams.length + erc20TokenStreams.length);
}, [chainId, nativeTokenStreams, erc20TokenStreams, networks]);

const handleNativeTokenStreamRevokeClick = (nativeTokenStream) => {
// TODO: Implement revoke logic
console.log('nativeTokenStream to revoke:', nativeTokenStream);
};

const handleErc20TokenStreamRevokeClick = (erc20TokenStream) => {
// TODO: Implement revoke logic
console.log('erc20TokenStream to revoke:', erc20TokenStream);
const handleRevokeClick = async (stream) => {
await revokeGatorPermission(stream);

@cursor cursor Bot Aug 12, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Async Function Error Handling Missing

The async handleRevokeClick function in ReviewTokenSubscriptionsPage and ReviewTokenStreamsPage lacks error handling. When revokeGatorPermission is called, any errors (e.g., from validation or transaction failures) result in unhandled promise rejections. This can lead to UI crashes, an inconsistent state, or silent failures without user feedback on failed revoke operations.

Additional Locations (1)
Fix in Cursor Fix in Web

};

const renderTokenStreams = (streams, clickHandler) =>
const renderTokenStreams = (streams) =>
streams.map((stream) => {
const { permissionResponse, siteOrigin } = stream;
const fullNetworkName = extractNetworkName(
Expand All @@ -82,7 +81,7 @@ export const ReviewTokenStreamsPage = () => {
networkName={fullNetworkName}
permissionType={permissionResponse.permission.type}
siteOrigin={siteOrigin}
onRevokeClick={() => clickHandler(stream)}
onRevokeClick={() => handleRevokeClick(stream)}
/>
);
});
Expand Down Expand Up @@ -114,14 +113,8 @@ export const ReviewTokenStreamsPage = () => {
<Box ref={headerRef}></Box>
{totalTokenStreams > 0 ? (
<>
{renderTokenStreams(
nativeTokenStreams,
handleNativeTokenStreamRevokeClick,
)}
{renderTokenStreams(
erc20TokenStreams,
handleErc20TokenStreamRevokeClick,
)}
{renderTokenStreams(nativeTokenStreams)}
{renderTokenStreams(erc20TokenStreams)}
</>
) : (
<Box
Expand Down
34 changes: 28 additions & 6 deletions ...chain/pages/gator-permissions-page/token-subscriptions/review-token-subscriptions-page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { getNetworkConfigurationsByChainId } from '../../../../../../shared/modu
import { getGatorPermissionByPermissionTypeAndChainId } from '../../../../../selectors/gator-permissions/gator-permissions';
import { extractNetworkName } from '../gator-permissions-page-helper';
import { ReviewGatorAssetItem } from '../components';
import { useRevokeGatorPermissions } from '../../../../../hooks/gator-permissions/useRevokeGatorPermissions';

export const ReviewTokenSubscriptionsPage = () => {
const t = useI18nContext();
Expand All @@ -43,15 +44,33 @@ export const ReviewTokenSubscriptionsPage = () => {
chainId,
),
);
const erc20TokenPeriodicPermissions = useSelector((state) =>
getGatorPermissionByPermissionTypeAndChainId(
state,
'erc20-token-periodic',
chainId,
),
);

const { revokeGatorPermission } = useRevokeGatorPermissions({
chainId,
});

useEffect(() => {
setNetworkName(extractNetworkName(networks, chainId));
setTotalTokenSubscriptions(nativeTokenPeriodicPermissions.length);
}, [chainId, nativeTokenPeriodicPermissions, networks]);
const totalSubscriptionsCount =
nativeTokenPeriodicPermissions.length +
erc20TokenPeriodicPermissions.length;
setTotalTokenSubscriptions(totalSubscriptionsCount);
}, [
chainId,
nativeTokenPeriodicPermissions,
erc20TokenPeriodicPermissions,
networks,
]);

const handleRevokeClick = (subscription) => {
// TODO: Implement revoke logic
console.log('subscription to revoke:', subscription);
const handleRevokeClick = async (stream) => {
await revokeGatorPermission(stream);
};

const renderTokenSubscriptions = (subscriptions) =>
Expand Down Expand Up @@ -103,7 +122,10 @@ export const ReviewTokenSubscriptionsPage = () => {
<Content padding={0}>
<Box ref={headerRef}></Box>
{totalTokenSubscriptions > 0 ? (
renderTokenSubscriptions(nativeTokenPeriodicPermissions)
<>
{renderTokenSubscriptions(nativeTokenPeriodicPermissions)}
{renderTokenSubscriptions(erc20TokenPeriodicPermissions)}
</>
) : (
<Box
data-testid="no-connections"
Expand Down
Loading
Loading