6 files changed, 82 insertions, 50 deletions
diff --git a/frontend/src/components/PlayerInfo.jsx b/frontend/src/components/PlayerInfo.jsx
new file mode 100644
index 00000000..42d3142a
--- /dev/null
+++ b/frontend/src/components/PlayerInfo.jsx
@@ -0,0 +1,27 @@
+// @flow
+import { Text } from '@blueprintjs/core';
+import React from 'react';
+import { connect } from 'react-redux';
+import type { Player } from '../models/players';
+import { getCurrentPlayer } from '../redux/players';
+
+export type PlayerInfoProps = {
+  player: ?Player,
+}
+
+const PlayerInfoPresenter = ({player}: PlayerInfoProps) => (
+    <Text>
+      <b>Username:</b>
+      {' '}
+      {player && player.displayName}
+    </Text>
+);
+
+const mapStateToProps = state => ({
+  player: getCurrentPlayer(state),
+});
+
+const mapDispatchToProps = {
+};
+
+export const PlayerInfo = connect(mapStateToProps, mapDispatchToProps)(PlayerInfoPresenter);
diff --git a/frontend/src/scenes/GameBrowser/index.js b/frontend/src/components/game-browser/GameBrowser.jsx
index 5a94e290..db0bbb9a 100644
--- a/frontend/src/scenes/GameBrowser/index.js
+++ b/frontend/src/components/game-browser/GameBrowser.jsx
@@ -1,29 +1,17 @@
 // @flow
-import { Button, Classes, InputGroup, Intent, Text } from '@blueprintjs/core';
-import type { List } from 'immutable';
+import { Button, Classes, InputGroup, Intent } from '@blueprintjs/core';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { Flex } from 'reflexbox';
-import { GameList } from '../../components/gameList';
-import type { Game } from '../../models/games';
-import type { Player } from '../../models/players';
-import { actions, getAllGames } from '../../redux/games';
-import { getCurrentPlayer } from '../../redux/players';
+import { GameList } from './GameList';
+import { PlayerInfo } from '../PlayerInfo';
+import { actions } from '../../redux/games';
 
 export type GameBrowserProps = {
-  currentPlayer: Player,
-  games: List<Game>,
   createGame: (gameName: string) => void,
-  joinGame: (gameId: string) => void
 }
 
 class GameBrowserPresenter extends Component<GameBrowserProps> {
-  props: {
-    currentPlayer: Player,
-    games: List<Game>,
-    createGame: (gameName: string) => void,
-    joinGame: (gameId: string) => void
-  };
 
   _gameName: string | void = undefined;
 
@@ -37,20 +25,16 @@ class GameBrowserPresenter extends Component<GameBrowserProps> {
   render() {
     return (
       <div>
-        <Flex align="center" p={1}>
+        <Flex align="center" justify='space-between' p={1}>
           <InputGroup
                   placeholder="Game name"
                   name="game_name"
                   onChange={(e: SyntheticInputEvent<*>) => (this._gameName = e.target.value)}
                   rightElement={<CreateGameButton onClick={this.createGame}/>}
           />
-          <Text>
-            <b>Username:</b>
-            {' '}
-            {this.props.currentPlayer && this.props.currentPlayer.displayName}
-          </Text>
+          <PlayerInfo />
         </Flex>
-        <GameList games={this.props.games} joinGame={this.props.joinGame} />
+        <GameList />
       </div>
     );
   }
@@ -60,14 +44,11 @@ const CreateGameButton = ({onClick}) => (
   <Button className={Classes.MINIMAL} onClick={onClick} intent={Intent.PRIMARY}>Create Game</Button>
 );
 
-const mapStateToProps = state => ({
-  currentPlayer: getCurrentPlayer(state.get('players')),
-  games: getAllGames(state.get('games')),
+const mapStateToProps = () => ({
 });
 
 const mapDispatchToProps = {
   createGame: actions.requestCreateGame,
-  joinGame: actions.requestJoinGame,
 };
 
 export const GameBrowser = connect(mapStateToProps, mapDispatchToProps)(GameBrowserPresenter);
diff --git a/frontend/src/components/game-browser/GameList.jsx b/frontend/src/components/game-browser/GameList.jsx
new file mode 100644
index 00000000..e3601d51
--- /dev/null
+++ b/frontend/src/components/game-browser/GameList.jsx
@@ -0,0 +1,37 @@
+// @flow
+import { Button, Text } from '@blueprintjs/core';
+import type { List } from 'immutable';
+import React from 'react';
+import { connect } from 'react-redux';
+import { Flex } from 'reflexbox';
+import type { Game } from '../../models/games';
+import { actions, getAllGames } from '../../redux/games';
+
+type GameListProps = {
+  games: List<Game>,
+  joinGame: (gameId: string) => void,
+};
+
+const GameListPresenter = ({ games, joinGame }: GameListProps) => (
+  <div>
+    {games.map((game: Game, index: number) => {
+      return (
+        <Flex key={game.get('displayName', index)}>
+          <Text>{game.name}</Text>
+          <Button onClick={() => joinGame(game.id)}>Join</Button>
+        </Flex>
+      );
+    })}
+  </div>
+);
+
+const mapStateToProps = state => ({
+  games: getAllGames(state.get('games')),
+});
+
+const mapDispatchToProps = {
+  joinGame: actions.requestJoinGame,
+};
+
+export const GameList = connect(mapStateToProps, mapDispatchToProps)(GameListPresenter);
+
diff --git a/frontend/src/components/gameList.js b/frontend/src/components/gameList.js
deleted file mode 100644
index b8567130..00000000
--- a/frontend/src/components/gameList.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// @flow
-import { Button, Text } from '@blueprintjs/core';
-import type { List } from 'immutable';
-import React from 'react';
-import { Flex } from 'reflexbox';
-import type { Game } from '../models/games';
-
-export const GameList = ({ games, joinGame }: { games: List<Game>, joinGame: (gameId: string) => void }) => (
-  <div>
-    {games.map((game: Game, index: number) => {
-      return (
-        <Flex key={game.get('displayName', index)}>
-          <Text>{game.name}</Text>
-          <Button onClick={() => joinGame(game.id)}>Join</Button>
-        </Flex>
-      );
-    })}
-  </div>
-);
diff --git a/frontend/src/redux/players.js b/frontend/src/redux/players.js
index 1d6da562..b9f37c8c 100644
--- a/frontend/src/redux/players.js
+++ b/frontend/src/redux/players.js
@@ -39,6 +39,12 @@ export const playersReducer = (state = new PlayerState(), action: PlayerAction)
   }
 };
 
-export const getCurrentPlayer = players => players.all.get(players.current, new Player({displayName: '[ERROR]'}));
-export const getPlayer = (players, username) => players.all.get(username);
-export const getPlayers = (players, usernames) => usernames.map(u => getPlayer(players, u));
+const ANONYMOUS = new Player({displayName: '[NOT LOGGED]'});
+
+export function getCurrentPlayer(state): Player {
+  const players = state.get('players');
+  return getPlayer(players, players.current, ANONYMOUS);
+}
+
+export const getPlayer = (players, username, defaultPlayer): ?Player => players.all.get(username, defaultPlayer);
+export const getPlayers = (players, usernames): List<Player> => usernames.map(u => getPlayer(players, u, undefined));
diff --git a/frontend/src/scenes/index.js b/frontend/src/scenes/index.js
index 5d75f275..eb15e626 100644
--- a/frontend/src/scenes/index.js
+++ b/frontend/src/scenes/index.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Redirect, Route, Switch } from 'react-router-dom';
-import { GameBrowser } from './GameBrowser';
+import { GameBrowser } from '../components/game-browser/GameBrowser';
 import { Lobby } from './Lobby';
 import { SplashScreen } from './SplashScreen';