disable multi device link and show warnings placeholder
This commit is contained in:
parent
ad24ad28d6
commit
a853d27b28
|
@ -1318,6 +1318,18 @@
|
|||
"message": "Typing Indicators",
|
||||
"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": {
|
||||
"message": "Message TTL",
|
||||
"description": "Title of the Message TTL setting"
|
||||
|
|
|
@ -56,6 +56,19 @@ export class ActionsPanel extends React.Component<Props, State> {
|
|||
},
|
||||
'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
|
||||
)}
|
||||
<h4>{or}</h4>
|
||||
{this.renderLinkDeviceToExistingAccountButton()}
|
||||
{/* FIXME enable back to allow linking of device
|
||||
this.renderLinkDeviceToExistingAccountButton() */}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
@ -584,7 +585,8 @@ export class RegistrationTabs extends React.Component<{}, State> {
|
|||
<div>
|
||||
{this.renderContinueYourSessionButton()}
|
||||
<h4>{or}</h4>
|
||||
{this.renderLinkDeviceToExistingAccountButton()}
|
||||
{/* FIXME enable back to allow linking of device
|
||||
this.renderLinkDeviceToExistingAccountButton()*/}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
|
@ -644,7 +644,7 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
|
|||
id: 'no-linked-device',
|
||||
title: noPairedDeviceText,
|
||||
type: undefined,
|
||||
description: '',
|
||||
description: window.i18n('multiDeviceDisabledTemporary'),
|
||||
category: SessionSettingCategory.Devices,
|
||||
content: {},
|
||||
comparisonValue: undefined,
|
||||
|
|
|
@ -74,9 +74,12 @@ export class SettingsHeader extends React.Component<Props, any> {
|
|||
? `${categoryTitlePrefix.slice(0, -1)} Settings`
|
||||
: `${categoryTitlePrefix} Settings`;
|
||||
const showSearch = false;
|
||||
const showAddDevice =
|
||||
const showAddDevice = false;
|
||||
/* FIXME enable back to allow linking of device
|
||||
const showAddDevice =
|
||||
category === SessionSettingCategory.Devices &&
|
||||
this.props.showLinkDeviceButton;
|
||||
*/
|
||||
|
||||
return (
|
||||
<div className="session-settings-header">
|
||||
|
|
Loading…
Reference in New Issue