Merge remote-tracking branch 'origin/fix/last_tasks'

client/src/components/Preferences/PreferencesTopbar.js

@@ -1,27 +1,30 @@
 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
+import { connect } from 'react-redux';
+
 import DashboardTopbarUser from 'components/Dashboard/TopbarUser';
 import UsersActions from 'containers/Preferences/Users/UsersActions';
 import CurrenciesActions from 'containers/Preferences/Currencies/CurrenciesActions';
+import withDashboard from 'containers/Dashboard/withDashboard';
 
+import { compose } from 'utils';
 
-export default function PreferencesTopbar() {
+function PreferencesTopbar({ preferencesPageTitle }) {
   return (
     <div class="dashboard__preferences-topbar">
-      <h2>Accounts</h2>
-
+      <div class="dashboard__title">
+        <h2>{preferencesPageTitle}</h2>
+      </div>
       <div class="preferences__topbar-actions">
         <Route pathname="/preferences">
           <Switch>
-            <Route
-              exact
-              path={'/preferences/users'}
-              component={UsersActions} />
+            <Route exact path={'/preferences/users'} component={UsersActions} />
 
             <Route
               exact
               path={'/preferences/currencies'}
-              component={CurrenciesActions} />
+              component={CurrenciesActions}
+            />
           </Switch>
         </Route>
       </div>
@@ -31,4 +34,8 @@ export default function PreferencesTopbar() {
       </div>
     </div>
   );
-}
+}
+
+export default compose(
+  withDashboard(({ preferencesPageTitle }) => ({ preferencesPageTitle })),
+)(PreferencesTopbar);