[AIRMOB-291] Fix Watchlist items disappear

src/contexts/AllAddresses/AllAddresses.context.tsx

@@ -8,6 +8,7 @@ import { createContextSelector } from '@helpers/createContextSelector';
 import { NotificationService } from '@lib';
 import { DeviceEventEmitter } from 'react-native';
 import { EVENTS } from '@constants/events';
+import { ArrayUtils } from '@utils/array';
 
 const AllAddressesContext = () => {
   const [allAddresses, setAllAddresses] = useState<ExplorerAccount[]>([]);
@@ -128,7 +129,10 @@ const AllAddressesContext = () => {
     setLoading(true);
     const addresses = ((await Cache.getItem(CacheKey.AllAddresses)) ||
       []) as CacheableAccount[];
-    const populatedAddresses = await populateAddresses(addresses);
+    const currentAddresses = allAddresses.map(ExplorerAccount.toCacheable);
+    const populatedAddresses = await populateAddresses(
+      ArrayUtils.mergeArrays('address', addresses, currentAddresses)
+    );
     setAllAddresses(populatedAddresses);
     reducer({ type: 'set', payload: populatedAddresses });
     setLoading(false);

src/hooks/useCachePurifier.ts

@@ -22,11 +22,12 @@ export const useCachePurifier = () => {
     );
     await Cache.setItem(CacheKey.AddressLists, cacheableLists);
 
-    // filter unique addresses
+    // watchlisted accounts
     const knownAddresses: CacheableAccount[] = allAddresses
       .filter((account) => account.isOnWatchlist)
       .map((account) => ExplorerAccount.toCacheable(account));
 
+    // add accounts from groups
     for (const list of listsOfAddressGroup) {
       for (const account of list.accounts) {
         if (knownAddresses.indexOfItem(account, 'address') === -1) {

src/utils/array.ts

@@ -0,0 +1,12 @@
+function mergeArrays<T>(compareKey: keyof T, ...arrays: T[][]) {
+  const result: T[] = [];
+  for (let i = 0; i < arrays.length; i++) {
+    const curArray = arrays[i];
+    result.push(
+      ...curArray.filter((item) => result.indexOfItem(item, compareKey) === -1)
+    );
+  }
+  return result;
+}
+
+export const ArrayUtils = { mergeArrays };