Skip to content

[Home][Design polish] Use the one-color Concierge icon in the page header #100833

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

Closed
grgia wants to merge 1 commit into from
Closed

[Home][Design polish] Use the one-color Concierge icon in the page header #100833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion assets/images/concierge.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 2 additions & 4 deletions src/components/SidePanel/SidePanelButton/SidePanelButtonBase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function SidePanelButtonBase({style}: SidePanelButtonProps) {
const {translate} = useLocalize();
const {shouldHideHelpButton} = useSidePanelState();
const {openSidePanel} = useSidePanelActions();
const {ConciergeAvatar} = useMemoizedLazyExpensifyIcons(['ConciergeAvatar']);
const {Concierge} = useMemoizedLazyExpensifyIcons(['Concierge']);

if (shouldHideHelpButton) {
return null;
Expand All @@ -36,10 +36,8 @@ function SidePanelButtonBase({style}: SidePanelButtonProps) {
onPress={openSidePanel}
>
<Icon
src={ConciergeAvatar}
src={Concierge}
fill={theme.icon}
width={28}
height={28}
/>
</PressableWithoutFeedback>
</Tooltip>
Expand Down
9 changes: 5 additions & 4 deletions src/components/SidePanel/SidePanelButton/index.native.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import useSidePanelState from '@hooks/useSidePanelState';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';

import {navigateToConciergeChat} from '@userActions/Report';
Expand All @@ -21,10 +22,11 @@ import type SidePanelButtonProps from './types';

function SidePanelButton({style}: SidePanelButtonProps) {
const styles = useThemeStyles();
const theme = useTheme();
const {translate} = useLocalize();
const {shouldHideHelpButton} = useSidePanelState();
const {accountID: currentUserAccountID = CONST.DEFAULT_NUMBER_ID} = useCurrentUserPersonalDetails();
const {ConciergeAvatar} = useMemoizedLazyExpensifyIcons(['ConciergeAvatar']);
const {Concierge} = useMemoizedLazyExpensifyIcons(['Concierge']);
const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
const [isSelfTourViewed] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector});
Expand All @@ -43,9 +45,8 @@ function SidePanelButton({style}: SidePanelButtonProps) {
onPress={() => navigateToConciergeChat(conciergeReportID, introSelected, currentUserAccountID, isSelfTourViewed, betas)}
>
<Icon
src={ConciergeAvatar}
width={28}
height={28}
src={Concierge}
fill={theme.icon}
/>
</PressableWithoutFeedback>
</Tooltip>
Expand Down
Loading