Last Refactor

RoboSats · Sep 25, 2022 · 85b0882 · 85b0882
1 parent e54132a
commit 85b0882
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 25 deletions.
diff --git a/frontend/src/components/App.js b/frontend/src/components/App.js
@@ -122,7 +122,7 @@ export default class App extends Component {
             >
               <SchoolIcon />
             </IconButton>
-            {/* <UnsafeAlert className='unsafeAlert' /> */}
+            <UnsafeAlert className='unsafeAlert' />
             <HomePage {...this.state} />
           </ThemeProvider>
         </I18nextProvider>

diff --git a/frontend/src/components/BottomBar.js b/frontend/src/components/BottomBar.js
@@ -171,10 +171,12 @@ class BottomBar extends Component {
 
   showProfileButton = () => {
     return (
-      this.props.avatarLoaded
-      // FIXME: Cookies not available on local dev
-      // (this.props.token ? getCookie('robot_token') == this.props.token : true) &&
-      // getCookie('sessionid')
+      this.props.avatarLoaded && (
+        window.NativeRobosats || (
+          (this.props.token ? getCookie('robot_token') === this.props.token : true) &&
+          getCookie('sessionid')
+        )
+      )
     );
   };
 

diff --git a/frontend/src/components/UserGenPage.js b/frontend/src/components/UserGenPage.js
@@ -100,7 +100,7 @@ class UserGenPage extends Component {
             : this.props.setAppState({
                 nickname: data.nickname,
                 token,
-                avatarLoaded: true,
+                avatarLoaded: false,
                 activeOrderId: data.active_order_id ? data.active_order_id : null,
                 lastOrderId: data.last_order_id ? data.last_order_id : null,
                 referralCode: data.referral_code,
@@ -290,10 +290,10 @@ class UserGenPage extends Component {
                             <IconButton
                               color='primary'
                               disabled={
-                                // FIXME: Cookies not available on local dev
-                                // https://github.com/react-native-webview/react-native-webview/issues/2643
-                                // !(getCookie('robot_token') == this.state.token) ||
-                                !this.props.avatarLoaded
+                                !this.props.avatarLoaded || (
+                                  !window.NativeRobosats && 
+                                  !(getCookie('robot_token') === this.state.token)
+                                )
                               }
                               onClick={() =>
                                 saveAsJson(this.state.nickname + '.json', this.createJsonFile())
@@ -311,10 +311,10 @@ class UserGenPage extends Component {
                           <IconButton
                             color={this.props.copiedToken ? 'inherit' : 'primary'}
                             disabled={
-                              // FIXME: Cookies not available on local dev
-                              // https://github.com/react-native-webview/react-native-webview/issues/2643
-                              // !(getCookie('robot_token') == this.state.token) ||
-                              !this.props.avatarLoaded
+                              !this.props.avatarLoaded || (
+                                !window.NativeRobosats && 
+                                !(getCookie('robot_token') === this.state.token)
+                              )
                             }
                             onClick={() =>
                               copyToClipboard(getCookie('robot_token')) &
@@ -369,10 +369,10 @@ class UserGenPage extends Component {
           <ButtonGroup variant='contained' aria-label='outlined primary button group'>
             <Button
               disabled={
-                this.state.loadingRobot !== false
-                // FIXME: Cookies not available on local dev
-                // https://github.com/react-native-webview/react-native-webview/issues/2643
-                // !(this.props.token ? getCookie('robot_token') == this.props.token : true)
+                this.state.loadingRobot !== false || (
+                  !window.NativeRobosats &&
+                  !(this.props.token ? getCookie('robot_token') === this.props.token : true)
+                )
               }
               color='primary'
               to='/make/'
@@ -390,10 +390,10 @@ class UserGenPage extends Component {
             />
             <Button
               disabled={
-                this.state.loadingRobot !== false
-                // FIXME: Cookies not available on local dev
-                // https://github.com/react-native-webview/react-native-webview/issues/2643
-                // !(this.props.token ? getCookie('robot_token') == this.props.token : true)
+                this.state.loadingRobot !== false || (
+                  !window.NativeRobosats &&
+                  !(this.props.token ? getCookie('robot_token') === this.props.token : true)
+                )
               }
               color='secondary'
               to='/book/'

diff --git a/frontend/src/services/api/ApiNativeClient/index.ts b/frontend/src/services/api/ApiNativeClient/index.ts
@@ -7,7 +7,7 @@ class ApiNativeClient implements ApiClient {
     window.NativeRobosats = new NativeRobosats()
   }
 
-  private assetsCache : {[path:string]: string} = []
+  private assetsCache : {[path:string]: string} = {}
 
   private readonly getHeaders: () => HeadersInit = () => {
     return { 'Content-Type': 'application/json', 'X-CSRFToken': getCookie('csrftoken') || '' };

diff --git a/mobile/App.tsx b/mobile/App.tsx
@@ -8,7 +8,6 @@ const App = () => {
   var uri =
     (Platform.OS === 'android' ? 'file:///android_asset/' : '') +
     'Web.bundle/index.html';
-  // const uri = 'https://robosats.onion.moe';
 
   const injectMessage = (id: string, data: object) => {
     const json = JSON.stringify(data);
@@ -70,6 +69,7 @@ const App = () => {
         mediaPlaybackRequiresUserAction={false}
         allowsLinkPreview={false}
         renderLoading={() => <Text>Loading RoboSats</Text>}
+        onError={syntheticEvent => <Text>{syntheticEvent.type}</Text>}
       />
     </SafeAreaView>
   );

diff --git a/mobile/services/Tor/index.ts b/mobile/services/Tor/index.ts
@@ -9,7 +9,6 @@ class TorClient {
       'http://robosats6tkf3eva7x2voqso3a5wcorsnw34jveyxfqi2fu7oyheasid.onion';
     this.daemon = Tor({
       stopDaemonOnBackground: false,
-      startDaemonOnActive: true,
     });
   }