Merged in feature/IO-2733-pwa-timer (pull request #1719)

IO-2733 Resolve notification showing incorrect time.

.circleci/config.yml

@@ -315,9 +315,9 @@ jobs:
           command: |
             curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash
             hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
-            sleep 5
+            sleep 15
             hasura metadata apply --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
-            sleep 10
+            sleep 30
             hasura metadata reload --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
       - jira/notify:
           environment: Test (ImEX) - Hasura
@@ -427,7 +427,7 @@ workflows:
           secret: ${HASURA_PROD_SECRET}
           filters:
             branches:
-              only: master
+              only: master-AIO
       - rome-api-deploy:
           filters:
             branches:

client/src/components/update-alert/update-alert.component.jsx

@@ -64,7 +64,7 @@ export function UpdateAlert({ updateAvailable }) {
   }, [start, needRefresh, offlineReady]);
 
   useEffect(() => {
-    if (needRefresh && timeLeft < 60000) {
+    if (needRefresh && timerStarted && timeLeft < 60000) {
       notification.open({
         type: "warning",
         closable: false,