aboutsummaryrefslogtreecommitdiffstats
path: root/src/components
diff options
context:
space:
mode:
authorLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-03-01 14:25:44 +0100
committerLibravatar Dominik Guzei <dominik.guzei@gmail.com>2019-03-01 14:25:44 +0100
commit739ef2e8a2dec94c3e10c3d26d797fe759fac7aa (patch)
tree4a2e066bf8627249f803eee16ba8e73268127fbd /src/components
parentfixes merge conflicts with latest develop (diff)
downloadferdium-app-739ef2e8a2dec94c3e10c3d26d797fe759fac7aa.tar.gz
ferdium-app-739ef2e8a2dec94c3e10c3d26d797fe759fac7aa.tar.zst
ferdium-app-739ef2e8a2dec94c3e10c3d26d797fe759fac7aa.zip
finish workspaces mvp
Diffstat (limited to 'src/components')
-rw-r--r--src/components/layout/Sidebar.js2
-rw-r--r--src/components/services/tabs/Tabbar.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 609a3b604..fcc5b0001 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -31,7 +31,7 @@ export default @observer class Sidebar extends Component {
31 openSettings: PropTypes.func.isRequired, 31 openSettings: PropTypes.func.isRequired,
32 toggleMuteApp: PropTypes.func.isRequired, 32 toggleMuteApp: PropTypes.func.isRequired,
33 isAppMuted: PropTypes.bool.isRequired, 33 isAppMuted: PropTypes.bool.isRequired,
34 } 34 };
35 35
36 static contextTypes = { 36 static contextTypes = {
37 intl: intlShape, 37 intl: intlShape,
diff --git a/src/components/services/tabs/Tabbar.js b/src/components/services/tabs/Tabbar.js
index dd5c2140f..5e8260ad0 100644
--- a/src/components/services/tabs/Tabbar.js
+++ b/src/components/services/tabs/Tabbar.js
@@ -19,7 +19,7 @@ export default @observer class TabBar extends Component {
19 updateService: PropTypes.func.isRequired, 19 updateService: PropTypes.func.isRequired,
20 showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired, 20 showMessageBadgeWhenMutedSetting: PropTypes.bool.isRequired,
21 showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired, 21 showMessageBadgesEvenWhenMuted: PropTypes.bool.isRequired,
22 } 22 };
23 23
24 onSortEnd = ({ oldIndex, newIndex }) => { 24 onSortEnd = ({ oldIndex, newIndex }) => {
25 const { 25 const {
@@ -45,7 +45,7 @@ export default @observer class TabBar extends Component {
45 redirect: false, 45 redirect: false,
46 }); 46 });
47 } 47 }
48 } 48 };
49 49
50 disableService({ serviceId }) { 50 disableService({ serviceId }) {
51 this.toggleService({ serviceId, isEnabled: false }); 51 this.toggleService({ serviceId, isEnabled: false });