mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 20:38:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Iterate

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2024-10-16 16:49:44 +01:00
parent 6c6bf811a6
commit 837e27ed42
No known key found for this signature in database
GPG key ID: A2B008A5F49F5D0D
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/components/views/rooms/Stickerpicker.tsx
View file

@ -26,7 +26,6 @@ import ScalarAuthClient from "../../../ScalarAuthClient";
import GenericElementContextMenu from "../context_menus/GenericElementContextMenu"; import GenericElementContextMenu from "../context_menus/GenericElementContextMenu";
import RightPanelStore from "../../../stores/right-panel/RightPanelStore"; import RightPanelStore from "../../../stores/right-panel/RightPanelStore";
import { UPDATE_EVENT } from "../../../stores/AsyncStore"; import { UPDATE_EVENT } from "../../../stores/AsyncStore";
import StickerpackPlaceholderSvg from "../../../../res/img/stickerpack-placeholder.png";
// This should be below the dialog level (4000), but above the rest of the UI (1000-2000). // This should be below the dialog level (4000), but above the rest of the UI (1000-2000).
// We sit in a context menu, so this should be given to the context menu. // We sit in a context menu, so this should be given to the context menu.
@ -203,11 +202,13 @@ export default class Stickerpicker extends React.PureComponent<IProps, IState> {
}; };
private defaultStickerpickerContent(): JSX.Element { private defaultStickerpickerContent(): JSX.Element {
// eslint-disable-next-line @typescript-eslint/no-require-imports
const imgSrc = require("../../../../res/img/stickerpack-placeholder.png");
return ( return (
<AccessibleButton onClick={this.launchManageIntegrations} className="mx_Stickers_contentPlaceholder"> <AccessibleButton onClick={this.launchManageIntegrations} className="mx_Stickers_contentPlaceholder">
<p>{_t("stickers|empty")}</p> <p>{_t("stickers|empty")}</p>
<p className="mx_Stickers_addLink">{_t("stickers|empty_add_prompt")}</p> <p className="mx_Stickers_addLink">{_t("stickers|empty_add_prompt")}</p>
<img src={StickerpackPlaceholderSvg} alt="" /> <img src={imgSrc} alt="" />
</AccessibleButton> </AccessibleButton>
); );
} }

2
test/unit-tests/utils/local-room-test.ts
View file

@ -76,7 +76,7 @@ describe("local-room", () => {
it("should resolve the promise after invoking the callback", async () => { it("should resolve the promise after invoking the callback", async () => {
localRoom.afterCreateCallbacks.forEach((callback) => { localRoom.afterCreateCallbacks.forEach((callback) => {
callback(localRoom.actualRoomId); callback(localRoom.actualRoomId!);
}); });
await prom; await prom;
}); });