mirror of https://github.com/vector-im/riot-web
parent
6c6bf811a6
commit
837e27ed42
|
@ -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.
|
||||
|
@ -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>
|
||||
);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue