Skip to content

Commit

Permalink
Iterate
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Telatynski <[email protected]>
  • Loading branch information
t3chguy committed Oct 16, 2024
1 parent 3dd5c13 commit 31ee3ea
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions src/components/views/rooms/Stickerpicker.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import ScalarAuthClient from "../../../ScalarAuthClient";
import GenericElementContextMenu from "../context_menus/GenericElementContextMenu";
import RightPanelStore from "../../../stores/right-panel/RightPanelStore";
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).
// We sit in a context menu, so this should be given to the context menu.
Expand Down Expand Up @@ -203,11 +202,13 @@ export default class Stickerpicker extends React.PureComponent<IProps, IState> {
};

private defaultStickerpickerContent(): JSX.Element {
// eslint-disable-next-line @typescript-eslint/no-require-imports
const imgSrc = require("../../../../res/img/stickerpack-placeholder.png");
return (
<AccessibleButton onClick={this.launchManageIntegrations} className="mx_Stickers_contentPlaceholder">
<p>{_t("stickers|empty")}</p>
<p className="mx_Stickers_addLink">{_t("stickers|empty_add_prompt")}</p>
<img src={StickerpackPlaceholderSvg} alt="" />
<img src={imgSrc} alt="" />
</AccessibleButton>
);
}
Expand Down
2 changes: 1 addition & 1 deletion test/unit-tests/utils/local-room-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ describe("local-room", () => {

it("should resolve the promise after invoking the callback", async () => {
localRoom.afterCreateCallbacks.forEach((callback) => {
callback(localRoom.actualRoomId);
callback(localRoom.actualRoomId!);
});
await prom;
});
Expand Down

0 comments on commit 31ee3ea

Please sign in to comment.