Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eik/hide labs and sharedinvites #93

Merged
merged 32 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e8b7175
1991, 1992 hide labs and link dm invite
eiksta Aug 16, 2024
37d20ed
1991, 1992 hide labs and link dm invite
eiksta Aug 16, 2024
fe09a8c
1991, 1992 hide labs and link dm invite
eiksta Aug 16, 2024
6965adc
1994 Help about, bugreporting
eiksta Aug 19, 2024
ac4c9d8
1942 Verji changes, part 3
eiksta Aug 22, 2024
6d0a238
Merge branch 'verji-develop' into eik/hide_labs_and_sharedinvites
eiksta Aug 22, 2024
035c5ab
Added translattion after merge conflict
eiksta Aug 23, 2024
f4976cb
Fixed error in file
eiksta Aug 23, 2024
3a65aba
English translation
eiksta Aug 23, 2024
6f95c75
Fixed lint errors
eiksta Aug 23, 2024
9413869
Fixed lint errors
eiksta Aug 23, 2024
67dd606
Merge branch 'verji-develop' into eik/hide_labs_and_sharedinvites
eiksta Aug 26, 2024
a98482e
error fixing for pr eik/hide_labs_and_sharedinvites
eiksta Aug 27, 2024
e2fdf59
Added freshworks.js to eslintignore
eiksta Aug 27, 2024
9732ee3
Fixex pipeline errors
eiksta Aug 27, 2024
221f06b
update snapshot
Aug 27, 2024
264e7b5
Fixex pipeline errors
eiksta Aug 27, 2024
b87d995
Merge branch 'eik/hide_labs_and_sharedinvites' of https://github.com/…
eiksta Aug 27, 2024
e67efc9
Fixex pipeline errors
eiksta Aug 27, 2024
b0afbd1
update snapshot
Aug 27, 2024
78e4a8b
1993 & 1991, InviteDialog fixed bug in UIFeature
eiksta Aug 28, 2024
add5674
Merge branch 'eik/hide_labs_and_sharedinvites' of https://github.com/…
eiksta Aug 28, 2024
e500305
Merge branch 'verji-develop' into eik/hide_labs_and_sharedinvites
eiksta Aug 28, 2024
b620150
1993 & 1991, InviteDialog fixed bug in UIFeature
eiksta Aug 29, 2024
cfe5c58
Merge branch 'eik/hide_labs_and_sharedinvites' of https://github.com/…
eiksta Aug 29, 2024
0894d30
2004 Remoe notification about encryted search
eiksta Aug 29, 2024
6269241
2004 Remove notification about encrypted search
eiksta Aug 29, 2024
994ca36
2004 Remove notification about encrypted search
eiksta Aug 29, 2024
f3255dd
2005 supportbutton not working
eiksta Aug 30, 2024
266d729
Merge branch 'verji-develop' into eik/hide_labs_and_sharedinvites
eiksta Aug 30, 2024
e046f67
2005 supportbutton not working
eiksta Aug 30, 2024
a113ffe
Merge branch 'eik/hide_labs_and_sharedinvites' of https://github.com/…
eiksta Aug 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions src/components/views/right_panel/LegacyRoomHeaderButtons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ import { SummarizedNotificationState } from "../../../stores/notifications/Summa
import PosthogTrackers from "../../../PosthogTrackers";
import { ButtonEvent } from "../elements/AccessibleButton";
import { doesRoomOrThreadHaveUnreadMessages } from "../../../Unread";
// @ts-ignore
import toggleWidget from "../../structures/scripts/freshworks.js";

const ROOM_INFO_PHASES = [
RightPanelPhases.RoomSummary,
Expand Down Expand Up @@ -225,9 +223,6 @@ export default class LegacyRoomHeaderButtons extends HeaderButtons<IProps> {
RightPanelStore.instance.showOrHidePanel(RightPanelPhases.RoomSummary);
}
};
private onSupportClicked = (): void => {
toggleWidget();
};

private onNotificationsClicked = (): void => {
// This toggles for us, if needed
Expand Down Expand Up @@ -319,17 +314,6 @@ export default class LegacyRoomHeaderButtons extends HeaderButtons<IProps> {
onClick={this.onRoomSummaryClicked}
/>,
);
rightPanelPhaseButtons.set(
RightPanelPhases.Support,
<HeaderButton
key="supportButton"
name="supportButton"
title={_t("common|support")}
isHighlighted={this.isPhase(ROOM_INFO_PHASES)}
onClick={this.onSupportClicked}
// onClick={() => toggleWidget()}
/>,
);

return (
<>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,5 @@ exports[`LegacyRoomHeaderButtons-test.tsx should render 1`] = `
role="button"
tabindex="0"
/>
<div
aria-current="false"
aria-label="Support"
class="mx_AccessibleButton mx_LegacyRoomHeader_button mx_RightPanel_supportButton"
role="button"
tabindex="0"
/>
</DocumentFragment>
`;
36 changes: 8 additions & 28 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -8137,16 +8137,7 @@ string-length@^4.0.1:
char-regex "^1.0.2"
strip-ansi "^6.0.0"

"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand Down Expand Up @@ -8225,14 +8216,7 @@ string_decoder@~1.1.1:
dependencies:
safe-buffer "~5.1.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand Down Expand Up @@ -8999,7 +8983,12 @@ which@^2.0.1:
dependencies:
isexe "^2.0.0"

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
word-wrap@^1.2.5:
version "1.2.5"
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand All @@ -9017,15 +9006,6 @@ wrap-ansi@^6.2.0:
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
Expand Down