rebasing and updating the branch

MetaMask · Jul 19, 2024 · 88e900b · 88e900b
1 parent c938440
commit 88e900b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 154 deletions.
diff --git a/app/scripts/lib/rpc-method-middleware/handlers/handlers-helper.ts b/app/scripts/lib/rpc-method-middleware/handlers/handlers-helper.ts
diff --git a/app/scripts/lib/rpc-method-middleware/handlers/send-metadata.ts b/app/scripts/lib/rpc-method-middleware/handlers/send-metadata.ts
@@ -1,21 +1,35 @@
 import { ethErrors } from 'eth-rpc-errors';
 import {
+  JsonRpcEngineEndCallback,
+  JsonRpcEngineNextCallback,
+} from 'json-rpc-engine';
+import {
+  Json,
   JsonRpcParams,
   JsonRpcRequest,
   PendingJsonRpcResponse,
 } from '@metamask/utils';
 import {
-  JsonRpcEngineEndCallback,
-  JsonRpcEngineNextCallback,
-} from '@metamask/json-rpc-engine';
-import { SubjectType } from '@metamask/permission-controller';
+  PermissionSubjectMetadata,
+  SubjectType,
+} from '@metamask/permission-controller';
 import { MESSAGE_TYPE } from '../../../../../shared/constants/app';
-import { AddSubjectMetadata, HandlerWrapper } from './handlers-helper';
+import { HandlerWrapper } from './types';
+
+type SubjectMetadataToAdd = PermissionSubjectMetadata & {
+  name?: string | null;
+  subjectType?: SubjectType | null;
+  extensionId?: string | null;
+  iconUrl?: string | null;
+} & Record<string, Json>;
+
+type AddSubjectMetadata = (metadata: SubjectMetadataToAdd) => void;
 
 type SendMetadataOptions = {
   addSubjectMetadata: AddSubjectMetadata;
   subjectType: SubjectType;
 };
+
 type SendMetadataConstraint<Params extends JsonRpcParams = JsonRpcParams> = {
   implementation: (
     req: JsonRpcRequest<Params>,