Merge pull request #265 from badger-cash/upgrade-navigation

Major Upgrade (react native & bcash)
badger-cash · Aug 2, 2021 · 0ee30df · 0ee30df
2 parents cf0d625 + d847094
commit 0ee30df
Show file tree

Hide file tree

Showing 43 changed files with 2,684 additions and 5,946 deletions.
diff --git a/App.tsx b/App.tsx
@@ -1,15 +1,43 @@
 import React from "react";
 
+import { NavigationContainer } from "@react-navigation/native";
+import { createStackNavigator } from "@react-navigation/stack";
+
 import styled, { ThemeProvider } from "styled-components";
 import { Provider } from "react-redux";
-import { View } from "react-native";
+import { View, LogBox } from "react-native";
+LogBox.ignoreLogs(["Require cycle"]);
 import { PersistGate } from "redux-persist/integration/react";
 
 import AppNavigator from "./navigation/AppNavigator";
 import { getStore } from "./data/store";
 import { spaceBadger } from "./themes/spaceBadger";
+import { StackFrame } from "react-native/Libraries/Core/Devtools/parseErrorStack";
+import MainAppStack from "./navigation/MainTabNavigator";
+import AuthLoadingScreen from "./navigation/AuthLoadingScreen";
+// import AuthStack from "./navigation/AuthStack";
+// Auth Screens
+import WelcomeScreen from "./screens/WelcomeScreen";
+import TermsOfUseScreen from "./screens/TermsOfUseScreen";
+import PrivacyNoticeScreen from "./screens/PrivacyNoticeScreen";
+import CreateWalletScreen from "./screens/CreateWalletScreen";
+
+import RestoreWalletScreen from "./screens/RestoreWalletScreen";
 
 const { store, persistor } = getStore();
+const Stack = createStackNavigator();
+
+const AuthStack = () => {
+  return (
+    <Stack.Navigator screenOptions={{ headerShown: false }}>
+      <Stack.Screen name="Welcome" component={WelcomeScreen} />
+      <Stack.Screen name="AcceptTermsOfUse" component={TermsOfUseScreen} />
+      <Stack.Screen name="PrivacyNotice" component={PrivacyNoticeScreen} />
+      <Stack.Screen name="CreateWallet" component={CreateWalletScreen} />
+      <Stack.Screen name="RestoreFromBackup" component={RestoreWalletScreen} />
+    </Stack.Navigator>
+  );
+};
 
 const AppWrapper = styled(View)`
   flex: 1;
@@ -20,15 +48,25 @@ const slpPrefix = "simpleledger";
 
 const App = () => {
   return (
-    <Provider store={store}>
-      <PersistGate loading={null} persistor={persistor}>
-        <ThemeProvider theme={spaceBadger}>
-          <AppWrapper>
-            <AppNavigator uriPrefix={bchPrefix || slpPrefix} />
-          </AppWrapper>
-        </ThemeProvider>
-      </PersistGate>
-    </Provider>
+    <NavigationContainer>
+      <Provider store={store}>
+        <PersistGate loading={null} persistor={persistor}>
+          <ThemeProvider theme={spaceBadger}>
+            <AppWrapper>
+              {/* <AppNavigator /> */}
+              <Stack.Navigator screenOptions={{ headerShown: false }}>
+                <Stack.Screen
+                  name="AuthLoadingCheck"
+                  component={AuthLoadingScreen}
+                />
+                <Stack.Screen name="AuthStack" component={AuthStack} />
+                <Stack.Screen name="Main" component={MainAppStack} />
+              </Stack.Navigator>
+            </AppWrapper>
+          </ThemeProvider>
+        </PersistGate>
+      </Provider>
+    </NavigationContainer>
   );
 };
 

diff --git a/README.md b/README.md
@@ -27,8 +27,7 @@ Badger Mobile Wallet is a Bitcoin Cash (BCH) and Simple Ledger Protocol (SLP) wa
   - redux
   - react-navigation
   - styled-components
-- bitbox-sdk
-- slp-sdk
+- bcash (Bitcoin Cash version of bcoin)
 - prettier
 - yarn
 - TypeScript

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -137,8 +137,8 @@ android {
         applicationId "com.badgermobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 9000024
-        versionName "1.13.1"
+        versionCode 9000028
+        versionName "1.13.5"
         missingDimensionStrategy 'react-native-camera', 'general'
     }
     splits {

diff --git a/api/api.bitcoin.com.ts b/api/api.bitcoin.com.ts
@@ -0,0 +1,32 @@
+// import axios, { AxiosResponse } from "axios"
+
+// export class Price {
+//   public async current(currency: string = "usd"): Promise<number> {
+//     try {
+//       const response: AxiosResponse = await axios.get(
+//         `https://index-api.bitcoin.com/api/v0/cash/price/${currency.toLowerCase()}`
+//       )
+//       return response.data.price
+//     } catch (error) {
+//       if (error.response && error.response.data) throw error.response.data
+//       else throw error
+//     }
+//   }
+// }
+
+const API = `https://index-api.bitcoin.com/api`;
+
+const priceEndpoint = `${API}/v0/cash/price/`;
+
+const getPrice = async (currency: string = "usd"): Promise<number> => {
+  try {
+    const req = await fetch(`${priceEndpoint}${currency.toLowerCase()}`);
+    const resp = await req.json();
+    return resp.price;
+  } catch (e) {
+    console.warn(e);
+    throw e;
+  }
+};
+
+export { priceEndpoint, getPrice };