Merge branch 'develop' into ledger-32bits-chainid

.gitattributes

@@ -0,0 +1 @@
+* text=auto eol=lf

common/Root.tsx

@@ -4,8 +4,9 @@ import { Provider, connect } from 'react-redux';
 import { withRouter, Switch, HashRouter, Route, BrowserRouter } from 'react-router-dom';
 
 import { AppState } from 'features/reducers';
-import { getNetworkUnit, getTheme } from 'features/config';
+import { configSelectors, configMetaSelectors } from 'features/config';
 import { transactionMetaActions } from 'features/transaction';
+import { onboardingSelectors } from 'features/onboarding';
 // Components
 import Contracts from 'containers/Tabs/Contracts';
 import ENS from 'containers/Tabs/ENS';
@@ -20,8 +21,7 @@ import ErrorScreen from 'components/ErrorScreen';
 import PageNotFound from 'components/PageNotFound';
 import LogOutPrompt from 'components/LogOutPrompt';
 import QrSignerModal from 'containers/QrSignerModal';
-import OnboardModal from 'containers/OnboardModal';
-import WelcomeModal from 'components/WelcomeModal';
+import OnboardingModal from 'containers/OnboardingModal';
 import NewAppReleaseModal from 'components/NewAppReleaseModal';
 import PalettePage from 'components/Palette';
 import { RouteNotFound } from 'components/RouteNotFound';
@@ -34,8 +34,9 @@ interface OwnProps {
 }
 
 interface StateProps {
-  networkUnit: ReturnType<typeof getNetworkUnit>;
-  theme: ReturnType<typeof getTheme>;
+  onboardingActive: ReturnType<typeof onboardingSelectors.getActive>;
+  networkUnit: ReturnType<typeof configSelectors.getNetworkUnit>;
+  theme: ReturnType<typeof configMetaSelectors.getTheme>;
 }
 
 interface DispatchProps {
@@ -70,7 +71,7 @@ class RootClass extends Component<Props, State> {
   }
 
   public render() {
-    const { store } = this.props;
+    const { store, onboardingActive } = this.props;
     const { error } = this.state;
 
     if (error) {
@@ -108,17 +109,12 @@ class RootClass extends Component<Props, State> {
         <Provider store={store}>
           <Router>
             <React.Fragment>
+              {onboardingActive && <OnboardingModal />}
               {routes}
               <LegacyRoutes />
               <LogOutPrompt />
               <QrSignerModal />
               {process.env.BUILD_ELECTRON && <NewAppReleaseModal />}
-              {!process.env.DOWNLOADABLE_BUILD && (
-                <React.Fragment>
-                  <OnboardModal />
-                  {!process.env.BUILD_ELECTRON && <WelcomeModal />}
-                </React.Fragment>
-              )}
             </React.Fragment>
           </Router>
         </Provider>
@@ -203,8 +199,9 @@ const CaptureRouteNotFound = withRouter(({ children, location }) => {
 });
 
 const mapStateToProps = (state: AppState): StateProps => ({
-  networkUnit: getNetworkUnit(state),
-  theme: getTheme(state)
+  onboardingActive: onboardingSelectors.getActive(state),
+  networkUnit: configSelectors.getNetworkUnit(state),
+  theme: configMetaSelectors.getTheme(state)
 });
 
 export default connect(mapStateToProps, {