From 21663314ee1d58e5eab644aa2ae071d51620446d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 19 Nov 2020 11:24:17 -0700
Subject: [PATCH] Minor touchups to the dialog

---
 src/components/views/dialogs/ModalWidgetDialog.tsx | 3 ++-
 src/i18n/strings/en_EN.json                        | 2 +-
 src/stores/widgets/StopGapWidget.ts                | 5 ++++-
 src/stores/widgets/StopGapWidgetDriver.ts          | 8 ++++++--
 src/widgets/CapabilityText.tsx                     | 2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/components/views/dialogs/ModalWidgetDialog.tsx b/src/components/views/dialogs/ModalWidgetDialog.tsx
index 652c04c043..e722374555 100644
--- a/src/components/views/dialogs/ModalWidgetDialog.tsx
+++ b/src/components/views/dialogs/ModalWidgetDialog.tsx
@@ -31,6 +31,7 @@ import {
     ModalButtonKind,
     Widget,
     WidgetApiFromWidgetAction,
+    WidgetKind,
 } from "matrix-widget-api";
 import {StopGapWidgetDriver} from "../../../stores/widgets/StopGapWidgetDriver";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
@@ -72,7 +73,7 @@ export default class ModalWidgetDialog extends React.PureComponent<IProps, IStat
     }
 
     public componentDidMount() {
-        const driver = new StopGapWidgetDriver( [], this.widget.type);
+        const driver = new StopGapWidgetDriver( [], this.widget, WidgetKind.Modal);
         const messaging = new ClientWidgetApi(this.widget, this.appFrame.current, driver);
         this.setState({messaging});
     }
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 03bdf512ee..1d660b87f3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -569,7 +569,7 @@
     "%(names)s and %(count)s others are typing …|other": "%(names)s and %(count)s others are typing …",
     "%(names)s and %(count)s others are typing …|one": "%(names)s and one other is typing …",
     "%(names)s and %(lastPerson)s are typing …": "%(names)s and %(lastPerson)s are typing …",
-    "Remain on your screen when you leave this room (when running)": "Remain on your screen when you leave this room (when running)",
+    "Remain on your screen when viewing another room, when running": "Remain on your screen when viewing another room, when running",
     "Remain on your screen while running": "Remain on your screen while running",
     "Send stickers into this room": "Send stickers into this room",
     "Send stickers into your active room": "Send stickers into your active room",
diff --git a/src/stores/widgets/StopGapWidget.ts b/src/stores/widgets/StopGapWidget.ts
index aed07ea32b..04e27dd5fc 100644
--- a/src/stores/widgets/StopGapWidget.ts
+++ b/src/stores/widgets/StopGapWidget.ts
@@ -34,6 +34,7 @@ import {
     WidgetApiFromWidgetAction,
     IModalWidgetOpenRequest,
     IWidgetApiErrorResponseData,
+    WidgetKind,
 } from "matrix-widget-api";
 import { StopGapWidgetDriver } from "./StopGapWidgetDriver";
 import { EventEmitter } from "events";
@@ -152,6 +153,7 @@ export class StopGapWidget extends EventEmitter {
     private mockWidget: ElementWidget;
     private scalarToken: string;
     private roomId?: string;
+    private kind: WidgetKind;
 
     constructor(private appTileProps: IAppTileProps) {
         super();
@@ -165,6 +167,7 @@ export class StopGapWidget extends EventEmitter {
 
         this.mockWidget = new ElementWidget(app);
         this.roomId = appTileProps.room?.roomId;
+        this.kind = appTileProps.userWidget ? WidgetKind.Account : WidgetKind.Room; // probably
     }
 
     private get eventListenerRoomId(): string {
@@ -303,7 +306,7 @@ export class StopGapWidget extends EventEmitter {
     public start(iframe: HTMLIFrameElement) {
         if (this.started) return;
         const allowedCapabilities = this.appTileProps.whitelistCapabilities || [];
-        const driver = new StopGapWidgetDriver( allowedCapabilities, this.mockWidget);
+        const driver = new StopGapWidgetDriver( allowedCapabilities, this.mockWidget, this.kind);
         this.messaging = new ClientWidgetApi(this.mockWidget, iframe, driver);
         this.messaging.on("preparing", () => this.emit("preparing"));
         this.messaging.on("ready", () => this.emit("ready"));
diff --git a/src/stores/widgets/StopGapWidgetDriver.ts b/src/stores/widgets/StopGapWidgetDriver.ts
index 99b6aacb26..b6d17b1b1b 100644
--- a/src/stores/widgets/StopGapWidgetDriver.ts
+++ b/src/stores/widgets/StopGapWidgetDriver.ts
@@ -17,8 +17,10 @@
 import {
     Capability,
     ISendEventDetails,
-    MatrixCapabilities, Widget,
+    MatrixCapabilities,
+    Widget,
     WidgetDriver,
+    WidgetKind,
 } from "matrix-widget-api";
 import { iterableDiff, iterableUnion } from "../../utils/iterables";
 import { MatrixClientPeg } from "../../MatrixClientPeg";
@@ -31,7 +33,8 @@ import WidgetCapabilitiesPromptDialog, { getRememberedCapabilitiesForWidget } fr
 export class StopGapWidgetDriver extends WidgetDriver {
     private allowedCapabilities: Set<Capability>;
 
-    constructor(allowedCapabilities: Capability[], private forWidget: Widget) {
+    // TODO: Refactor widgetKind into the Widget class
+    constructor(allowedCapabilities: Capability[], private forWidget: Widget, private forWidgetKind: WidgetKind) {
         super();
 
         // Always allow screenshots to be taken because it's a client-induced flow. The widget can't
@@ -57,6 +60,7 @@ export class StopGapWidgetDriver extends WidgetDriver {
                     {
                         requestedCapabilities: missing,
                         widget: this.forWidget,
+                        widgetKind: this.forWidgetKind,
                     }).finished;
                 (result.approved || []).forEach(cap => allowedSoFar.add(cap));
             } catch (e) {
diff --git a/src/widgets/CapabilityText.tsx b/src/widgets/CapabilityText.tsx
index cb407dc686..817aae699c 100644
--- a/src/widgets/CapabilityText.tsx
+++ b/src/widgets/CapabilityText.tsx
@@ -50,7 +50,7 @@ export interface TranslatedCapabilityText {
 export class CapabilityText {
     private static simpleCaps: IStaticCapText = {
         [MatrixCapabilities.AlwaysOnScreen]: {
-            [WidgetKind.Room]: _td("Remain on your screen when you leave this room (when running)"),
+            [WidgetKind.Room]: _td("Remain on your screen when viewing another room, when running"),
             [GENERIC_WIDGET_KIND]: _td("Remain on your screen while running"),
         },
         [MatrixCapabilities.StickerSending]: {