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

…938) * fix: apollo hook warning * chore: making toast on error local to apollo client * chore: better log message * chore: misc update storybook * chore: trying why did you render * chore: remove wdyr as part of this PR * chore: move error toast in a new file --------- Co-authored-by: Nicolas Burtey <nb@galoy.io>
GaloyMoney · Feb 15, 2023 · dbd7bb4 · dbd7bb4
1 parent 1cc4dee
commit dbd7bb4
Show file tree

Hide file tree

Showing 18 changed files with 61 additions and 292 deletions.
diff --git a/Makefile b/Makefile
@@ -8,3 +8,8 @@ test: unit check-code
 
 codegen:
 	yarn dev:codegen
+
+reset-ios:
+	yarn cache:clear
+	yarn install
+	yarn ios
diff --git a/__mocks__/node-libs-react-native/globals.js b/__mocks__/node-libs-react-native/globals.js
diff --git a/__mocks__/react-native-device-info.js b/__mocks__/react-native-device-info.js
diff --git a/__mocks__/react-native-firebase.js b/__mocks__/react-native-firebase.js
diff --git a/__mocks__/react-native-geetest-module.js b/__mocks__/react-native-geetest-module.js
diff --git a/__mocks__/react-native-iphone-x-helper.js b/__mocks__/react-native-iphone-x-helper.js
diff --git a/__mocks__/react-native-secure-key-store.js b/__mocks__/react-native-secure-key-store.js
diff --git a/__mocks__/react-navigation-native.js b/__mocks__/react-navigation-native.js
diff --git a/__mocks__/react-navigation-stack.js b/__mocks__/react-navigation-stack.js
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 { Dimensions } from "react-native"
 import ErrorBoundary from "react-native-error-boundary"
 import EStyleSheet from "react-native-extended-stylesheet"
 import { RootSiblingParent } from "react-native-root-siblings"
-import { GlobalErrorToast } from "./components/global-error"
 import { RootStack } from "./navigation/root-navigator"
 import { ErrorScreen } from "./screens/error-screen"
 import { ThemeProvider } from "@rneui/themed"
@@ -60,7 +59,6 @@ export const App = () => (
               <RootSiblingParent>
                 <AppStateWrapper />
                 <NotificationComponent />
-                <GlobalErrorToast />
                 <RootStack />
                 <GaloyToast />
               </RootSiblingParent>

diff --git a/app/components/global-error/index.ts b/app/components/global-error/index.ts
diff --git a/app/components/wallet-summary/wallet-summary.stories.tsx b/app/components/wallet-summary/wallet-summary.stories.tsx
@@ -3,27 +3,28 @@ import { storiesOf } from "@storybook/react-native"
 import { Story, StoryScreen, UseCase } from "../../../.storybook/views"
 import { WalletSummary } from "./wallet-summary"
 import { WalletType } from "@app/utils/enum"
+import { MockedProvider } from "@apollo/client/testing"
 
 declare let module
 
 storiesOf("Wallet Summary", module)
-  .addDecorator((fn) => <StoryScreen>{fn()}</StoryScreen>)
+  .addDecorator((fn) => <MockedProvider><StoryScreen>{fn()}</StoryScreen></MockedProvider>)
   .add("Style Presets", () => (
     <Story>
-      <UseCase text="BTC" usage="The default.">
-        <WalletSummary
-          amountType="SEND"
-          walletType={WalletType.BTC}
-          usdBalanceInDollars={129.2}
-          btcBalanceInSats={2000}
-        />
-      </UseCase>
-      <UseCase text="USD" usage="The default.">
-        <WalletSummary
-          amountType="SEND"
-          walletType={WalletType.USD}
-          usdBalanceInDollars={129.2}
-        />
-      </UseCase>
+        <UseCase text="BTC" usage="The default.">
+          <WalletSummary
+            amountType="SEND"
+            walletType={WalletType.BTC}
+            usdBalanceInDollars={129.2}
+            btcBalanceInSats={2000}
+          />
+        </UseCase>
+        <UseCase text="USD" usage="The default.">
+          <WalletSummary
+            amountType="SEND"
+            walletType={WalletType.USD}
+            usdBalanceInDollars={129.2}
+          />
+        </UseCase>
     </Story>
   ))