Remove if/else checks for Expo Go

timothymiller · Nov 2, 2023 · 73dfcea · 73dfcea · github-actions · Nov 2, 2023
1 parent 921e23e
commit 73dfcea
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 21 deletions.
diff --git a/packages/app/features/sign-in/screen.native.tsx b/packages/app/features/sign-in/screen.native.tsx
@@ -101,12 +101,9 @@ export const SignInScreen = (): React.ReactNode => {
       password: password,
     })
     if (error) {
-      const isExpoGo = Constants.appOwnership === 'expo'
-      if (!isExpoGo) {
-        toast.show('Sign in failed', {
-          description: error.message,
-        })
-      }
+      toast.show('Sign in failed', {
+        description: error.message,
+      })
       return
     }
 

diff --git a/packages/app/features/sign-in/screen.tsx b/packages/app/features/sign-in/screen.tsx
@@ -2,7 +2,6 @@ import { YStack, useToastController } from '@t4/ui'
 import { SignUpSignInComponent } from 'app/features/sign-in/SignUpSignIn'
 import { useRouter } from 'solito/router'
 import type { Provider } from '@supabase/supabase-js'
-import Constants from 'expo-constants'
 import { capitalizeWord } from 'app/utils/string'
 import { isExpoGo } from 'app/utils/flags'
 import { useSupabase } from 'app/utils/supabase/hooks/useSupabase'
@@ -42,12 +41,9 @@ export const SignInScreen = (): React.ReactNode => {
       password: password,
     })
     if (error) {
-      const isExpoGo = Constants.appOwnership === 'expo'
-      if (!isExpoGo) {
-        toast.show('Sign in failed', {
-          description: error.message,
-        })
-      }
+      toast.show('Sign in failed', {
+        description: error.message,
+      })
       return
     }
 

diff --git a/packages/ui/src/CustomToast.tsx b/packages/ui/src/CustomToast.tsx
@@ -1,12 +1,5 @@
-import Constants, { ExecutionEnvironment } from 'expo-constants'
 import { NativeToast as Toast } from './NativeToast'
 
-const isExpo = Constants.executionEnvironment === ExecutionEnvironment.StoreClient
-
 export const CustomToast = (): React.ReactNode => {
-  if (isExpo) {
-    return null
-  } else {
-    return <Toast />
-  }
+  return <Toast />
 }