PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #4124 from matrix-org/jryans/show-bootstrap-more

Browse source 
Show both bootstrap and reset cross-signing where appropriate
This commit is contained in:
J. Ryan Stinnett 2020-02-25 17:29:31 +00:00 committed by GitHub
commit 1958dae519
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/components/views/settings/CrossSigningPanel.js
View file

@ -158,18 +158,27 @@ export default class CrossSigningPanel extends React.PureComponent {
)}</p>; )}</p>;
} }
let bootstrapButton; let resetButton;
if (enabledForAccount) { if (enabledForAccount) {
bootstrapButton = ( resetButton = (
<AccessibleButton kind="danger" onClick={this._destroySecureSecretStorage}> <div className="mx_CrossSigningPanel_buttonRow">
{_t("Reset cross-signing and secret storage")} <AccessibleButton kind="danger" onClick={this._destroySecureSecretStorage}>
</AccessibleButton> {_t("Reset cross-signing and secret storage")}
</AccessibleButton>
</div>
); );
} else if (!enabledForAccount && homeserverSupportsCrossSigning) { }
let bootstrapButton;
if (
(!enabledForAccount || !crossSigningPublicKeysOnDevice) &&
homeserverSupportsCrossSigning
) {
bootstrapButton = ( bootstrapButton = (
<AccessibleButton kind="primary" onClick={this._bootstrapSecureSecretStorage}> <div className="mx_CrossSigningPanel_buttonRow">
{_t("Bootstrap cross-signing and secret storage")} <AccessibleButton kind="primary" onClick={this._bootstrapSecureSecretStorage}>
</AccessibleButton> {_t("Bootstrap cross-signing and secret storage")}
</AccessibleButton>
</div>
); );
} }
@ -198,9 +207,8 @@ export default class CrossSigningPanel extends React.PureComponent {
</tbody></table> </tbody></table>
</details> </details>
{errorSection} {errorSection}
<div className="mx_CrossSigningPanel_buttonRow"> {bootstrapButton}
{bootstrapButton} {resetButton}
</div>
</div> </div>
); );
} }