From fc05395dbacdaa087d252e9c51e9efa9397a4060 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 8 Jul 2021 13:24:16 +0100
Subject: [PATCH 1/2] Don't close settings dialog when opening spaces feedback
 prompt

---
 src/components/views/spaces/SpaceSettingsGeneralTab.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/views/spaces/SpaceSettingsGeneralTab.tsx b/src/components/views/spaces/SpaceSettingsGeneralTab.tsx
index 3afdc629e48..9f4e0ecea7c 100644
--- a/src/components/views/spaces/SpaceSettingsGeneralTab.tsx
+++ b/src/components/views/spaces/SpaceSettingsGeneralTab.tsx
@@ -96,7 +96,7 @@ const SpaceSettingsGeneralTab = ({ matrixClient: cli, space, onFinished }: IProp
 
         { error && <div className="mx_SpaceRoomView_errorText">{ error }</div> }
 
-        <SpaceFeedbackPrompt onClick={() => onFinished(false)} />
+        <SpaceFeedbackPrompt />
 
         <div className="mx_SettingsTab_section">
             <SpaceBasicSettings

From 5d72ea5e196e6746991a1b290429bffbb6d55cd6 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 8 Jul 2021 13:24:56 +0100
Subject: [PATCH 2/2] Fix Space Create menu not disabling the alias field when
 busy

---
 src/components/views/elements/RoomAliasField.tsx | 2 ++
 src/components/views/spaces/SpaceCreateMenu.tsx  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/components/views/elements/RoomAliasField.tsx b/src/components/views/elements/RoomAliasField.tsx
index d9e081341ba..62de4dd2bbb 100644
--- a/src/components/views/elements/RoomAliasField.tsx
+++ b/src/components/views/elements/RoomAliasField.tsx
@@ -27,6 +27,7 @@ interface IProps {
     value: string;
     label?: string;
     placeholder?: string;
+    disabled?: boolean;
     onChange?(value: string): void;
 }
 
@@ -68,6 +69,7 @@ export default class RoomAliasField extends React.PureComponent<IProps, IState>
                 onChange={this.onChange}
                 value={this.props.value.substring(1, this.props.value.length - this.props.domain.length - 1)}
                 maxLength={maxlength}
+                disabled={this.props.disabled}
             />
         );
     }
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
index 4bb61d7ccbd..5f16684fb8b 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -220,6 +220,7 @@ const SpaceCreateMenu = ({ onFinished }) => {
                         value={alias}
                         placeholder={name ? nameToAlias(name, domain) : _t("e.g. my-space")}
                         label={_t("Address")}
+                        disabled={busy}
                     />
                     : null
                 }