fix(ui): ensure loading messages display correctly

LN-Zap · May 3, 2020 · ad6e5f5 · ad6e5f5
1 parent 3c8b225
commit ad6e5f5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/renderer/components/Loading/Loading.js b/renderer/components/Loading/Loading.js
@@ -10,10 +10,10 @@ const VARIANTS = {
   launchpad: LoadingLaunchpad,
 }
 
-const Loading = ({ variant, isLoading }) => {
+const Loading = ({ variant, isLoading, ...rest }) => {
   const Component = VARIANTS[variant]
   if (Component) {
-    return <Component isLoading={isLoading} />
+    return <Component isLoading={isLoading} {...rest} />
   }
 
   return null

diff --git a/renderer/containers/Loading/Loading.js b/renderer/containers/Loading/Loading.js
@@ -13,6 +13,7 @@ const LoadingContainer = ({
   isAccountPasswordEnabled,
   isWalletOpen,
   onClose,
+  message,
   isAccountLoading,
   isLoggedIn,
 }) => {
@@ -35,7 +36,13 @@ const LoadingContainer = ({
   }
 
   return (
-    <Loading hasClose={hasClose} isLoading={isLoading} onClose={onClose} variant={getVariant()} />
+    <Loading
+      hasClose={hasClose}
+      isLoading={isLoading}
+      message={message}
+      onClose={onClose}
+      variant={getVariant()}
+    />
   )
 }
 
@@ -47,6 +54,7 @@ LoadingContainer.propTypes = {
   isLoading: PropTypes.bool,
   isLoggedIn: PropTypes.bool,
   isWalletOpen: PropTypes.bool,
+  message: PropTypes.object,
   onClose: PropTypes.func,
   pathname: PropTypes.string.isRequired,
 }

diff --git a/renderer/containers/Root.js b/renderer/containers/Root.js
@@ -142,7 +142,7 @@ const mapStateToProps = (state, ownProps) => ({
   notifications: notificationSelectors.getNotificationState(state),
   theme: themeSelectors.currentThemeSettings(state),
   isLoading: isLoading(state) || isLoadingPerPath(state, ownProps.history.location),
-  loadingMessage: getLoadingMessage(state),
+  loadingMessage: getLoadingMessage(state, ownProps.history.location),
   isMounted: appSelectors.isMounted(state),
   isAppReady: appSelectors.isAppReady(state),
   isRootReady: appSelectors.isRootReady(state),

diff --git a/renderer/reducers/utils.js b/renderer/reducers/utils.js
@@ -73,7 +73,7 @@ export const getLoadingMessage = (state, location = {}) => {
     }
   }
 
-  if (pathname === '/app') {
+  if (pathname === '/app' || pathname === '/onboarding') {
     if (!(tickerSelectors.currentTicker(state) && tickerSelectors.cryptoUnitName(state))) {
       return fetching_tickers
     }