From d58151eb3a7941c00b9d2de8c46be8e124b0c593 Mon Sep 17 00:00:00 2001
From: Victor Creed <rytis.grincevicius+cv@gmail.com>
Date: Wed, 5 May 2021 09:58:19 +0300
Subject: [PATCH 1/2] fixes event histories

---
 src/app/hooks/useGetContractPastEvents.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/app/hooks/useGetContractPastEvents.ts b/src/app/hooks/useGetContractPastEvents.ts
index 13818aca0..e6754e62e 100644
--- a/src/app/hooks/useGetContractPastEvents.ts
+++ b/src/app/hooks/useGetContractPastEvents.ts
@@ -27,15 +27,15 @@ export function useGetContractPastEvents(
   const getEvents = useCallback(async () => {
     const fromBlock = getContract(contractName).blockNumber;
     const toBlock = 'latest';
-    return eventReader.getPastEvents(
-      contractName,
-      event,
-      { [filtersEventKeyMap[event]]: address, ...filters },
-      {
-        fromBlock,
-        toBlock,
-      },
-    );
+
+    if (filtersEventKeyMap.hasOwnProperty(event)) {
+      filters[filtersEventKeyMap[event]] = String(address).toLowerCase();
+    }
+
+    return eventReader.getPastEvents(contractName, event, filters, {
+      fromBlock,
+      toBlock,
+    });
   }, [address, contractName, event, filters]);
 
   useEffect(() => {

From 4daad0bd9c7f8f58e8047a144e544a1e63117f62 Mon Sep 17 00:00:00 2001
From: tiltom <tilnak.tomas@gmail.com>
Date: Thu, 6 May 2021 11:58:05 +0200
Subject: [PATCH 2/2] Clear site data when needed

---
 src/app/components/ServiceWorkerToaster/index.tsx | 5 ++++-
 src/utils/loadable.tsx                            | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/components/ServiceWorkerToaster/index.tsx b/src/app/components/ServiceWorkerToaster/index.tsx
index b77ab0146..23d78974f 100644
--- a/src/app/components/ServiceWorkerToaster/index.tsx
+++ b/src/app/components/ServiceWorkerToaster/index.tsx
@@ -34,7 +34,10 @@ export function ServiceWorkerToaster(props: Props) {
             onClick: () => {
               waitingWorker &&
                 waitingWorker.postMessage({ type: 'SKIP_WAITING' });
-              window.location.replace(window.location.href);
+
+              fetch(`/clear-site-data`).finally(() =>
+                window.location.replace(window.location.href),
+              );
             },
             text: t(translations.serviceWorkerToaster.button),
           },
diff --git a/src/utils/loadable.tsx b/src/utils/loadable.tsx
index f2c253a29..48ef91ba9 100644
--- a/src/utils/loadable.tsx
+++ b/src/utils/loadable.tsx
@@ -24,7 +24,10 @@ export const lazyLoad = <
             alert(
               "dApp failed to load, let's try again.\nIt may be an issue with an internet connection.",
             );
-            window.location.replace(window.location.href);
+
+            fetch(`/clear-site-data`).finally(() =>
+              window.location.replace(window.location.href),
+            );
           }
           return reason;
         });