feat(navbar): align app flow (#490)

* feat(navbar): Jam -> Sweep * feat(navbar): update order Receive » Earn » Send | Sweep * feat(scheduler): Jam Scheduler -> Scheduled Sweep
joinmarket-webui · Sep 9, 2022 · 6322c44 · 6322c44
1 parent 0d70415
commit 6322c44
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx
@@ -53,45 +53,45 @@ const CenterNav = ({ makerRunning, schedulerRunning, singleCollaborativeTransact
       <div className="d-none d-md-flex align-items-center center-nav-link-divider">»</div>
       <rb.Nav.Item className="d-flex align-items-stretch">
         <NavLink
-          to={routes.jam}
+          to={routes.earn}
           onClick={onClick}
           className={({ isActive }) =>
             'center-nav-link nav-link d-flex align-items-center justify-content-center' + (isActive ? ' active' : '')
           }
         >
           <div className="d-flex align-items-start">
-            {t('Jam')}
-            <TabActivityIndicator isOn={schedulerRunning} />
+            {t('navbar.tab_earn')}
+            <TabActivityIndicator isOn={makerRunning} />
           </div>
         </NavLink>
       </rb.Nav.Item>
-      <div className="d-none d-md-flex align-items-center center-nav-link-divider">/</div>
+      <div className="d-none d-md-flex align-items-center center-nav-link-divider">»</div>
       <rb.Nav.Item className="d-flex align-items-stretch">
         <NavLink
-          to={routes.earn}
+          to={routes.send}
           onClick={onClick}
           className={({ isActive }) =>
             'center-nav-link nav-link d-flex align-items-center justify-content-center' + (isActive ? ' active' : '')
           }
         >
           <div className="d-flex align-items-start">
-            {t('navbar.tab_earn')}
-            <TabActivityIndicator isOn={makerRunning} />
+            {t('navbar.tab_send')}
+            <TabActivityIndicator isOn={singleCollaborativeTransactionRunning} className="ms-1" />
           </div>
         </NavLink>
       </rb.Nav.Item>
-      <div className="d-none d-md-flex align-items-center center-nav-link-divider">»</div>
+      <div className="d-none d-md-flex align-items-center center-nav-link-divider">|</div>
       <rb.Nav.Item className="d-flex align-items-stretch">
         <NavLink
-          to={routes.send}
+          to={routes.jam}
           onClick={onClick}
           className={({ isActive }) =>
             'center-nav-link nav-link d-flex align-items-center justify-content-center' + (isActive ? ' active' : '')
           }
         >
           <div className="d-flex align-items-start">
-            {t('navbar.tab_send')}
-            <TabActivityIndicator isOn={singleCollaborativeTransactionRunning} className="ms-1" />
+            {t('navbar.tab_sweep')}
+            <TabActivityIndicator isOn={schedulerRunning} />
           </div>
         </NavLink>
       </rb.Nav.Item>

diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json
@@ -31,6 +31,7 @@
     "tab_send": "Send",
     "tab_receive": "Receive",
     "tab_earn": "Earn",
+    "tab_sweep": "Sweep",
     "joining_in_progress": "Jamming",
     "menu_mobile": "Menu",
     "menu_mobile_settings": "Settings"
@@ -432,7 +433,7 @@
     }
   },
   "scheduler": {
-    "title": "Jam Scheduler (Experimental)",
+    "title": "Scheduled Sweep (Experimental)",
     "subtitle": "Execute multiple transactions using random amounts and time intervals to increase the privacy of yourself and others. Every scheduled transaction is a collaborative transaction.",
     "error_starting_schedule_failed": "Starting the scheduler failed.",
     "error_stopping_schedule_failed": "Stopping the scheduler failed.",