Merge pull request #304 from Reeywhaar/fixes

Fixes

web/app/components/comment/comment.tsx

@@ -417,7 +417,7 @@ export class Comment extends Component<Props, State> {
         (props.view !== 'preview' && props.data.score < lowCommentScore && !props.data.pin && !props.disabled),
       // TODO: add default view mod or don't?
       guest: isGuest,
-      view: isAdmin ? 'admin' : props.view,
+      view: props.view === 'main' ? props.data.user.admin && 'admin' : props.view,
       replying: props.view === 'main' && isReplying,
       editing: props.view === 'main' && isEditing,
       theme: props.view === 'preview' ? null : props.theme,

web/app/store/index.ts

@@ -35,7 +35,7 @@ export interface StoreState {
   };
 }
 
-const reducers = combineReducers(storeReducers);
+const reducers = combineReducers<StoreState>(storeReducers);
 const middleware = applyMiddleware(thunk);
 
 /**