Merge pull request #217 from n8io/chore/upgrades

n8io · May 18, 2020 · b7d5500 · b7d5500
2 parents 8dc1ecb + e1faad0
commit b7d5500
Show file tree

Hide file tree

Showing 4 changed files with 828 additions and 989 deletions.
diff --git a/packages/service/src/types/password/selectors.js b/packages/service/src/types/password/selectors.js
@@ -12,7 +12,7 @@ const hash = async (clearTextPassword) => {
 };
 
 const compare = (clearTextPassword, passwordHash) => {
-  if (config.isDev) return true;
+  if (config.isDev && !config.isTest) return true;
 
   return bcryptCompare(clearTextPassword, passwordHash);
 };

diff --git a/packages/ui/src/modules/app/components/App/Providers/InternetConnectivity/index.js b/packages/ui/src/modules/app/components/App/Providers/InternetConnectivity/index.js
@@ -16,7 +16,7 @@ const InternetConnectivity = ({ children }) => {
     };
 
     await checkInternetConnection();
-  }, Time.seconds(5));
+  }, Time.seconds(15));
 
   return (
     <Provider.INTERNET_CONNECTIVITY value={isInternetConnected}>

diff --git a/packages/ui/src/modules/user/components/Account/Profile/Form/index.js b/packages/ui/src/modules/user/components/Account/Profile/Form/index.js
@@ -49,7 +49,7 @@ const Form = () => {
     reset(UserSelfUpdateInput.makeInitial(self));
   }, [self, reset]);
 
-  if (loading || !self) return <Loader />;
+  if (loading && !self) return <Loader />;
 
   return (
     <SharedForm {...formProps} onSubmit={onSelfUpdate}>