Merge pull request #1380 from RoboSats/android-notification-system

Android notification system
RoboSats · Sep 6, 2024 · e0bd103 · e0bd103
2 parents 5244b2d + cc63b4d
commit e0bd103
Show file tree

Hide file tree

Showing 27 changed files with 712 additions and 263 deletions.
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -24,7 +24,11 @@ const App = (): JSX.Element => {
               <GarageContextProvider>
                 <FederationContextProvider>
                   <CssBaseline />
-                  {(window.NativeRobosats === undefined && window.RobosatsClient === undefined )? <HostAlert /> : <TorConnectionBadge />}
+                  {window.NativeRobosats === undefined && window.RobosatsClient === undefined ? (
+                    <HostAlert />
+                  ) : (
+                    <TorConnectionBadge />
+                  )}
                   <Main />
                 </FederationContextProvider>
               </GarageContextProvider>

diff --git a/frontend/src/basic/Main.tsx b/frontend/src/basic/Main.tsx
@@ -1,24 +1,25 @@
 import React, { useContext } from 'react';
-import { MemoryRouter,HashRouter ,BrowserRouter, Routes, Route } from 'react-router-dom';
-import { Box, Slide, Typography, styled } from '@mui/material';
+import { MemoryRouter, HashRouter, BrowserRouter } from 'react-router-dom';
+import { Box, Typography, styled } from '@mui/material';
 import { type UseAppStoreType, AppContext, closeAll } from '../contexts/AppContext';
 
-import { RobotPage, MakerPage, BookPage, OrderPage, SettingsPage, NavBar, MainDialogs } from './';
+import { NavBar, MainDialogs } from './';
 import RobotAvatar from '../components/RobotAvatar';
 import Notifications from '../components/Notifications';
 
 import { useTranslation } from 'react-i18next';
 import { GarageContext, type UseGarageStoreType } from '../contexts/GarageContext';
+import Routes from './Routes';
 
-function getRouter() {
+const getRouter = (): any => {
   if (window.NativeRobosats === undefined && window.RobosatsClient === undefined) {
     return BrowserRouter;
   } else if (window.RobosatsClient === 'desktop-app') {
     return HashRouter;
   } else {
     return MemoryRouter;
   }
-}
+};
 const Router = getRouter();
 
 const TestnetTypography = styled(Typography)({
@@ -38,7 +39,7 @@ const MainBox = styled(Box)<MainBoxProps>((props) => ({
 
 const Main: React.FC = () => {
   const { t } = useTranslation();
-  const { settings, page, slideDirection, setOpen, windowSize, navbarHeight } =
+  const { settings, page, setOpen, windowSize, navbarHeight } =
     useContext<UseAppStoreType>(AppContext);
   const { garage } = useContext<UseGarageStoreType>(GarageContext);
 
@@ -62,88 +63,7 @@ const Main: React.FC = () => {
       )}
 
       <MainBox navbarHeight={navbarHeight}>
-
-        <Routes>
-          {['/robot/:token?', '/', ''].map((path, index) => {
-            return (
-              <Route
-                path={path}
-                element={
-                  <Slide
-                    direction={page === 'robot' ? slideDirection.in : slideDirection.out}
-                    in={page === 'robot'}
-                    appear={slideDirection.in !== undefined}
-                  >
-                    <div>
-                      <RobotPage />
-                    </div>
-                  </Slide>
-                }
-                key={index}
-              />
-            );
-          })}
-
-          <Route
-            path={'/offers'}
-            element={
-              <Slide
-                direction={page === 'offers' ? slideDirection.in : slideDirection.out}
-                in={page === 'offers'}
-                appear={slideDirection.in !== undefined}
-              >
-                <div>
-                  <BookPage />
-                </div>
-              </Slide>
-            }
-          />
-
-          <Route
-            path='/create'
-            element={
-              <Slide
-                direction={page === 'create' ? slideDirection.in : slideDirection.out}
-                in={page === 'create'}
-                appear={slideDirection.in !== undefined}
-              >
-                <div>
-                  <MakerPage />
-                </div>
-              </Slide>
-            }
-          />
-
-          <Route
-            path='/order/:shortAlias/:orderId'
-            element={
-              <Slide
-                direction={page === 'order' ? slideDirection.in : slideDirection.out}
-                in={page === 'order'}
-                appear={slideDirection.in !== undefined}
-              >
-                <div>
-                  <OrderPage />
-                </div>
-              </Slide>
-            }
-          />
-
-          <Route
-            path='/settings'
-            element={
-              <Slide
-                direction={page === 'settings' ? slideDirection.in : slideDirection.out}
-                in={page === 'settings'}
-                appear={slideDirection.in !== undefined}
-              >
-                <div>
-                  <SettingsPage />
-                </div>
-              </Slide>
-            }
-          />
-        </Routes>
+        <Routes />
       </MainBox>
       <NavBar />
       <MainDialogs />

diff --git a/frontend/src/basic/Routes.tsx b/frontend/src/basic/Routes.tsx
@@ -0,0 +1,114 @@
+import React, { useContext, useEffect } from 'react';
+import { Routes as DomRoutes, Route, useNavigate } from 'react-router-dom';
+import { Slide } from '@mui/material';
+import { type UseAppStoreType, AppContext } from '../contexts/AppContext';
+
+import { RobotPage, MakerPage, BookPage, OrderPage, SettingsPage } from '.';
+import { GarageContext, type UseGarageStoreType } from '../contexts/GarageContext';
+
+const Routes: React.FC = () => {
+  const navigate = useNavigate();
+  const { garage } = useContext<UseGarageStoreType>(GarageContext);
+  const { page, slideDirection } = useContext<UseAppStoreType>(AppContext);
+
+  useEffect(() => {
+    window.addEventListener('navigateToPage', (event) => {
+      console.log('navigateToPage', JSON.stringify(event));
+      const orderId: string = event?.detail?.order_id;
+      const coordinator: string = event?.detail?.coordinator;
+      if (orderId && coordinator) {
+        const slot = garage.getSlotByOrder(coordinator, orderId);
+        if (slot?.token) {
+          garage.setCurrentSlot(slot?.token);
+          navigate(`/order/${coordinator}/${orderId}`);
+        }
+      }
+    });
+  }, []);
+
+  return (
+    <DomRoutes>
+      {['/robot/:token?', '/', ''].map((path, index) => {
+        return (
+          <Route
+            path={path}
+            element={
+              <Slide
+                direction={page === 'robot' ? slideDirection.in : slideDirection.out}
+                in={page === 'robot'}
+                appear={slideDirection.in !== undefined}
+              >
+                <div>
+                  <RobotPage />
+                </div>
+              </Slide>
+            }
+            key={index}
+          />
+        );
+      })}
+
+      <Route
+        path={'/offers'}
+        element={
+          <Slide
+            direction={page === 'offers' ? slideDirection.in : slideDirection.out}
+            in={page === 'offers'}
+            appear={slideDirection.in !== undefined}
+          >
+            <div>
+              <BookPage />
+            </div>
+          </Slide>
+        }
+      />
+
+      <Route
+        path='/create'
+        element={
+          <Slide
+            direction={page === 'create' ? slideDirection.in : slideDirection.out}
+            in={page === 'create'}
+            appear={slideDirection.in !== undefined}
+          >
+            <div>
+              <MakerPage />
+            </div>
+          </Slide>
+        }
+      />
+
+      <Route
+        path='/order/:shortAlias/:orderId'
+        element={
+          <Slide
+            direction={page === 'order' ? slideDirection.in : slideDirection.out}
+            in={page === 'order'}
+            appear={slideDirection.in !== undefined}
+          >
+            <div>
+              <OrderPage />
+            </div>
+          </Slide>
+        }
+      />
+
+      <Route
+        path='/settings'
+        element={
+          <Slide
+            direction={page === 'settings' ? slideDirection.in : slideDirection.out}
+            in={page === 'settings'}
+            appear={slideDirection.in !== undefined}
+          >
+            <div>
+              <SettingsPage />
+            </div>
+          </Slide>
+        }
+      />
+    </DomRoutes>
+  );
+};
+
+export default Routes;
diff --git a/frontend/src/components/OrderDetails/index.tsx b/frontend/src/components/OrderDetails/index.tsx
@@ -174,8 +174,8 @@ const OrderDetails = ({
 
     const isBuyer = (order.type === 0 && order.is_maker) || (order.type === 1 && !order.is_maker);
     const tradeFee = order.is_maker
-      ? (coordinator.info?.maker_fee ?? 0)
-      : (coordinator.info?.taker_fee ?? 0);
+      ? coordinator.info?.maker_fee ?? 0
+      : coordinator.info?.taker_fee ?? 0;
     const defaultRoutingBudget = 0.001;
     const btc_now = order.satoshis_now / 100000000;
     const rate = Number(order.max_amount ?? order.amount) / btc_now;

diff --git a/frontend/src/components/TradeBox/EncryptedChat/EncryptedTurtleChat/index.tsx b/frontend/src/components/TradeBox/EncryptedChat/EncryptedTurtleChat/index.tsx
@@ -39,7 +39,7 @@ const audioPath =
   window.NativeRobosats === undefined
     ? '/static/assets/sounds'
     : 'file:///android_asset/Web.bundle/assets/sounds';
-    
+
 const EncryptedTurtleChat: React.FC<Props> = ({
   order,
   userNick,

diff --git a/frontend/src/contexts/AppContext.tsx b/frontend/src/contexts/AppContext.tsx
@@ -76,20 +76,13 @@ const makeTheme = function (settings: Settings): Theme {
 };
 
 const getHostUrl = (network = 'mainnet'): string => {
-  let host = '';
-  let protocol = '';
-  if(isDesktopRoboSats){
-    host = defaultFederation.exp[network].onion;
-    protocol = 'http:';  
-  }
-  else if (window.NativeRobosats === undefined) {
+  let host = defaultFederation.exp[network].onion;
+  let protocol = 'http:';
+  if (window.NativeRobosats === undefined) {
     host = getHost();
     protocol = location.protocol;
-  } else {
-    host = defaultFederation.exp[network].onion;
-    protocol = 'http:';
   }
-  const hostUrl = `${host}`;
+  const hostUrl = `${protocol}//${host}`;
   return hostUrl;
 };
 

diff --git a/frontend/src/models/Federation.model.ts b/frontend/src/models/Federation.model.ts
@@ -8,6 +8,7 @@ import {
   defaultExchange,
 } from '.';
 import defaultFederation from '../../static/federation.json';
+import { systemClient } from '../services/System';
 import { getHost } from '../utils';
 import { coordinatorDefaultValues } from './Coordinator.model';
 import { updateExchangeInfo } from './Exchange.model';
@@ -105,9 +106,12 @@ export class Federation {
   };
 
   updateUrl = async (origin: Origin, settings: Settings, hostUrl: string): Promise<void> => {
+    const federationUrls = {};
     for (const coor of Object.values(this.coordinators)) {
       coor.updateUrl(origin, settings, hostUrl);
+      federationUrls[coor.shortAlias] = coor.url;
     }
+    systemClient.setCookie('federation', JSON.stringify(federationUrls));
   };
 
   update = async (): Promise<void> => {

diff --git a/frontend/src/models/Garage.model.ts b/frontend/src/models/Garage.model.ts
@@ -83,7 +83,7 @@ class Garage {
   // Slots
   getSlot: (token?: string) => Slot | null = (token) => {
     const currentToken = token ?? this.currentSlot;
-    return currentToken ? (this.slots[currentToken] ?? null) : null;
+    return currentToken ? this.slots[currentToken] ?? null : null;
   };
 
   deleteSlot: (token?: string) => void = (token) => {
@@ -104,16 +104,30 @@ class Garage {
     const slot = this.getSlot(token);
     if (attributes) {
       if (attributes.copiedToken !== undefined) slot?.setCopiedToken(attributes.copiedToken);
+      this.save();
       this.triggerHook('onRobotUpdate');
     }
     return slot;
   };
 
   setCurrentSlot: (currentSlot: string) => void = (currentSlot) => {
     this.currentSlot = currentSlot;
+    this.save();
     this.triggerHook('onRobotUpdate');
   };
 
+  getSlotByOrder: (coordinator: string, orderID: number) => Slot | null = (
+    coordinator,
+    orderID,
+  ) => {
+    return (
+      Object.values(this.slots).find((slot) => {
+        const robot = slot.getRobot(coordinator);
+        return slot.activeShortAlias === coordinator && robot?.activeOrderId === orderID;
+      }) ?? null
+    );
+  };
+
   // Robots
   createRobot: (token: string, shortAliases: string[], attributes: Record<any, any>) => void = (
     token,
@@ -174,6 +188,7 @@ class Garage {
     Object.values(this.slots).forEach((slot) => {
       slot.syncCoordinator(coordinator, this);
     });
+    this.save();
   };
 }
 

diff --git a/frontend/src/services/Native/index.d.ts b/frontend/src/services/Native/index.d.ts
@@ -26,7 +26,13 @@ export interface NativeWebViewMessageHttp {
 export interface NativeWebViewMessageSystem {
   id?: number;
   category: 'system';
-  type: 'init' | 'torStatus' | 'copyToClipboardString' | 'setCookie' | 'deleteCookie';
+  type:
+    | 'init'
+    | 'torStatus'
+    | 'copyToClipboardString'
+    | 'setCookie'
+    | 'deleteCookie'
+    | 'navigateToPage';
   key?: string;
   detail?: string;
 }

diff --git a/frontend/src/services/Native/index.ts b/frontend/src/services/Native/index.ts
@@ -45,6 +45,8 @@ class NativeRobosats {
       if (message.key !== undefined) {
         this.cookies[message.key] = String(message.detail);
       }
+    } else if (message.type === 'navigateToPage') {
+      window.dispatchEvent(new CustomEvent('navigateToPage', { detail: message?.detail }));
     }
   };