Skip to content

Commit efadeb6

Browse files
committed
Ignore iconUrl received from AccountAPI
1 parent c1fbed6 commit efadeb6

15 files changed

Lines changed: 180 additions & 34 deletions

File tree

packages/gator-permissions-snap/snap.manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"url": "https://github.com/MetaMask/snap-7715-permissions.git"
88
},
99
"source": {
10-
"shasum": "/34MV/bSmmkU8WZn7MYT/QrKOxxwp2nbA0XTL+0CxUM=",
10+
"shasum": "XDcGZnYr0a6A4hetFQCedoaA2UtG7jT+EWFO/+MwiFY=",
1111
"location": {
1212
"npm": {
1313
"filePath": "dist/bundle.js",

packages/gator-permissions-snap/src/accountController/smartAccountController.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {
77
type MetaMaskSmartAccount,
88
} from '@metamask/delegation-toolkit';
99
import type { SnapsProvider } from '@metamask/snaps-sdk';
10-
import type { TokenMetadataClient } from 'src/core/types';
1110
import {
1211
createClient,
1312
custom,
@@ -18,6 +17,7 @@ import {
1817
import { privateKeyToAccount } from 'viem/accounts';
1918

2019
import type { AccountApiClient } from '../clients/accountApiClient';
20+
import type { TokenMetadataClient } from '../core/types';
2121
import type { SupportedChains } from './baseAccountController';
2222
import { BaseAccountController } from './baseAccountController';
2323
import type {

packages/gator-permissions-snap/src/permissions/nativeTokenPeriodic/context.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { parseEther, toHex } from 'viem';
33
import type { AccountController } from '../../accountController';
44
import { TimePeriod } from '../../core/types';
55
import type { TokenPricesService } from '../../services/tokenPricesService';
6-
import { IconUrls } from '../../ui/iconConstant';
76
import { formatUnitsFromString } from '../../utils/balance';
87
import {
98
convertReadableDateToTimestamp,
@@ -148,7 +147,6 @@ export async function buildContext({
148147
balance,
149148
balanceFormattedAsCurrency: balanceFormatted,
150149
symbol,
151-
iconUrl: IconUrls.ethereum.token,
152150
},
153151
permissionDetails: {
154152
periodAmount,

packages/gator-permissions-snap/src/permissions/nativeTokenPeriodic/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import type { PermissionDefinition } from 'src/core/types';
2-
1+
import type { PermissionDefinition } from '../../core/types';
32
import { appendCaveats } from './caveats';
43
import { createConfirmationContent } from './content';
54
import {

packages/gator-permissions-snap/src/permissions/nativeTokenPeriodic/types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ export type NativeTokenPeriodicContext = BaseContext & {
2929
balanceFormattedAsCurrency: string;
3030
balance: string;
3131
symbol: string;
32-
iconUrl: string;
3332
};
3433
permissionDetails: {
3534
periodAmount: string;

packages/gator-permissions-snap/src/permissions/nativeTokenStream/content.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { AccountDetails } from '../../ui/components/AccountDetails';
1515
import type { ItemDetails } from '../../ui/components/RequestDetails';
1616
import { RequestDetails } from '../../ui/components/RequestDetails';
1717
import { TooltipIcon } from '../../ui/components/TooltipIcon';
18+
import { IconUrls } from '../../ui/iconConstant';
1819
import {
1920
initialAmountRule,
2021
maxAmountRule,
@@ -70,7 +71,7 @@ export async function createConfirmationContent({
7071
{
7172
label: 'Token',
7273
text: context.accountDetails.symbol,
73-
iconUrl: context.accountDetails.iconUrl,
74+
iconUrl: IconUrls.ethereum.token,
7475
},
7576
];
7677

@@ -104,7 +105,7 @@ export async function createConfirmationContent({
104105
<Field>
105106
<Box>
106107
<Image
107-
src={context.accountDetails.iconUrl}
108+
src={IconUrls.ethereum.token}
108109
alt={`${context.accountDetails.symbol} token icon`}
109110
/>
110111
</Box>

packages/gator-permissions-snap/src/permissions/nativeTokenStream/context.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { formatEther, maxUint256, parseEther, toHex } from 'viem';
33
import type { AccountController } from '../../accountController';
44
import { TimePeriod } from '../../core/types';
55
import type { TokenPricesService } from '../../services/tokenPricesService';
6-
import { IconUrls } from '../../ui/iconConstant';
76
import { formatUnitsFromString } from '../../utils/balance';
87
import {
98
convertReadableDateToTimestamp,
@@ -168,7 +167,6 @@ export async function buildContext({
168167
balance,
169168
balanceFormattedAsCurrency: balanceFormatted,
170169
symbol,
171-
iconUrl: IconUrls.ethereum.token,
172170
},
173171
permissionDetails: {
174172
initialAmount,

packages/gator-permissions-snap/src/permissions/nativeTokenStream/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import type { PermissionDefinition } from 'src/core/types';
2-
1+
import type { PermissionDefinition } from '../../core/types';
32
import { appendCaveats } from './caveats';
43
import { createConfirmationContent } from './content';
54
import {

packages/gator-permissions-snap/src/permissions/nativeTokenStream/types.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export type NativeTokenStreamContext = BaseContext & {
3232
balanceFormattedAsCurrency: string;
3333
balance: string;
3434
symbol: string;
35-
iconUrl: string;
3635
};
3736
permissionDetails: {
3837
initialAmount: string | undefined;

packages/gator-permissions-snap/test/accountController/smartAccountController.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import {
44
createDelegation,
55
getDeleGatorEnvironment,
66
} from '@metamask/delegation-toolkit';
7-
import type { AccountApiClient } from 'src/clients/accountApiClient';
8-
import type { TokenMetadataClient } from 'src/core/types';
97
import { isHex, parseUnits, size } from 'viem';
108
import { sepolia, oneWorld, lineaSepolia } from 'viem/chains';
119

1210
import { SmartAccountController } from '../../src/accountController';
11+
import type { AccountApiClient } from '../../src/clients/accountApiClient';
12+
import type { TokenMetadataClient } from '../../src/core/types';
1313

1414
describe('SmartAccountController', () => {
1515
const entropy =

0 commit comments

Comments
 (0)