merge new-share and solve conflict

src/components/passport/index.js

@@ -65,15 +65,15 @@ class Passport extends Component {
 
 
     routeWhenUserLoggedIn = () => {
-        let {history,location} = this.props
+        let {history, location} = this.props
         let {data} = this.props.user
         if (data && Object.values(data).filter(item => !!item).length) {
-            if(history.action === 'POP' && history.length <= 3) {
+            if(history.action === 'POP' && history.length <= 3)  {
                 history.push('/')
-            }else  {
-                const {from} = location.state || {from: {pathname: '/', search: ''}}
-
-                history.replace(from)
+            } else {
+                const { from } = location.state || {from: {pathname: '/', search: ''}};
+                history.replace(from);
+                // history.go(-1)
             }
         }
     }