@metamask-previews/assets-controller 14.0.2-preview-f8cb83dcd → 14.0.2-preview-e68ab1498

package/dist/AssetsController.cjs

@@ -1337,10 +1337,11 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
         __classPrivateFieldSet(this, _AssetsController_uiOpen, isUiOpen, "f");
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateActive).call(this);
     }, client_controller_1.clientControllerSelectors.selectIsUiOpen);
-    this.messenger.subscribe('KeyringController:unlock', () => {
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    this.messenger.subscribe('KeyringController:unlock', async () => {
         __classPrivateFieldSet(this, _AssetsController_keyringUnlocked, true, "f");
-        __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_runSpamCleanup).call(this).catch((error) => {
-            log('Failed to run spam cleanup', { error });
+        await __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_runSpamCleanup).call(this).catch(() => {
+            /* Do nothing */
         });
         __classPrivateFieldGet(this, _AssetsController_instances, "m", _AssetsController_updateActive).call(this);
     });
@@ -1413,24 +1414,25 @@ _AssetsController_isEnabled = new WeakMap(), _AssetsController_isBasicFunctional
         log('Failed to refresh assets after transaction confirmed', { error });
     });
 }, _AssetsController_runSpamCleanup = async function _AssetsController_runSpamCleanup() {
-    if (!__classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this)) {
+    const shouldRun = __classPrivateFieldGet(this, _AssetsController_keyringUnlocked, "f") && __classPrivateFieldGet(this, _AssetsController_isBasicFunctionality, "f").call(this);
+    if (!shouldRun) {
         return;
     }
     try {
-        const nextState = await (0, healAssetsInfoMetadata_js_1.cleanSpamAssets)({
-            state: this.state,
+        const originalState = this.state;
+        const result = await (0, healAssetsInfoMetadata_js_1.cleanSpamAssets)({
+            state: originalState,
             apiClient: __classPrivateFieldGet(this, _AssetsController_queryApiClient, "f"),
             captureException: __classPrivateFieldGet(this, _AssetsController_captureException, "f"),
         });
-        if (nextState !== this.state) {
-            this.update((state) => {
-                return {
-                    ...state,
-                    assetsInfo: nextState.assetsInfo,
-                    assetsBalance: nextState.assetsBalance,
-                };
-            });
+        if (!result) {
+            return;
         }
+        this.update((state) => {
+            result.applyPatch(state, {
+                spamAssetIds: result.spamAssetIds,
+            });
+        });
     }
     catch (error) {
         log('Failed to run spam cleanup', { error });