arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-12-26 17:08:07 +00:00
Code Issues Releases Wiki Activity

Merge pull request #159 from trezor/fix/bridge-router

Browse Source 
fix redirection to /bridge from landingpage
This commit is contained in:
Vladimir Volek 2018-10-10 13:27:40 +02:00 committed by GitHub
commit c92ef577c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/actions/RouterActions.js
View File

@ -152,7 +152,8 @@ export const getValidUrl = (action: RouterAction): PayloadAction<string> => (dis
const shouldBeLandingPage = getState().devices.length < 1 || !getState().wallet.ready || getState().connect.error !== null; const shouldBeLandingPage = getState().devices.length < 1 || !getState().wallet.ready || getState().connect.error !== null;
const landingPageUrl = dispatch(isLandingPageUrl(requestedUrl)); const landingPageUrl = dispatch(isLandingPageUrl(requestedUrl));
if (shouldBeLandingPage) { if (shouldBeLandingPage) {
return !landingPageUrl ? '/' : requestedUrl; const landingPageRoute = dispatch(isLandingPageUrl(requestedUrl, true));
return !landingPageRoute ? '/' : requestedUrl;
} }
// Disallow displaying landing page // Disallow displaying landing page
@ -283,11 +284,17 @@ const goto = (url: string): ThunkAction => (dispatch: Dispatch, getState: GetSta
/* /*
* Check if requested OR current url is landing page * Check if requested OR current url is landing page
*/ */
export const isLandingPageUrl = ($url?: string): PayloadAction<boolean> => (dispatch: Dispatch, getState: GetState): boolean => { export const isLandingPageUrl = ($url?: string, checkRoutes: boolean = false): PayloadAction<boolean> => (dispatch: Dispatch, getState: GetState): boolean => {
let url: ?string = $url; let url: ?string = $url;
if (typeof url !== 'string') { if (typeof url !== 'string') {
url = getState().router.location.pathname; url = getState().router.location.pathname;
} }
if (checkRoutes) {
const isLandingRoute = routes.find(r => r.pattern === url && r.name.indexOf('landing') >= 0);
if (isLandingRoute) {
return true;
}
}
return url === '/'; return url === '/';
}; };
@ -334,7 +341,7 @@ export const gotoFirmwareUpdate = (): ThunkAction => (dispatch: Dispatch, getSta
*/ */
export const setInitialUrl = (): PayloadAction<boolean> => (dispatch: Dispatch, getState: GetState): boolean => { export const setInitialUrl = (): PayloadAction<boolean> => (dispatch: Dispatch, getState: GetState): boolean => {
const { initialPathname } = getState().wallet; const { initialPathname } = getState().wallet;
if (typeof initialPathname === 'string' && !dispatch(isLandingPageUrl(initialPathname))) { if (typeof initialPathname === 'string' && !dispatch(isLandingPageUrl(initialPathname, true))) {
const valid = dispatch(getValidUrl({ const valid = dispatch(getValidUrl({
type: LOCATION_CHANGE, type: LOCATION_CHANGE,
payload: { payload: {

2
src/views/Landing/components/InstallBridge/index.js
View File

@ -131,7 +131,7 @@ class InstallBridge extends Component<Props, State> {
const currentTarget: ?InstallTarget = installers.find(i => i.preferred === true); const currentTarget: ?InstallTarget = installers.find(i => i.preferred === true);
this.state = { this.state = {
currentVersion: props.transport.type ? `Your version ${props.transport.version}` : 'Not installed', currentVersion: props.transport.type && props.transport.type === 'bridge' ? `Your version ${props.transport.version}` : 'Not installed',
latestVersion: props.transport.bridge.version.join('.'), latestVersion: props.transport.bridge.version.join('.'),
installers, installers,
target: currentTarget || installers[0], target: currentTarget || installers[0],

2
src/views/Landing/index.js
View File

@ -106,7 +106,7 @@ export default (props: Props) => {
{shouldShowUnsupportedBrowser && <BrowserNotSupported />} {shouldShowUnsupportedBrowser && <BrowserNotSupported />}
{shouldShowInstallBridge && <InstallBridge selectFirstAvailableDevice={props.selectFirstAvailableDevice} transport={transport} />} {shouldShowInstallBridge && <InstallBridge selectFirstAvailableDevice={props.selectFirstAvailableDevice} transport={transport} />}
{(shouldShowConnectDevice || shouldShowDisconnectDevice) && ( {!shouldShowInstallBridge && (shouldShowConnectDevice || shouldShowDisconnectDevice) && (
<div> <div>
<TitleWrapper> <TitleWrapper>
<H2 claim>The private bank in your hands.</H2> <H2 claim>The private bank in your hands.</H2>