From 90ce94ca5840c06ccfcf94ceef4cc7cb6868cfaf Mon Sep 17 00:00:00 2001
From: ColonisationCaptain
 <52425971+ColonisationCaptain@users.noreply.github.com>
Date: Wed, 6 Oct 2021 19:21:48 +0100
Subject: [PATCH 1/3] Position toggle switch more clearly

---
 res/css/views/settings/_SetIntegrationManager.scss  |  2 --
 .../views/settings/SetIntegrationManager.tsx        | 13 +++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/res/css/views/settings/_SetIntegrationManager.scss b/res/css/views/settings/_SetIntegrationManager.scss
index 3e59ac73ac9..9d80a902041 100644
--- a/res/css/views/settings/_SetIntegrationManager.scss
+++ b/res/css/views/settings/_SetIntegrationManager.scss
@@ -32,6 +32,4 @@ limitations under the License.
     display: inline-block;
     float: right;
     top: 9px;
-
-    @mixin mx_Settings_fullWidthField;
 }
diff --git a/src/components/views/settings/SetIntegrationManager.tsx b/src/components/views/settings/SetIntegrationManager.tsx
index e083efae0ef..f63e8f4aaa4 100644
--- a/src/components/views/settings/SetIntegrationManager.tsx
+++ b/src/components/views/settings/SetIntegrationManager.tsx
@@ -57,7 +57,7 @@ export default class SetIntegrationManager extends React.Component<IProps, IStat
     };
 
     public render(): React.ReactNode {
-        const ToggleSwitch = sdk.getComponent("views.elements.ToggleSwitch");
+        const LabelledToggleSwitch = sdk.getComponent("views.elements.LabelledToggleSwitch");
 
         const currentManager = this.state.currentManager;
         let managerName;
@@ -79,12 +79,13 @@ export default class SetIntegrationManager extends React.Component<IProps, IStat
                 <div className="mx_SettingsTab_heading">
                     <span>{ _t("Manage integrations") }</span>
                     <span className="mx_SettingsTab_subheading">{ managerName }</span>
-                    <ToggleSwitch checked={this.state.provisioningEnabled} onChange={this.onProvisioningToggled} />
                 </div>
+                <LabelledToggleSwitch
+                    value={this.state.provisioningEnabled}
+                    onChange={this.onProvisioningToggled}
+                    label={bodyText}
+                />
                 <span className="mx_SettingsTab_subsectionText">
-                    { bodyText }
-                    <br />
-                    <br />
                     { _t(
                         "Integration managers receive configuration data, and can modify widgets, " +
                         "send room invites, and set power levels on your behalf.",
@@ -93,4 +94,4 @@ export default class SetIntegrationManager extends React.Component<IProps, IStat
             </div>
         );
     }
-}
+}
\ No newline at end of file

From 53546e1ac9f2a9b33e0540b4dc274331bcde59e0 Mon Sep 17 00:00:00 2001
From: ColonisationCaptain
 <52425971+ColonisationCaptain@users.noreply.github.com>
Date: Wed, 6 Oct 2021 20:12:53 +0100
Subject: [PATCH 2/3] attempt to revert changes, align switch to title instead

---
 res/css/views/settings/_SetIntegrationManager.scss |  1 +
 .../views/settings/SetIntegrationManager.tsx       | 14 ++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/res/css/views/settings/_SetIntegrationManager.scss b/res/css/views/settings/_SetIntegrationManager.scss
index 9d80a902041..521b1ee8ab7 100644
--- a/res/css/views/settings/_SetIntegrationManager.scss
+++ b/res/css/views/settings/_SetIntegrationManager.scss
@@ -26,6 +26,7 @@ limitations under the License.
 .mx_SetIntegrationManager > .mx_SettingsTab_heading > .mx_SettingsTab_subheading {
     display: inline-block;
     padding-left: 5px;
+    margin-top: 0px;
 }
 
 .mx_SetIntegrationManager .mx_ToggleSwitch {
diff --git a/src/components/views/settings/SetIntegrationManager.tsx b/src/components/views/settings/SetIntegrationManager.tsx
index f63e8f4aaa4..161d5f64ae9 100644
--- a/src/components/views/settings/SetIntegrationManager.tsx
+++ b/src/components/views/settings/SetIntegrationManager.tsx
@@ -22,6 +22,7 @@ import * as sdk from '../../../index';
 import SettingsStore from "../../../settings/SettingsStore";
 import { SettingLevel } from "../../../settings/SettingLevel";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
+import ToggleSwitch from "../elements/ToggleSwitch";
 
 interface IProps {
 
@@ -57,8 +58,6 @@ export default class SetIntegrationManager extends React.Component<IProps, IStat
     };
 
     public render(): React.ReactNode {
-        const LabelledToggleSwitch = sdk.getComponent("views.elements.LabelledToggleSwitch");
-
         const currentManager = this.state.currentManager;
         let managerName;
         let bodyText;
@@ -79,13 +78,12 @@ export default class SetIntegrationManager extends React.Component<IProps, IStat
                 <div className="mx_SettingsTab_heading">
                     <span>{ _t("Manage integrations") }</span>
                     <span className="mx_SettingsTab_subheading">{ managerName }</span>
+                    <ToggleSwitch checked={this.state.provisioningEnabled} onChange={this.onProvisioningToggled} />
                 </div>
-                <LabelledToggleSwitch
-                    value={this.state.provisioningEnabled}
-                    onChange={this.onProvisioningToggled}
-                    label={bodyText}
-                />
                 <span className="mx_SettingsTab_subsectionText">
+                    { bodyText }
+                    <br />
+                    <br />
                     { _t(
                         "Integration managers receive configuration data, and can modify widgets, " +
                         "send room invites, and set power levels on your behalf.",
@@ -94,4 +92,4 @@ export default class SetIntegrationManager extends React.Component<IProps, IStat
             </div>
         );
     }
-}
\ No newline at end of file
+}

From cd41ef0028e1c3f0adf3bb1b267a69bcf407b182 Mon Sep 17 00:00:00 2001
From: ColonisationCaptain
 <52425971+ColonisationCaptain@users.noreply.github.com>
Date: Wed, 6 Oct 2021 20:29:58 +0100
Subject: [PATCH 3/3] remove unused import, add missing property

---
 src/components/views/settings/SetIntegrationManager.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/SetIntegrationManager.tsx b/src/components/views/settings/SetIntegrationManager.tsx
index 161d5f64ae9..d8c4898674e 100644
--- a/src/components/views/settings/SetIntegrationManager.tsx
+++ b/src/components/views/settings/SetIntegrationManager.tsx
@@ -18,7 +18,6 @@ import React from 'react';
 import { _t } from "../../../languageHandler";
 import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
 import { IntegrationManagerInstance } from "../../../integrations/IntegrationManagerInstance";
-import * as sdk from '../../../index';
 import SettingsStore from "../../../settings/SettingsStore";
 import { SettingLevel } from "../../../settings/SettingLevel";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
@@ -78,7 +77,11 @@ export default class SetIntegrationManager extends React.Component<IProps, IStat
                 <div className="mx_SettingsTab_heading">
                     <span>{ _t("Manage integrations") }</span>
                     <span className="mx_SettingsTab_subheading">{ managerName }</span>
-                    <ToggleSwitch checked={this.state.provisioningEnabled} onChange={this.onProvisioningToggled} />
+                    <ToggleSwitch
+                        checked={this.state.provisioningEnabled}
+                        disabled={false}
+                        onChange={this.onProvisioningToggled}
+                    />
                 </div>
                 <span className="mx_SettingsTab_subsectionText">
                     { bodyText }