Merge branch '4.x-master' into refactor/78_replace-node-sass-with-emotion

src/App/App.test.tsx

@@ -71,7 +71,6 @@ describe('App', () => {
     await handleDoLogin('sam', '1234');
     const result = {
       username: 'sam',
-      token: 'TEST_TOKEN',
     };
     expect(wrapper.state('isUserLoggedIn')).toBeTruthy();
     expect(wrapper.state('showLoginModal')).toBeFalsy();

src/App/App.tsx

@@ -81,7 +81,7 @@ export default class App extends Component<{}, AppStateInterface> {
       this.handleLogout();
     } else {
       this.setState({
-        user: { username, token },
+        user: { username },
         isUserLoggedIn: true,
       });
     }
@@ -148,7 +148,6 @@ export default class App extends Component<{}, AppStateInterface> {
     this.setState({
       user: {
         username,
-        token,
       },
       isUserLoggedIn: true, // close login modal after successful login
       showLoginModal: false, // set isUserLoggedIn to true