disable multi device link and show warnings placeholder

pull/1288/head
Audric Ackermann 5 years ago
parent ad24ad28d6
commit a853d27b28
No known key found for this signature in database
GPG Key ID: 999F434D76324AD4

@ -1318,6 +1318,18 @@
"message": "Typing Indicators", "message": "Typing Indicators",
"description": "Title of the typing indicators setting" "description": "Title of the typing indicators setting"
}, },
"multiDeviceDisabledTemporary": {
"message": "<FIXME placeholder>",
"description": "Description of why multi device is disabled"
},
"multiDeviceDisabledTemporaryToastMessage": {
"message": "<FIXME placeholder>",
"description": "Description of why multi device is disabled on a toast on app start"
},
"multiDeviceDisabledTemporaryToastDescription": {
"message": "<FIXME placeholder> ",
"description": "Description of why multi device is disabled on a toast on app start"
},
"messageTTL": { "messageTTL": {
"message": "Message TTL", "message": "Message TTL",
"description": "Title of the Message TTL setting" "description": "Title of the Message TTL setting"

@ -56,6 +56,19 @@ export class ActionsPanel extends React.Component<Props, State> {
}, },
'refreshAvatarCallback' 'refreshAvatarCallback'
); );
setTimeout(
() =>
window.pushToast({
title: window.i18n('multiDeviceDisabledTemporaryToastMessage'),
description: window.i18n(
'multiDeviceDisabledTemporaryToastMessage'
),
type: 'warning',
id: 'multiDeviceDisabledTemporaryToastMessage',
shouldFade: false,
}),
4000
);
} }
); );
} }

@ -558,7 +558,8 @@ export class RegistrationTabs extends React.Component<{}, State> {
SessionButtonColor.Green SessionButtonColor.Green
)} )}
<h4>{or}</h4> <h4>{or}</h4>
{this.renderLinkDeviceToExistingAccountButton()} {/* FIXME enable back to allow linking of device
this.renderLinkDeviceToExistingAccountButton() */}
</div> </div>
); );
} }
@ -584,7 +585,8 @@ export class RegistrationTabs extends React.Component<{}, State> {
<div> <div>
{this.renderContinueYourSessionButton()} {this.renderContinueYourSessionButton()}
<h4>{or}</h4> <h4>{or}</h4>
{this.renderLinkDeviceToExistingAccountButton()} {/* FIXME enable back to allow linking of device
this.renderLinkDeviceToExistingAccountButton()*/}
</div> </div>
); );
} }

@ -644,7 +644,7 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
id: 'no-linked-device', id: 'no-linked-device',
title: noPairedDeviceText, title: noPairedDeviceText,
type: undefined, type: undefined,
description: '', description: window.i18n('multiDeviceDisabledTemporary'),
category: SessionSettingCategory.Devices, category: SessionSettingCategory.Devices,
content: {}, content: {},
comparisonValue: undefined, comparisonValue: undefined,

@ -74,9 +74,12 @@ export class SettingsHeader extends React.Component<Props, any> {
? `${categoryTitlePrefix.slice(0, -1)} Settings` ? `${categoryTitlePrefix.slice(0, -1)} Settings`
: `${categoryTitlePrefix} Settings`; : `${categoryTitlePrefix} Settings`;
const showSearch = false; const showSearch = false;
const showAddDevice = const showAddDevice = false;
/* FIXME enable back to allow linking of device
const showAddDevice =
category === SessionSettingCategory.Devices && category === SessionSettingCategory.Devices &&
this.props.showLinkDeviceButton; this.props.showLinkDeviceButton;
*/
return ( return (
<div className="session-settings-header"> <div className="session-settings-header">

Loading…
Cancel
Save