Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion public/locales/en/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@
"terms-and-conditions": "Terms and Conditions",
"privacy-policy": "Privacy Policy",
"pricecomparsion": "pricecomparsion",
"team": "Team"
"team": "Team",
"beta": "Beta Version"
},
"account": {
"account": "Account",
Expand Down
2 changes: 0 additions & 2 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ require('Utils/bindGa');
const Referrals = React.lazy(() => import('Components/Referrals/Referrals'));
const Header = React.lazy(() => import('Components/Header/Header'));
const Footer = React.lazy(() => import('Components/Footer'));
const Announcement = React.lazy(() => import('Components/misc/Anouncement/Anouncement'));
const NotFound = React.lazy(() => import('Components/NotFound/NotFound'));
const FAQ = React.lazy(() => import('Components/FAQ2/FAQ'));
const About = React.lazy(() => import('Components/Home/About/About'));
Expand Down Expand Up @@ -90,7 +89,6 @@ const App = () => {
<Suspense fallback={<></>}>
<ToTop>
<Referrals />
<Announcement />
<Container>
<Header />

Expand Down
11 changes: 8 additions & 3 deletions src/components/Footer/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useMemo, useState } from 'react';

import { I18n } from 'react-i18next';
import { NavLink as Link, withRouter } from 'react-router-dom';
import { NavLink as Link, withRouter, useLocation } from 'react-router-dom';
import { HashLink } from 'react-router-hash-link';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
Expand All @@ -14,7 +14,7 @@ const aggregators = ['bestchange', 'okchanger', 'emon', 'allchange'];

const Footer = props => {
const { location } = props;
const { pathname } = location;
const { pathname, search } = location;
const lang = I18n.language || window.localStorage.i18nextLng || 'en';

const hideFooter = useMemo(() => {
Expand All @@ -29,7 +29,7 @@ const Footer = props => {
return false;
}, [location]);

if (hideFooter) return null;
if (hideFooter) return null;

return (
<div className="container">
Expand All @@ -52,6 +52,11 @@ const Footer = props => {
<Link to={`/${lang}/instant-white-label`}>
<strong>{t('header.whitelabel')}</strong>
</Link>
</li>
<li>
<a href={`https://beta.n.exchange${pathname}${search}`}>
{t('header.beta')}
</a>
</li>
<li>
<a href="https://nexchangecc.typeform.com/to/AIh5cCyL" target="_blank" rel="noopener noreferrer">
Expand Down
7 changes: 7 additions & 0 deletions src/components/Header/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ const Header = props => {

export const HeaderStuff = props => {
const { isHomeHeader, lang, closeNavbar, hideSupport, supportModal } = props;
const { pathname, search } = useLocation();

return (
<I18n ns="translations">
Expand Down Expand Up @@ -125,6 +126,12 @@ export const HeaderStuff = props => {
</Link>
</li>

<li>
<a href={`https://beta.n.exchange${pathname}${search}`} className={styles.link} data-test="faq-btn">
{t('header.beta')}
</a>
</li>

{/* <li>
<Link onClick={() => closeNavbar()} to="/pricecomparsion" className={styles.link} data-test="pricecomparsion-btn">
{t('header.pricecomparsion')}
Expand Down