Merge remote-tracking branch 'origin/send-tokens-display' into send-t…

…okens-display # Conflicts: # src/pages/SendTokens/SendTokens.js
Greenstand · Jul 18, 2023 · 9ff0a00 · 9ff0a00
2 parents 3494b56 + cfdbbf5
commit 9ff0a00
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 33 deletions.
diff --git a/src/components/Routes/ClientRoutes.js b/src/components/Routes/ClientRoutes.js
@@ -1,14 +1,14 @@
-import { Routes, Route, Navigate, Outlet } from "react-router-dom";
-import Wallet from "../../pages/Wallet/Wallet";
-import TransferStatus from "../../pages/TransferStatus/TransferStatus";
-import Login from "../../pages/Login/Login";
-import Layout from "../layout/Layout";
-import AuthContext from "../../store/auth-context";
-import SendTokens from "../../pages/SendTokens/SendTokens";
-import NotFound from "../../pages/NotFound/NotFound";
-import { useContext } from "react";
+import { Routes, Route, Navigate, Outlet } from 'react-router-dom';
+import Wallet from '../../pages/Wallet/Wallet';
+import Login from '../../pages/Login/Login';
+import Layout from '../layout/Layout';
+import AuthContext from '../../store/auth-context';
+import SendTokens from '../../pages/SendTokens/SendTokens';
+import NotFound from '../../pages/NotFound/NotFound';
+import { useContext } from 'react';
+import MyTransfers from '../../pages/MyTransfers/MyTransfers';
 
-const ProtectedRoute = ({ isLoggedIn, redirectPath = "/login" }) => {
+const ProtectedRoute = ({ isLoggedIn, redirectPath = '/login' }) => {
   if (!isLoggedIn) {
     return <Navigate to={redirectPath} replace />;
   }
@@ -32,11 +32,11 @@ const ClientRoutes = () => {
           }
         />
         <Route
-          path="/transfer-status"
+          path="/my-transfers"
           exact
           element={
             <Layout>
-              <TransferStatus />
+              <MyTransfers />
             </Layout>
           }
         />

diff --git a/src/components/layout/Menu/MenuItem/MenuItem.js b/src/components/layout/Menu/MenuItem/MenuItem.js
@@ -1,24 +1,30 @@
+import CompareIcon from '@mui/icons-material/Compare';
 import HomeIcon from '@mui/icons-material/Home';
 import ThumbsUpDownIcon from '@mui/icons-material/ThumbsUpDown';
 import * as React from 'react';
-// import { Compare } from '@mui/icons-material';
 import LinkItem from './LinkItem';
 
 const MenuItem = ({ open }) => {
   return (
     <>
-      <LinkItem itemPath={'/'}
-                itemName={'Home'}
-                itemIcon={<HomeIcon />}
-                open={open} />
-      <LinkItem itemPath={'/send-tokens'}
-                itemName={'Send Tokens'}
-                itemIcon={<ThumbsUpDownIcon />}
-                open={open} />
-      {/*<LinkItem itemPath={'/transfer-status'}*/}
-      {/*          itemName={'Transfer Status'}*/}
-      {/*          itemIcon={<Compare />}*/}
-      {/*          open={open} />*/}
+      <LinkItem
+        itemPath={'/'}
+        itemName={'Home'}
+        itemIcon={<HomeIcon />}
+        open={open}
+      />
+      <LinkItem
+        itemPath={'/send-tokens'}
+        itemName={'Send Tokens'}
+        itemIcon={<ThumbsUpDownIcon />}
+        open={open}
+      />
+      <LinkItem
+        itemPath={'/my-transfers'}
+        itemName={'My Transfers'}
+        itemIcon={<CompareIcon />}
+        open={open}
+      />
     </>
   );
 };

diff --git a/src/pages/MyTransfers/MyTransfers.js b/src/pages/MyTransfers/MyTransfers.js
@@ -0,0 +1,7 @@
+import React from 'react';
+
+const MyTransfers = () => {
+  return <div style={{ marginTop: '9.4vh' }}>My Transfers</div>;
+};
+
+export default MyTransfers;
diff --git a/src/pages/TransferStatus/TransferStatus.js b/src/pages/TransferStatus/TransferStatus.js
diff --git a/src/pages/Wallet/Wallet.js b/src/pages/Wallet/Wallet.js
@@ -33,7 +33,7 @@ const Wallet = () => {
 
     // TODO: get wallet id by decoding the token. We get the token after login, which is not implemented yet.
     apiClient
-      .get("/wallets/e63bde5b-49b0-431a-91c7-33f257206fb4")
+      .get("/wallets/644f4d3b-a53c-457c-8677-42b5b812c23d")
       .then((response) => {
         const wallet = mapWallet(response.data);
         setWallet(wallet);