diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx index c7153fb56..c92279ceb 100644 --- a/src/components/Navbar.jsx +++ b/src/components/Navbar.jsx @@ -1,10 +1,10 @@ -import React, { useMemo, useState } from 'react' +import React, { useState } from 'react' import { Link, NavLink } from 'react-router-dom' import * as rb from 'react-bootstrap' import { useTranslation } from 'react-i18next' import Sprite from './Sprite' import Balance from './Balance' -import { TabActivityIndicator, JoiningIndicator } from './ActivityIndicators' +import { TabActivityIndicator } from './ActivityIndicators' import { useSettings } from '../context/SettingsContext' import { useCurrentWallet, useCurrentWalletInfo } from '../context/WalletContext' import { useServiceInfo, useSessionConnectionError } from '../context/ServiceInfoContext' @@ -99,25 +99,11 @@ const CenterNav = ({ makerRunning, schedulerRunning, singleCollaborativeTransact ) } -const TrailingNav = ({ joiningRoute, onClick }) => { +const TrailingNav = ({ onClick }) => { const { t } = useTranslation() return ( - {joiningRoute && ( - -
- - {t('navbar.joining_in_progress')} - - -
-
- )} { - if (!serviceInfo) return null - - if (serviceInfo.coinjoinInProgress) { - return serviceInfo.schedule ? routes.jam : routes.send - } - if (serviceInfo.makerRunning) { - return routes.earn - } - - return null - }, [serviceInfo]) - const height = '75px' return ( @@ -252,7 +225,7 @@ export default function Navbar() { } onClick={() => setIsExpanded(!isExpanded)} /> - setIsExpanded(!isExpanded)} /> + setIsExpanded(!isExpanded)} /> @@ -266,7 +239,7 @@ export default function Navbar() {
- +
diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json index 93ab48d4e..68e6570f2 100644 --- a/src/i18n/locales/en/translation.json +++ b/src/i18n/locales/en/translation.json @@ -16,7 +16,6 @@ "tab_send": "Send", "tab_receive": "Receive", "tab_earn": "Earn", - "joining_in_progress": "Joining", "menu_mobile": "Menu", "menu_mobile_settings": "Settings" }, diff --git a/src/i18n/locales/fr/translation.json b/src/i18n/locales/fr/translation.json index 2b9f85ad8..3860e3b96 100644 --- a/src/i18n/locales/fr/translation.json +++ b/src/i18n/locales/fr/translation.json @@ -5,7 +5,6 @@ "tab_send": "Envoyer", "tab_receive": "Recevoir", "tab_earn": "Générer", - "joining_in_progress": "Joindre", "menu_mobile": "Menu", "menu_mobile_settings": "Réglages" },