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.

Sign up for GitHub

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

change "new stream" and "new dm" icons #2236 #2282

Merged
merged 3 commits into from
Nov 6, 2023
Merged

change "new stream" and "new dm" icons #2236 #2282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
720c2bb
CW-2236 Changed Bubble icons to Plus icons
pvm-code Nov 1, 2023
2a4747a
Merge branch 'dev' into CW-2236-change-icons-mobile
pvm-code Nov 6, 2023
a239168
CW-2236 Changed the order
pvm-code Nov 6, 2023
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
8 changes: 4 additions & 4 deletions ...ponents/CommonTabPanels/components/FeedTab/components/NewStreamButton/NewStreamButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React, { FC } from "react";
import { BoldPlusIcon } from "@/shared/icons";
import { PlusButton } from "@/pages/inbox/components/HeaderContent/components";
import { PlusIcon } from "@/shared/icons";
import { CirclesPermissions, CommonMember, Governance } from "@/shared/models";
import {
Button,
ButtonIcon,
ButtonSize,
ButtonVariant,
DesktopMenu,
Expand All @@ -28,7 +28,7 @@ const NewStreamButton: FC<NewStreamButtonProps> = (props) => {
} = props;
const items = useMenuItems({ commonMember, governance });
const buttonVariant = ButtonVariant.OutlineDarkPink;
const iconEl = <BoldPlusIcon className={styles.icon} />;
const iconEl = <PlusIcon className={styles.icon} />;

if (items.length === 0) {
return null;
Expand All @@ -55,7 +55,7 @@ const NewStreamButton: FC<NewStreamButtonProps> = (props) => {
return (
<MobileMenu
className={className}
triggerEl={<ButtonIcon variant={buttonVariant}>{iconEl}</ButtonIcon>}
triggerEl={<PlusButton />}
items={items}
/>
);
Expand Down
6 changes: 6 additions & 0 deletions src/pages/inbox/components/HeaderContent_v04/HeaderContent_v04.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useIsTabletView } from "@/shared/hooks/viewport";
import { InboxIcon } from "@/shared/icons";
import { getPluralEnding } from "@/shared/utils";
import { DirectMessageButton } from "../DirectMessageButton";
import { PlusButton } from "../HeaderContent/components";
import { InboxFilterButton } from "../InboxFilterButton";
import styles from "./HeaderContent_v04.module.scss";

Expand Down Expand Up @@ -32,6 +33,11 @@ const HeaderContent_v04: FC<HeaderContentProps> = (props) => {
</div>
<div className={styles.actionButtonsWrapper}>
<InboxFilterButton />
<DirectMessageButton
className={styles.directMessageButton}
isMobileVersion={isMobileVersion}
ButtonComponent={PlusButton}
/>
<DirectMessageButton
className={styles.directMessageButton}
isMobileVersion={isMobileVersion}
Expand Down