Ensure the first device on a newly-registered account gets cross-signed properly (#8750)

src/components/views/dialogs/security/CreateCrossSigningDialog.tsx

@@ -91,9 +91,9 @@ export default class CreateCrossSigningDialog extends React.PureComponent<IProps
         }
     }
 
-    private doBootstrapUIAuth = async (makeRequest: (authData: any) => void): Promise<void> => {
+    private doBootstrapUIAuth = async (makeRequest: (authData: any) => Promise<void>): Promise<void> => {
         if (this.state.canUploadKeysWithPasswordOnly && this.state.accountPassword) {
-            makeRequest({
+            await makeRequest({
                 type: 'm.login.password',
                 identifier: {
                     type: 'm.id.user',
@@ -106,7 +106,7 @@ export default class CreateCrossSigningDialog extends React.PureComponent<IProps
             });
         } else if (this.props.tokenLogin) {
             // We are hoping the grace period is active
-            makeRequest({});
+            await makeRequest({});
         } else {
             const dialogAesthetics = {
                 [SSOAuthEntry.PHASE_PREAUTH]: {