diff --git a/packages/legacy/core/App/components/network/NetInfo.tsx b/packages/legacy/core/App/components/network/NetInfo.tsx
index f782316e1c..eb18b94d7a 100644
--- a/packages/legacy/core/App/components/network/NetInfo.tsx
+++ b/packages/legacy/core/App/components/network/NetInfo.tsx
@@ -1,38 +1,47 @@
 import * as React from 'react'
-import { useEffect } from 'react'
+import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Toast from 'react-native-toast-message'
 import { useNetwork } from '../../contexts/network'
+import { ToastType } from '../../components/toast/BaseToast'
 
 const NetInfo: React.FC = () => {
   const { silentAssertConnectedNetwork, assertNetworkReachable } = useNetwork()
   const { t } = useTranslation()
+  const [hasShown, setHasShown] = useState(false)
 
   const isConnected = silentAssertConnectedNetwork()
-
   useEffect(() => {
+    // Network is connected
     if (isConnected) {
+      // Assert that internet is available
       assertNetworkReachable().then((status) => {
+        // Connected to a network, reset toast
+        setHasShown(false)
         if (status) {
           return
         }
 
+        // User is connected to a network but has no internet, display toast
         Toast.show({
-          type: 'warn',
-          autoHide: false,
-          text1: t('NetInfo.NoInternetConnectionMessage'),
+          type: ToastType.Error,
+          autoHide: true,
+          text1: t('NetInfo.NoInternetConnectionTitle'),
         })
       })
-
       return
     }
 
-    Toast.show({
-      type: 'error',
-      autoHide: true,
-      text1: t('NetInfo.NoInternetConnectionTitle'),
-    })
-  }, [isConnected, assertNetworkReachable, t])
+    // Only show the toast if the user hasn't seen it already
+    if (!hasShown) {
+      setHasShown(true)
+      Toast.show({
+        type: ToastType.Error,
+        autoHide: true,
+        text1: t('NetInfo.NoInternetConnectionTitle'),
+      })
+    }
+  }, [isConnected, assertNetworkReachable, t, hasShown])
 
   return null
 }
diff --git a/packages/legacy/core/App/components/toast/BaseToast.tsx b/packages/legacy/core/App/components/toast/BaseToast.tsx
index b851b564fe..086b32a1c1 100644
--- a/packages/legacy/core/App/components/toast/BaseToast.tsx
+++ b/packages/legacy/core/App/components/toast/BaseToast.tsx
@@ -5,6 +5,7 @@ import Icon from 'react-native-vector-icons/MaterialIcons'
 import { useTheme } from '../../contexts/theme'
 import { GenericFn } from '../../types/fn'
 import { testIdWithKey } from '../../utils/testable'
+import Toast from 'react-native-toast-message'
 
 interface BaseToastProps {
   title?: string
@@ -96,14 +97,27 @@ const BaseToast: React.FC<BaseToastProps> = ({ title, body, toastType, onPress =
   return (
     <TouchableOpacity activeOpacity={1} onPress={() => onPress()}>
       <View style={[styles.container, { backgroundColor, borderColor, width: width - width * 0.1 }]}>
-        <Icon style={styles.icon} name={iconName} color={iconColor} size={iconSize} />
-        <View style={styles.textContainer}>
-          <Text style={[TextTheme.normal, styles.title, { color: textColor }]} testID={testIdWithKey('ToastTitle')}>
-            {title}
-          </Text>
-          <Text style={[TextTheme.normal, styles.body, { color: textColor }]} testID={testIdWithKey('ToastBody')}>
-            {body}
-          </Text>
+        <View style={{ flex: 1, flexDirection: 'row' }}>
+          <Icon style={styles.icon} name={iconName} color={iconColor} size={iconSize} />
+          <View style={styles.textContainer}>
+            <Text style={[TextTheme.normal, styles.title, { color: textColor }]} testID={testIdWithKey('ToastTitle')}>
+              {title}
+            </Text>
+            {body && (
+              <Text style={[TextTheme.normal, styles.body, { color: textColor }]} testID={testIdWithKey('ToastBody')}>
+                {body}
+              </Text>
+            )}
+          </View>
+        </View>
+        <View>
+          <TouchableOpacity
+            onPress={() => {
+              Toast.hide()
+            }}
+          >
+            <Icon style={styles.icon} name={'close'} color={iconColor} size={iconSize} />
+          </TouchableOpacity>
         </View>
       </View>
     </TouchableOpacity>
diff --git a/packages/legacy/core/__tests__/components/BaseToast.test.tsx b/packages/legacy/core/__tests__/components/BaseToast.test.tsx
index d8e3c59c0e..83ca6ca472 100644
--- a/packages/legacy/core/__tests__/components/BaseToast.test.tsx
+++ b/packages/legacy/core/__tests__/components/BaseToast.test.tsx
@@ -51,4 +51,10 @@ describe('BaseToast Component', () => {
 
     expect(tree).toMatchSnapshot()
   })
+
+  test('Toast Renders without body text', () => {
+    const tree = render(<BaseToast title={'Hello World'} toastType={ToastType.Error} />)
+    const bodyText = tree.queryByTestId('ToastBody')
+    expect(bodyText).toBeNull()
+  })
 })
diff --git a/packages/legacy/core/__tests__/components/__snapshots__/BaseToast.test.tsx.snap b/packages/legacy/core/__tests__/components/__snapshots__/BaseToast.test.tsx.snap
index e0e6a397f6..ef14ddf9e0 100644
--- a/packages/legacy/core/__tests__/components/__snapshots__/BaseToast.test.tsx.snap
+++ b/packages/legacy/core/__tests__/components/__snapshots__/BaseToast.test.tsx.snap
@@ -54,79 +54,149 @@ exports[`BaseToast Component Error renders correctly 1`] = `
       ]
     }
   >
-    <Text
-      allowFontScaling={false}
-      selectable={false}
-      style={
-        Array [
-          Object {
-            "color": "#D8292F",
-            "fontSize": 24,
-          },
-          Object {
-            "marginHorizontal": 15,
-            "marginTop": 15,
-          },
-          Object {
-            "fontFamily": "Material Icons",
-            "fontStyle": "normal",
-            "fontWeight": "normal",
-          },
-          Object {},
-        ]
-      }
-    >
-      
-    </Text>
     <View
       style={
         Object {
-          "flexShrink": 1,
-          "marginRight": 10,
-          "marginVertical": 15,
+          "flex": 1,
+          "flexDirection": "row",
         }
       }
     >
       <Text
+        allowFontScaling={false}
+        selectable={false}
         style={
           Array [
             Object {
-              "color": "#FFFFFF",
-              "fontSize": 18,
-              "fontWeight": "normal",
+              "color": "#D8292F",
+              "fontSize": 24,
             },
             Object {
-              "fontWeight": "bold",
+              "marginHorizontal": 15,
+              "marginTop": 15,
             },
             Object {
-              "color": "#FFFFFF",
+              "fontFamily": "Material Icons",
+              "fontStyle": "normal",
+              "fontWeight": "normal",
             },
+            Object {},
           ]
         }
-        testID="com.ariesbifold:id/ToastTitle"
       >
-        Hello World
+        
       </Text>
-      <Text
+      <View
         style={
-          Array [
-            Object {
-              "color": "#FFFFFF",
-              "fontSize": 18,
-              "fontWeight": "normal",
-            },
-            Object {
-              "marginTop": 10,
-            },
-            Object {
-              "color": "#FFFFFF",
-            },
-          ]
+          Object {
+            "flexShrink": 1,
+            "marginRight": 10,
+            "marginVertical": 15,
+          }
         }
-        testID="com.ariesbifold:id/ToastBody"
       >
-        The quick brown fox jumped over the lazy dog
-      </Text>
+        <Text
+          style={
+            Array [
+              Object {
+                "color": "#FFFFFF",
+                "fontSize": 18,
+                "fontWeight": "normal",
+              },
+              Object {
+                "fontWeight": "bold",
+              },
+              Object {
+                "color": "#FFFFFF",
+              },
+            ]
+          }
+          testID="com.ariesbifold:id/ToastTitle"
+        >
+          Hello World
+        </Text>
+        <Text
+          style={
+            Array [
+              Object {
+                "color": "#FFFFFF",
+                "fontSize": 18,
+                "fontWeight": "normal",
+              },
+              Object {
+                "marginTop": 10,
+              },
+              Object {
+                "color": "#FFFFFF",
+              },
+            ]
+          }
+          testID="com.ariesbifold:id/ToastBody"
+        >
+          The quick brown fox jumped over the lazy dog
+        </Text>
+      </View>
+    </View>
+    <View>
+      <View
+        accessibilityState={
+          Object {
+            "busy": undefined,
+            "checked": undefined,
+            "disabled": undefined,
+            "expanded": undefined,
+            "selected": undefined,
+          }
+        }
+        accessibilityValue={
+          Object {
+            "max": undefined,
+            "min": undefined,
+            "now": undefined,
+            "text": undefined,
+          }
+        }
+        accessible={true}
+        collapsable={false}
+        focusable={true}
+        onClick={[Function]}
+        onResponderGrant={[Function]}
+        onResponderMove={[Function]}
+        onResponderRelease={[Function]}
+        onResponderTerminate={[Function]}
+        onResponderTerminationRequest={[Function]}
+        onStartShouldSetResponder={[Function]}
+        style={
+          Object {
+            "opacity": 1,
+          }
+        }
+      >
+        <Text
+          allowFontScaling={false}
+          selectable={false}
+          style={
+            Array [
+              Object {
+                "color": "#D8292F",
+                "fontSize": 24,
+              },
+              Object {
+                "marginHorizontal": 15,
+                "marginTop": 15,
+              },
+              Object {
+                "fontFamily": "Material Icons",
+                "fontStyle": "normal",
+                "fontWeight": "normal",
+              },
+              Object {},
+            ]
+          }
+        >
+          
+        </Text>
+      </View>
     </View>
   </View>
 </View>
@@ -186,79 +256,149 @@ exports[`BaseToast Component Info renders correctly 1`] = `
       ]
     }
   >
-    <Text
-      allowFontScaling={false}
-      selectable={false}
-      style={
-        Array [
-          Object {
-            "color": "#0099FF",
-            "fontSize": 24,
-          },
-          Object {
-            "marginHorizontal": 15,
-            "marginTop": 15,
-          },
-          Object {
-            "fontFamily": "Material Icons",
-            "fontStyle": "normal",
-            "fontWeight": "normal",
-          },
-          Object {},
-        ]
-      }
-    >
-      
-    </Text>
     <View
       style={
         Object {
-          "flexShrink": 1,
-          "marginRight": 10,
-          "marginVertical": 15,
+          "flex": 1,
+          "flexDirection": "row",
         }
       }
     >
       <Text
+        allowFontScaling={false}
+        selectable={false}
         style={
           Array [
             Object {
-              "color": "#FFFFFF",
-              "fontSize": 18,
-              "fontWeight": "normal",
+              "color": "#0099FF",
+              "fontSize": 24,
             },
             Object {
-              "fontWeight": "bold",
+              "marginHorizontal": 15,
+              "marginTop": 15,
             },
             Object {
-              "color": "#FFFFFF",
+              "fontFamily": "Material Icons",
+              "fontStyle": "normal",
+              "fontWeight": "normal",
             },
+            Object {},
           ]
         }
-        testID="com.ariesbifold:id/ToastTitle"
       >
-        Hello World
+        
       </Text>
-      <Text
+      <View
         style={
-          Array [
-            Object {
-              "color": "#FFFFFF",
-              "fontSize": 18,
-              "fontWeight": "normal",
-            },
-            Object {
-              "marginTop": 10,
-            },
-            Object {
-              "color": "#FFFFFF",
-            },
-          ]
+          Object {
+            "flexShrink": 1,
+            "marginRight": 10,
+            "marginVertical": 15,
+          }
         }
-        testID="com.ariesbifold:id/ToastBody"
       >
-        The quick brown fox jumped over the lazy dog
-      </Text>
+        <Text
+          style={
+            Array [
+              Object {
+                "color": "#FFFFFF",
+                "fontSize": 18,
+                "fontWeight": "normal",
+              },
+              Object {
+                "fontWeight": "bold",
+              },
+              Object {
+                "color": "#FFFFFF",
+              },
+            ]
+          }
+          testID="com.ariesbifold:id/ToastTitle"
+        >
+          Hello World
+        </Text>
+        <Text
+          style={
+            Array [
+              Object {
+                "color": "#FFFFFF",
+                "fontSize": 18,
+                "fontWeight": "normal",
+              },
+              Object {
+                "marginTop": 10,
+              },
+              Object {
+                "color": "#FFFFFF",
+              },
+            ]
+          }
+          testID="com.ariesbifold:id/ToastBody"
+        >
+          The quick brown fox jumped over the lazy dog
+        </Text>
+      </View>
+    </View>
+    <View>
+      <View
+        accessibilityState={
+          Object {
+            "busy": undefined,
+            "checked": undefined,
+            "disabled": undefined,
+            "expanded": undefined,
+            "selected": undefined,
+          }
+        }
+        accessibilityValue={
+          Object {
+            "max": undefined,
+            "min": undefined,
+            "now": undefined,
+            "text": undefined,
+          }
+        }
+        accessible={true}
+        collapsable={false}
+        focusable={true}
+        onClick={[Function]}
+        onResponderGrant={[Function]}
+        onResponderMove={[Function]}
+        onResponderRelease={[Function]}
+        onResponderTerminate={[Function]}
+        onResponderTerminationRequest={[Function]}
+        onStartShouldSetResponder={[Function]}
+        style={
+          Object {
+            "opacity": 1,
+          }
+        }
+      >
+        <Text
+          allowFontScaling={false}
+          selectable={false}
+          style={
+            Array [
+              Object {
+                "color": "#0099FF",
+                "fontSize": 24,
+              },
+              Object {
+                "marginHorizontal": 15,
+                "marginTop": 15,
+              },
+              Object {
+                "fontFamily": "Material Icons",
+                "fontStyle": "normal",
+                "fontWeight": "normal",
+              },
+              Object {},
+            ]
+          }
+        >
+          
+        </Text>
+      </View>
     </View>
   </View>
 </View>
@@ -318,79 +458,149 @@ exports[`BaseToast Component Success renders correctly 1`] = `
       ]
     }
   >
-    <Text
-      allowFontScaling={false}
-      selectable={false}
-      style={
-        Array [
-          Object {
-            "color": "#2E8540",
-            "fontSize": 24,
-          },
-          Object {
-            "marginHorizontal": 15,
-            "marginTop": 15,
-          },
-          Object {
-            "fontFamily": "Material Icons",
-            "fontStyle": "normal",
-            "fontWeight": "normal",
-          },
-          Object {},
-        ]
-      }
-    >
-      
-    </Text>
     <View
       style={
         Object {
-          "flexShrink": 1,
-          "marginRight": 10,
-          "marginVertical": 15,
+          "flex": 1,
+          "flexDirection": "row",
         }
       }
     >
       <Text
+        allowFontScaling={false}
+        selectable={false}
         style={
           Array [
             Object {
-              "color": "#FFFFFF",
-              "fontSize": 18,
-              "fontWeight": "normal",
+              "color": "#2E8540",
+              "fontSize": 24,
             },
             Object {
-              "fontWeight": "bold",
+              "marginHorizontal": 15,
+              "marginTop": 15,
             },
             Object {
-              "color": "#FFFFFF",
+              "fontFamily": "Material Icons",
+              "fontStyle": "normal",
+              "fontWeight": "normal",
             },
+            Object {},
           ]
         }
-        testID="com.ariesbifold:id/ToastTitle"
       >
-        Hello World
+        
       </Text>
-      <Text
+      <View
         style={
-          Array [
-            Object {
-              "color": "#FFFFFF",
-              "fontSize": 18,
-              "fontWeight": "normal",
-            },
-            Object {
-              "marginTop": 10,
-            },
-            Object {
-              "color": "#FFFFFF",
-            },
-          ]
+          Object {
+            "flexShrink": 1,
+            "marginRight": 10,
+            "marginVertical": 15,
+          }
         }
-        testID="com.ariesbifold:id/ToastBody"
       >
-        The quick brown fox jumped over the lazy dog
-      </Text>
+        <Text
+          style={
+            Array [
+              Object {
+                "color": "#FFFFFF",
+                "fontSize": 18,
+                "fontWeight": "normal",
+              },
+              Object {
+                "fontWeight": "bold",
+              },
+              Object {
+                "color": "#FFFFFF",
+              },
+            ]
+          }
+          testID="com.ariesbifold:id/ToastTitle"
+        >
+          Hello World
+        </Text>
+        <Text
+          style={
+            Array [
+              Object {
+                "color": "#FFFFFF",
+                "fontSize": 18,
+                "fontWeight": "normal",
+              },
+              Object {
+                "marginTop": 10,
+              },
+              Object {
+                "color": "#FFFFFF",
+              },
+            ]
+          }
+          testID="com.ariesbifold:id/ToastBody"
+        >
+          The quick brown fox jumped over the lazy dog
+        </Text>
+      </View>
+    </View>
+    <View>
+      <View
+        accessibilityState={
+          Object {
+            "busy": undefined,
+            "checked": undefined,
+            "disabled": undefined,
+            "expanded": undefined,
+            "selected": undefined,
+          }
+        }
+        accessibilityValue={
+          Object {
+            "max": undefined,
+            "min": undefined,
+            "now": undefined,
+            "text": undefined,
+          }
+        }
+        accessible={true}
+        collapsable={false}
+        focusable={true}
+        onClick={[Function]}
+        onResponderGrant={[Function]}
+        onResponderMove={[Function]}
+        onResponderRelease={[Function]}
+        onResponderTerminate={[Function]}
+        onResponderTerminationRequest={[Function]}
+        onStartShouldSetResponder={[Function]}
+        style={
+          Object {
+            "opacity": 1,
+          }
+        }
+      >
+        <Text
+          allowFontScaling={false}
+          selectable={false}
+          style={
+            Array [
+              Object {
+                "color": "#2E8540",
+                "fontSize": 24,
+              },
+              Object {
+                "marginHorizontal": 15,
+                "marginTop": 15,
+              },
+              Object {
+                "fontFamily": "Material Icons",
+                "fontStyle": "normal",
+                "fontWeight": "normal",
+              },
+              Object {},
+            ]
+          }
+        >
+          
+        </Text>
+      </View>
     </View>
   </View>
 </View>
@@ -450,79 +660,149 @@ exports[`BaseToast Component Warn renders correctly 1`] = `
       ]
     }
   >
-    <Text
-      allowFontScaling={false}
-      selectable={false}
-      style={
-        Array [
-          Object {
-            "color": "#FCBA19",
-            "fontSize": 24,
-          },
-          Object {
-            "marginHorizontal": 15,
-            "marginTop": 15,
-          },
-          Object {
-            "fontFamily": "Material Icons",
-            "fontStyle": "normal",
-            "fontWeight": "normal",
-          },
-          Object {},
-        ]
-      }
-    >
-      
-    </Text>
     <View
       style={
         Object {
-          "flexShrink": 1,
-          "marginRight": 10,
-          "marginVertical": 15,
+          "flex": 1,
+          "flexDirection": "row",
         }
       }
     >
       <Text
+        allowFontScaling={false}
+        selectable={false}
         style={
           Array [
             Object {
-              "color": "#FFFFFF",
-              "fontSize": 18,
-              "fontWeight": "normal",
+              "color": "#FCBA19",
+              "fontSize": 24,
             },
             Object {
-              "fontWeight": "bold",
+              "marginHorizontal": 15,
+              "marginTop": 15,
             },
             Object {
-              "color": "#FFFFFF",
+              "fontFamily": "Material Icons",
+              "fontStyle": "normal",
+              "fontWeight": "normal",
             },
+            Object {},
           ]
         }
-        testID="com.ariesbifold:id/ToastTitle"
       >
-        Hello World
+        
       </Text>
-      <Text
+      <View
         style={
-          Array [
-            Object {
-              "color": "#FFFFFF",
-              "fontSize": 18,
-              "fontWeight": "normal",
-            },
-            Object {
-              "marginTop": 10,
-            },
-            Object {
-              "color": "#FFFFFF",
-            },
-          ]
+          Object {
+            "flexShrink": 1,
+            "marginRight": 10,
+            "marginVertical": 15,
+          }
         }
-        testID="com.ariesbifold:id/ToastBody"
       >
-        The quick brown fox jumped over the lazy dog
-      </Text>
+        <Text
+          style={
+            Array [
+              Object {
+                "color": "#FFFFFF",
+                "fontSize": 18,
+                "fontWeight": "normal",
+              },
+              Object {
+                "fontWeight": "bold",
+              },
+              Object {
+                "color": "#FFFFFF",
+              },
+            ]
+          }
+          testID="com.ariesbifold:id/ToastTitle"
+        >
+          Hello World
+        </Text>
+        <Text
+          style={
+            Array [
+              Object {
+                "color": "#FFFFFF",
+                "fontSize": 18,
+                "fontWeight": "normal",
+              },
+              Object {
+                "marginTop": 10,
+              },
+              Object {
+                "color": "#FFFFFF",
+              },
+            ]
+          }
+          testID="com.ariesbifold:id/ToastBody"
+        >
+          The quick brown fox jumped over the lazy dog
+        </Text>
+      </View>
+    </View>
+    <View>
+      <View
+        accessibilityState={
+          Object {
+            "busy": undefined,
+            "checked": undefined,
+            "disabled": undefined,
+            "expanded": undefined,
+            "selected": undefined,
+          }
+        }
+        accessibilityValue={
+          Object {
+            "max": undefined,
+            "min": undefined,
+            "now": undefined,
+            "text": undefined,
+          }
+        }
+        accessible={true}
+        collapsable={false}
+        focusable={true}
+        onClick={[Function]}
+        onResponderGrant={[Function]}
+        onResponderMove={[Function]}
+        onResponderRelease={[Function]}
+        onResponderTerminate={[Function]}
+        onResponderTerminationRequest={[Function]}
+        onStartShouldSetResponder={[Function]}
+        style={
+          Object {
+            "opacity": 1,
+          }
+        }
+      >
+        <Text
+          allowFontScaling={false}
+          selectable={false}
+          style={
+            Array [
+              Object {
+                "color": "#FCBA19",
+                "fontSize": 24,
+              },
+              Object {
+                "marginHorizontal": 15,
+                "marginTop": 15,
+              },
+              Object {
+                "fontFamily": "Material Icons",
+                "fontStyle": "normal",
+                "fontWeight": "normal",
+              },
+              Object {},
+            ]
+          }
+        >
+          
+        </Text>
+      </View>
     </View>
   </View>
 </View>