diff --git a/src/components/walletDetails/container/walletDetailsContainer.js b/src/components/walletDetails/container/walletDetailsContainer.js
index 5118f202d..a311f121c 100644
--- a/src/components/walletDetails/container/walletDetailsContainer.js
+++ b/src/components/walletDetails/container/walletDetailsContainer.js
@@ -26,7 +26,7 @@ class WalletContainer extends PureComponent {
   // Component Life Cycle Functions
 
   // Component Functions
-  _navigate = (transferType, fundType) => {
+  _navigate = async (transferType, fundType) => {
     const { dispatch, setPinCodeState, walletData } = this.props;
     let balance;
 
@@ -41,7 +41,7 @@ class WalletContainer extends PureComponent {
         break;
     }
 
-    setPinCodeState({
+    await setPinCodeState({
       navigateTo: ROUTES.SCREENS.TRANSFER,
       navigateParams: { transferType, fundType, balance },
     });
diff --git a/src/screens/pinCode/container/pinCodeContainer.js b/src/screens/pinCode/container/pinCodeContainer.js
index f46e57719..af259242d 100644
--- a/src/screens/pinCode/container/pinCodeContainer.js
+++ b/src/screens/pinCode/container/pinCodeContainer.js
@@ -313,6 +313,7 @@ class PinCodeContainer extends Component {
   render() {
     const { currentAccount, intl, isReset } = this.props;
     const { informationText, isExistUser } = this.state;
+
     return (
       <PinCodeScreen
         informationText={informationText}
diff --git a/src/screens/root/container/rootContainer.js b/src/screens/root/container/rootContainer.js
index 1ec5ba9ad..6ba1a1165 100644
--- a/src/screens/root/container/rootContainer.js
+++ b/src/screens/root/container/rootContainer.js
@@ -157,8 +157,8 @@ const RootContainer = () => (WrappedComponent) => {
       }, 1 * 60 * 1000);
     };
 
-    _setPinCodeState = (data) => {
-      this.setState({ pinCodeStates: { ...data } });
+    _setPinCodeState = async (data) => {
+      return this.setState({ pinCodeStates: { ...data } });
     };
 
     _setWrappedComponentState = (data) => {