chore: err handling, modal fix

GaloyMoney · Dec 5, 2023 · 7799b2e · 7799b2e
1 parent bc5d850
commit 7799b2e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/app/components/custom-modal/custom-modal.tsx b/app/components/custom-modal/custom-modal.tsx
@@ -66,8 +66,8 @@ const CustomModal: React.FC<CustomModalProps> = ({
   return (
     <Modal
       isVisible={isVisible}
-      backdropOpacity={0.7}
-      backdropColor={colors.grey3}
+      backdropOpacity={0.8}
+      backdropColor={colors.white}
       backdropTransitionOutTiming={0}
       avoidKeyboard={true}
     >
@@ -128,7 +128,7 @@ type UseStylesProps = {
 
 const useStyles = makeStyles(({ colors }, props: UseStylesProps) => ({
   container: {
-    backgroundColor: colors.white,
+    backgroundColor: colors.grey5,
     maxHeight: "95%",
     minHeight: props.minHeight || "auto",
     borderRadius: 16,

diff --git a/app/screens/webview/webview.tsx b/app/screens/webview/webview.tsx
@@ -18,7 +18,8 @@ type Props = {
 export const WebViewScreen: React.FC<Props> = ({ route }) => {
   const styles = useStyles()
 
-  const { navigate } = useNavigation<StackNavigationProp<RootStackParamList, "Primary">>()
+  const { navigate, goBack } =
+    useNavigation<StackNavigationProp<RootStackParamList, "Primary">>()
   const { url, initialTitle, injectedJavaScript, overrideBackToNavigationBack } =
     route.params
   const { LL } = useI18nContext()
@@ -72,6 +73,12 @@ export const WebViewScreen: React.FC<Props> = ({ route }) => {
           }
         }}
         onNavigationStateChange={handleWebViewNavigationStateChange}
+        onError={(e) => {
+          if (e.nativeEvent.description === "net::ERR_INTERNET_DISCONNECTED") {
+            Alert.alert("We need internet for Point of Sale to work")
+            goBack()
+          }
+        }}
         onMessage={onMessageHandler(webview as React.MutableRefObject<WebView>, {
           enable: async () => {
             /* Your implementation goes here */