Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Forward Angular Routes from V3 #320

Merged
merged 3 commits into from
Oct 29, 2017
Merged

Forward Angular Routes from V3 #320

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7fe9aa
adapt hash & *.html routes
skubakdj Oct 26, 2017
3633bb1
Merge branch 'develop' into adapt-v3-routes
skubakdj Oct 26, 2017
c6e54c3
Merge branch 'develop' into adapt-v3-routes
dternyak Oct 29, 2017
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
43 changes: 42 additions & 1 deletion common/Root.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Component } from 'react';
import { Provider } from 'react-redux';
import { Router, Route } from 'react-router-dom';
import { withRouter, Switch, Redirect, Router, Route } from 'react-router-dom';
// Components
import Contracts from 'containers/Tabs/Contracts';
import ENS from 'containers/Tabs/ENS';
Expand Down Expand Up @@ -33,9 +33,50 @@ export default class Root extends Component<Props, {}> {
<Route path="/contracts" component={Contracts} />
<Route path="/ens" component={ENS} />
<Route path="/pushTx" component={BroadcastTx} />

<LegacyRoutes />
</div>
</Router>
</Provider>
);
}
}

const LegacyRoutes = withRouter(props => {
const { history } = props;
const { pathname, hash } = props.location;

if (pathname === '/') {
switch (hash) {
case '#send-transaction':
case '#offline-transaction':
history.push('/send-transaction');
break;
case '#generate-wallet':
history.push('/');
break;
case '#swap':
history.push('/swap');
break;
case '#contracts':
history.push('/contracts');
break;
case '#ens':
history.push('/ens');
break;
case '#view-wallet-info':
history.push('/view-wallet');
break;
case '#check-tx-status':
history.push('/check-tx-status');
break;
}
}

return (
<Switch>
<Redirect from="/signmsg.html" to="/sign-and-verify-message" />
<Redirect from="/helpers.html" to="/helpers" />
</Switch>
);
});