[C-1006] Improve initial load, hotfix missing web worker (#1896)

AudiusProject · Sep 10, 2022 · f91506e · f91506e
1 parent edc8433
commit f91506e
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 32 deletions.
diff --git a/packages/mobile/src/screens/root-screen/RootScreen.tsx b/packages/mobile/src/screens/root-screen/RootScreen.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react'
 
-import { accountSelectors } from '@audius/common'
+import { accountSelectors, Status } from '@audius/common'
 import type { DrawerContentComponentProps } from '@react-navigation/drawer'
 import { createDrawerNavigator } from '@react-navigation/drawer'
 // eslint-disable-next-line import/no-unresolved
@@ -24,6 +24,10 @@ import { SignOnScreen } from 'app/screens/signon'
 import { UpdateRequiredScreen } from 'app/screens/update-required-screen/UpdateRequiredScreen'
 import { enterBackground, enterForeground } from 'app/store/lifecycle/actions'
 
+import { SplashScreen } from '../splash-screen'
+
+const { getHasAccount, getAccountStatus } = accountSelectors
+
 export type RootScreenParamList = {
   signOn: undefined
   App: NavigatorScreenParams<{
@@ -128,7 +132,8 @@ const NotificationsDrawerContents = (
  */
 export const RootScreen = () => {
   const dispatch = useDispatch()
-  const hasAccount = useSelector(accountSelectors.getHasAccount)
+  const hasAccount = useSelector(getHasAccount)
+  const accountStatus = useSelector(getAccountStatus)
   const [disableGestures, setDisableGestures] = useState(false)
   const { updateRequired } = useUpdateRequired()
 
@@ -139,33 +144,38 @@ export const RootScreen = () => {
 
   if (updateRequired) return <UpdateStack />
 
-  return hasAccount ? (
-    <Drawer.Navigator
-      // legacy implementation uses reanimated-v1
-      useLegacyImplementation={true}
-      detachInactiveScreens={false}
-      screenOptions={{
-        drawerType: 'slide',
-        headerShown: false,
-        drawerStyle: {
-          width: '100%'
-        },
-        swipeEdgeWidth: SCREEN_WIDTH,
-        gestureHandlerProps: {
-          enabled: !disableGestures
-        }
-      }}
-      drawerContent={(props) => (
-        <NotificationsDrawerContents
-          disableGestures={disableGestures}
-          setDisableGestures={setDisableGestures}
-          {...props}
-        />
-      )}
-    >
-      <Drawer.Screen name='App' component={MainStack} />
-    </Drawer.Navigator>
-  ) : (
-    <SignOnStack />
-  )
+  if (accountStatus === Status.LOADING) return <SplashScreen />
+
+  if (!hasAccount) return <SignOnStack />
+
+  if (hasAccount)
+    return (
+      <Drawer.Navigator
+        // legacy implementation uses reanimated-v1
+        useLegacyImplementation={true}
+        detachInactiveScreens={false}
+        screenOptions={{
+          drawerType: 'slide',
+          headerShown: false,
+          drawerStyle: {
+            width: '100%'
+          },
+          swipeEdgeWidth: SCREEN_WIDTH,
+          gestureHandlerProps: {
+            enabled: !disableGestures
+          }
+        }}
+        drawerContent={(props) => (
+          <NotificationsDrawerContents
+            disableGestures={disableGestures}
+            setDisableGestures={setDisableGestures}
+            {...props}
+          />
+        )}
+      >
+        <Drawer.Screen name='App' component={MainStack} />
+      </Drawer.Navigator>
+    )
+
+  return null
 }
diff --git a/packages/web/src/services/WebWorker.js b/packages/web/src/services/WebWorker.js
@@ -18,7 +18,9 @@ export default class WebWorker {
       code()
     `
     ])
-    this.worker = new Worker(URL.createObjectURL(blob))
+    if (typeof Worker !== 'undefined') {
+      this.worker = new Worker(URL.createObjectURL(blob))
+    }
     this.terminateOnResult = terminateOnResult
   }