diff --git a/.eslintrc.json b/.eslintrc.json
index 14ec01e14..fb854bebe 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -49,7 +49,7 @@
     "no-param-reassign": "off",
     "no-case-declarations": "off",
     "import/no-cycle": "off",
-    "react-hooks/rules-of-hooks": "error",
+    "react-hooks/rules-of-hooks": "warn",
     "react-hooks/exhaustive-deps": "off",
     "react/destructuring-assignment": [1, "always"],
     "import/no-extraneous-dependencies": [
diff --git a/src/components/walletDetails/container/walletDetailsContainer.js b/src/components/walletDetails/container/walletDetailsContainer.js
index 55fb713af..6cd19cffe 100644
--- a/src/components/walletDetails/container/walletDetailsContainer.js
+++ b/src/components/walletDetails/container/walletDetailsContainer.js
@@ -80,11 +80,9 @@ const mapStateToProps = (state) => ({
   isPinCodeOpen: state.application.isPinCodeOpen,
 });
 
-const mapHooksToProps = (props) => ({
-  ...props,
-  navigation: useNavigation(),
-});
+const mapHooksToProps = (props) => {
+  const navigation = useNavigation();
+  return <WalletContainer {...props} navigation={navigation} />;
+};
 
-export default connect(mapStateToProps)(
-  injectIntl((props) => <WalletContainer {...mapHooksToProps(props)} />),
-);
+export default connect(mapStateToProps)(injectIntl(mapHooksToProps));
diff --git a/src/containers/profileContainer.js b/src/containers/profileContainer.js
index 315111913..624fdb1d0 100644
--- a/src/containers/profileContainer.js
+++ b/src/containers/profileContainer.js
@@ -589,11 +589,10 @@ const mapStateToProps = (state) => ({
   isHideImage: state.application.hidePostsThumbnails,
 });
 
-
 const mapHooksToProps = (props) => {
   const navigation = useNavigation();
-  return <ProfileContainer {...props} navigation={navigation} />
-}
+  return <ProfileContainer {...props} navigation={navigation} />;
+};
 
 export default connect(mapStateToProps)(injectIntl(mapHooksToProps));
 /* eslint-enable */
diff --git a/src/containers/profileEditContainer.js b/src/containers/profileEditContainer.js
index 28d434ed3..e748cdec6 100644
--- a/src/containers/profileEditContainer.js
+++ b/src/containers/profileEditContainer.js
@@ -227,11 +227,10 @@ const mapStateToProps = (state) => ({
   pinCode: state.application.pin,
 });
 
-
 const mapHooksToProps = (props) => {
   const navigation = useNavigation();
-  return <ProfileEditContainer {...props} navigation={navigation} />
-}
+  return <ProfileEditContainer {...props} navigation={navigation} />;
+};
 
 export default connect(mapStateToProps)(injectIntl(mapHooksToProps));
 
diff --git a/src/containers/redeemContainer.js b/src/containers/redeemContainer.js
index 87571b88a..1a421db3d 100644
--- a/src/containers/redeemContainer.js
+++ b/src/containers/redeemContainer.js
@@ -149,11 +149,9 @@ const mapStateToProps = (state) => ({
   globalProps: state.account.globalProps,
 });
 
-
-
 const mapHooksToProps = (props) => {
   const navigation = useNavigation();
-  return <RedeemContainer {...props} navigation={navigation} />
-}
+  return <RedeemContainer {...props} navigation={navigation} />;
+};
 
 export default connect(mapStateToProps)(injectIntl(mapHooksToProps));
diff --git a/src/screens/follows/screen/followsScreen.js b/src/screens/follows/screen/followsScreen.js
index 17ce0a81c..a68c37195 100644
--- a/src/screens/follows/screen/followsScreen.js
+++ b/src/screens/follows/screen/followsScreen.js
@@ -90,11 +90,10 @@ class FollowsScreen extends PureComponent {
   }
 }
 
-
 const mapHooksToProps = (props) => {
   const navigation = useNavigation();
-  return <FollowsScreen {...props} navigation={navigation} />
-}
+  return <FollowsScreen {...props} navigation={navigation} />;
+};
 
 export default injectIntl(mapHooksToProps);
 /* eslint-enable */
diff --git a/src/screens/steem-connect/hiveSigner.js b/src/screens/steem-connect/hiveSigner.js
index 29f0c0048..0ac68a618 100644
--- a/src/screens/steem-connect/hiveSigner.js
+++ b/src/screens/steem-connect/hiveSigner.js
@@ -109,7 +109,7 @@ const mapStateToProps = (state) => ({
 
 const mapHooksToProps = (props) => {
   const navigation = useNavigation();
-  return <HiveSigner {...props} navigation={navigation} />
-}
+  return <HiveSigner {...props} navigation={navigation} />;
+};
 
 export default connect(mapStateToProps)(injectIntl(mapHooksToProps));
diff --git a/yarn.lock b/yarn.lock
index f0cb6c19b..4dfdd9d3a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3163,9 +3163,9 @@ camelize@^1.0.0:
   integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=
 
 caniuse-lite@^1.0.30001219:
-  version "1.0.30001228"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
-  integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
+  version "1.0.30001422"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001422.tgz"
+  integrity sha512-hSesn02u1QacQHhaxl/kNMZwqVG35Sz/8DgvmgedxSH8z9UUpcDYSPYgsj3x5dQNRcNp6BwpSfQfVzYUTm+fog==
 
 capture-exit@^2.0.0:
   version "2.0.0"