OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

other PR iteration based on feedback

pull/21833/head
Michael Telatynski 2020-01-28 23:48:00 +00:00
parent 2fb6e73794
commit 5c44ff8f8a
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/views/right_panel/UserInfo.js
View File

@ -1093,7 +1093,6 @@ export const useDevices = (userId) => {
// Promise.resolve to handle transition from static result to promise; can be removed in future // Promise.resolve to handle transition from static result to promise; can be removed in future
Promise.resolve(cli.getStoredDevicesForUser(userId)).then((devices) => { Promise.resolve(cli.getStoredDevicesForUser(userId)).then((devices) => {
if (cancel) return; if (cancel) return;
console.log("setDevices 2", devices);
setDevices(devices); setDevices(devices);
}); });
} }

2
src/components/views/verification/VerificationShowSas.js
View File

@ -91,7 +91,7 @@ export default class VerificationShowSas extends React.Component {
const text = _t("Waiting for %(displayName)s to verify…", {displayName}); const text = _t("Waiting for %(displayName)s to verify…", {displayName});
confirm = <PendingActionSpinner text={text} />; confirm = <PendingActionSpinner text={text} />;
} else { } else {
// FIXME: stop using DialogButtons here once it this component is only used in the right panel verification // FIXME: stop using DialogButtons here once this component is only used in the right panel verification
confirm = <DialogButtons confirm = <DialogButtons
primaryButton={_t("They match")} primaryButton={_t("They match")}
onPrimaryButtonClick={this.onMatchClick} onPrimaryButtonClick={this.onMatchClick}