aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/client/util/GroupManager.tsx5
-rw-r--r--src/client/views/GlobalKeyHandler.ts4
2 files changed, 4 insertions, 5 deletions
diff --git a/src/client/util/GroupManager.tsx b/src/client/util/GroupManager.tsx
index e81c95d83..fb3342e68 100644
--- a/src/client/util/GroupManager.tsx
+++ b/src/client/util/GroupManager.tsx
@@ -66,8 +66,7 @@ export class GroupManager extends React.Component<{}> {
const evaluating = raw.map(async user => {
const userSharingDocument = await DocServer.GetRefField(user.sharingDocumentId);
if (userSharingDocument instanceof Doc) {
- const notificationDoc = await Cast(userSharingDocument.data, Doc, null);
- runInAction(() => notificationDoc && this.users.push(user.email));
+ runInAction(() => this.users.push(user.email));
}
});
return Promise.all(evaluating).then(() => this.populating = false);
@@ -398,7 +397,7 @@ export class GroupManager extends React.Component<{}> {
<div className="group-heading">
<p><b>Manage Groups</b></p>
<button onClick={action(() => this.createGroupModalOpen = true)}>
- <FontAwesomeIcon icon={"plus-hexagon"} size={"sm"} /> Create Group
+ <FontAwesomeIcon icon={"plus"} size={"sm"} /> Create Group
</button>
<div className={"close-button"} onClick={this.close}>
<FontAwesomeIcon icon={"times"} color={"black"} size={"lg"} />
diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index 2ea1c464f..c48ba109a 100644
--- a/src/client/views/GlobalKeyHandler.ts
+++ b/src/client/views/GlobalKeyHandler.ts
@@ -51,11 +51,11 @@ export class KeyManager {
}
public unhandle = action((e: KeyboardEvent) => {
- if (e.key.toLowerCase() === "shift") KeyManager.Instance.ShiftPressed = false;
+ if (e.key?.toLowerCase() === "shift") KeyManager.Instance.ShiftPressed = false;
});
public handle = action(async (e: KeyboardEvent) => {
- if (e.key.toLowerCase() === "shift" && e.ctrlKey && e.altKey) KeyManager.Instance.ShiftPressed = true;
+ if (e.key?.toLowerCase() === "shift" && e.ctrlKey && e.altKey) KeyManager.Instance.ShiftPressed = true;
if (!Doc.UserDoc().noviceMode && e.key.toLocaleLowerCase() === "shift") DocServer.PRINT_CACHE();
const keyname = e.key && e.key.toLowerCase();
this.handleGreedy(keyname);