Fix an issue with missing base assets (#4284)

* Fix an issue with missing base assets

* Add test case for bug

src/services/Store/store/asset.slice.test.ts

@@ -118,4 +118,28 @@ describe('fetchAssetsWorker()', () => {
       .put(addAssetsFromAPI(expected))
       .silentRun();
   });
+
+  it('keeps base assets around', () => {
+    const a1 = fAssets[10];
+    const a2 = fAssets[11];
+    const a3 = fAssets[2];
+    const a4 = fAssets[0];
+    const state = [a1, a2, a3, a4];
+    const modifiedEntities = [{ ...a2, contractAddress: '0xchanged1' }];
+    const expected = [a1, a3, a4, modifiedEntities[0]];
+    const apiResult = arrayToObj('uuid')(modifiedEntities);
+    return expectSaga(fetchAssetsWorker)
+      .withState(
+        mockAppState({
+          assets: state,
+          accounts: fAccounts,
+          addressBook: fContacts,
+          networks: fNetworks
+        })
+      )
+      .provide([[call.fn(MyCryptoApiService.instance.getAssets), apiResult]])
+      .call(MyCryptoApiService.instance.getAssets)
+      .put(addAssetsFromAPI(expected))
+      .silentRun();
+  });
 });

src/services/Store/store/asset.slice.ts

@@ -101,7 +101,9 @@ export function* fetchAssetsWorker() {
   const currentAssets = arrayToObj('uuid')(
     lsAssets.filter(
       (a) =>
-        (a.isCustom ?? a.type === 'base') ||
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        a.isCustom ||
+        a.type === 'base' ||
         accountAssets.some((accAsset) => accAsset.uuid === a.uuid && accAsset.balance.gt(0))
     )
   );