Use selectedAddress as fallback for interacting address

MetaMask · Mar 28, 2023 · c38d0ec · c38d0ec
1 parent f781a16
commit c38d0ec
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/packages/assets-controllers/src/TokensController.ts b/packages/assets-controllers/src/TokensController.ts
@@ -80,6 +80,7 @@ export type SuggestedAssetMetaBase = {
  * @property time - Timestamp associated with this this suggested asset
  * @property type - Type type this suggested asset
  * @property asset - Asset suggested object
+ * @property interactingAddress - Account address that requested watch asset
  */
 export type SuggestedAssetMeta =
   | (SuggestedAssetMetaBase & {
@@ -629,16 +630,17 @@ export class TokensController extends BaseController<
     type: string,
     interactingAddress?: string,
   ): Promise<AssetSuggestionResult> {
+    const { selectedAddress } = this.config;
+
     const suggestedAssetMeta: SuggestedAssetMeta = {
       asset,
       id: this._generateRandomId(),
       status: SuggestedAssetStatus.pending as SuggestedAssetStatus.pending,
       time: Date.now(),
       type,
+      interactingAddress: interactingAddress || selectedAddress,
     };
-    if (interactingAddress) {
-      suggestedAssetMeta.interactingAddress = interactingAddress;
-    }
+
     try {
       switch (type) {
         case 'ERC20':