chore: merging global error toast with client lib + some refactoring

GaloyMoney · Jan 23, 2023 · bb526b2 · bb526b2
1 parent 6ef2942
commit bb526b2
Show file tree

Hide file tree

Showing 14 changed files with 185 additions and 338 deletions.
diff --git a/__tests__/screens/global-error.spec.tsx b/__tests__/screens/global-error.spec.tsx
diff --git a/app/app.tsx b/app/app.tsx
@@ -18,7 +18,6 @@ import { useMemo, useRef, useState } from "react"
 import { Dimensions, Linking } from "react-native"
 import EStyleSheet from "react-native-extended-stylesheet"
 import { RootSiblingParent } from "react-native-root-siblings"
-import { GlobalErrorToast } from "./components/global-error"
 import "./utils/polyfill"
 import { RootStack } from "./navigation/root-navigator"
 import ErrorBoundary from "react-native-error-boundary"
@@ -128,10 +127,10 @@ export const App = (): JSX.Element => {
   return (
     <AuthenticationContext.Provider value={{ isAppLocked, setAppUnlocked, setAppLocked }}>
       <ThemeProvider theme={theme}>
-        <GaloyClient>
-          <TypesafeI18n locale={customLocaleDetector()}>
-            <LocalizationContextProvider>
-              <ErrorBoundary FallbackComponent={ErrorScreen}>
+        <TypesafeI18n locale={customLocaleDetector()}>
+          <GaloyClient>
+            <ErrorBoundary FallbackComponent={ErrorScreen}>
+              <LocalizationContextProvider>
                 <NavigationContainer
                   linking={linking}
                   onStateChange={(state) => {
@@ -149,15 +148,14 @@ export const App = (): JSX.Element => {
                   }}
                 >
                   <RootSiblingParent>
-                    <GlobalErrorToast />
                     <RootStack />
                     <GaloyToast />
                   </RootSiblingParent>
                 </NavigationContainer>
-              </ErrorBoundary>
-            </LocalizationContextProvider>
-          </TypesafeI18n>
-        </GaloyClient>
+              </LocalizationContextProvider>
+            </ErrorBoundary>
+          </GaloyClient>
+        </TypesafeI18n>
       </ThemeProvider>
     </AuthenticationContext.Provider>
   )

diff --git a/app/components/global-error/global-error.tsx b/app/components/global-error/global-error.tsx
diff --git a/app/components/global-error/index.ts b/app/components/global-error/index.ts
diff --git a/app/graphql/cache.ts b/app/graphql/cache.ts
@@ -49,6 +49,9 @@ export const createCache = () =>
         // https://www.apollographql.com/docs/react/caching/cache-configuration/#customizing-cache-ids
         keyFields: [],
       },
+      Globals: {
+        keyFields: [],
+      },
       Contact: {
         fields: {
           prettyName: {