 underscore = require('underscore')
 immutable  = require('immutable')
 
-{React, ReactDOM, Actions, Store, Table, rtypes, rclass, FluxComponent}  = require('./r')
+{React, ReactDOM, Actions, Store, Table, rtypes, rclass, Redux}  = require('./smc-react')
 {Col, Row, Button, ButtonGroup, ButtonToolbar, Input, Panel, Well} = require('react-bootstrap')
 {Icon, Loading, TimeAgo, FileLink, r_join, Space, Tip} = require('./r_misc')
 {User} = require('./users')

            return

        if not immutable.is(next_user_map, @_last_user_map) and @_log?
            users = @props.flux.getStore('users')
            # Update any names that changed in the existing log
            next_user_map.map (val, account_id) =>
                if not immutable.is(val, @_last_user_map?.get(account_id))

                        v.push(x)
                new_log = v
            # process new log entries (search/name info)
            users = @props.redux.getStore('users')
            new_log = (@process_log_entry(x, users) for x in new_log)

            # combine logs
