Merge pull request #268 from LiskHQ/230-fix-login-redirect

Fix redirect from "add account" page - Closes #230
LiskHQ · Feb 5, 2018 · 0f3dbdc · 0f3dbdc
2 parents 3da30b0 + 915f9f4
commit 0f3dbdc
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/src/components/app/index.js b/src/components/app/index.js
@@ -41,7 +41,6 @@ const App = () => (
                   <Route path={`${match.url}/voting/:dialog?`} component={Voting} />
                   <Route path={`${match.url}/sidechains/:dialog?`} component={Sidechains} />
                   <Route path={`${match.url}/forging/:dialog?`} component={Forging} />
-                  <Route path={`${match.url}/add-account/:dialog?`} component={Login} />
                   <Route path='*' component={NotFound} />
                 </Switch>
               </main>
@@ -52,8 +51,9 @@ const App = () => (
                 <Route path={`${match.url}${routes.account.short}/:address?`} component={accountTransactions} />
               </main>
             )} />
-            <Route exact path='/register' component={Register} />
-            <Route exact path='/' component={Login} />
+            <Route exact path={routes.register.url} component={Register} />
+            <Route path={`${routes.addAccount.url}:dialog?`} component={Login} />
+            <Route exact path={routes.login.url} component={Login} />
             <Route path='*' component={NotFound} />
           </Switch>
         </div>

diff --git a/src/components/header/header.js b/src/components/header/header.js
@@ -16,7 +16,12 @@ import RelativeLink from '../relativeLink';
 import routes from './../../constants/routes';
 
 const Header = (props) => {
-  const shouldShowActionButton = () => !props.isAuthenticated && props.location.pathname !== '/';
+  const shouldShowActionButton = () => (
+    !props.isAuthenticated &&
+    props.location.pathname !== routes.login.url &&
+    props.location.pathname !== routes.register.url &&
+    !props.account.loading
+  );
   const shouldShowSearchBar = () => props.location.pathname.includes('explorer') && !props.location.pathname.includes(routes.search.long);
 
   return (

diff --git a/src/components/header/header.test.js b/src/components/header/header.test.js
@@ -25,7 +25,7 @@ describe('Header', () => {
       setActiveDialog: () => { },
       account: {},
       t: key => key,
-      location: { pathname: '/register' },
+      location: { pathname: '/explorer/search' },
       isAuthenticated: false,
     };
     propsMock = sinon.mock(mockInputProps);

diff --git a/src/components/savedAccounts/savedAccounts.js b/src/components/savedAccounts/savedAccounts.js
@@ -9,6 +9,7 @@ import LiskAmount from '../liskAmount';
 import BackgroundMaker from '../backgroundMaker';
 import networks from '../../constants/networks';
 import getNetwork from '../../utils/getNetwork';
+import routes from '../../constants/routes';
 
 import plusShapeIcon from '../../assets/images/plus-shape.svg';
 import circleImage from '../../assets/images/add-id-oval.svg';
@@ -77,7 +78,7 @@ class SavedAccounts extends React.Component {
         <BackgroundMaker />
         <h1>{t('Your favorite Lisk IDs')}</h1>
         <div className={styles.cardsWrapper} >
-          <Link to='/main/add-account/?referrer=/main/dashboard/' >
+          <Link to={`${routes.addAccount.url}?referrer=/main/dashboard/`} >
             <div className={`add-lisk-id-card ${styles.card} ${styles.addNew}`} >
               <div className={styles.cardIcon}>
                 <img src={plusShapeIcon} className={styles.plusShapeIcon} />

diff --git a/src/constants/routes.js b/src/constants/routes.js
@@ -2,4 +2,7 @@ export default {
   wallet: { long: '/main/transactions', short: '/transactions' },
   account: { long: '/explorer/accounts', short: '/accounts' },
   search: { long: '/explorer/search', short: '/search' },
+  login: { url: '/' },
+  addAccount: { url: '/add-account/' },
+  register: { url: '/register' },
 };
diff --git a/src/utils/routes.js b/src/utils/routes.js
@@ -32,8 +32,8 @@ export default [
     params: 'dialog',
     name: 'forging',
   }, {
-    regex: /\/main\/add-account(?:\/[^/]*)?$/,
-    path: '/main/add-account/',
+    regex: /\/add-account(?:\/[^/]*)?$/,
+    path: '/add-account/',
     params: 'dialog',
     name: 'add-account',
   }, {