From 40c51b4d6f5516dbeda1afd34592887dacf8cf68 Mon Sep 17 00:00:00 2001 From: zenparsing Date: Thu, 27 Feb 2025 11:20:33 -0500 Subject: [PATCH] [Rewards] Hide expand button on Android bubble --- .../components/app_frame.style.ts | 8 -------- .../rewards_page/components/app_frame.tsx | 19 ++++++++++--------- .../rewards_page/stories/storybook_model.ts | 6 ++++++ 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/components/brave_rewards/resources/rewards_page/components/app_frame.style.ts b/components/brave_rewards/resources/rewards_page/components/app_frame.style.ts index 7f47f569078c..5f4f37f1b24a 100644 --- a/components/brave_rewards/resources/rewards_page/components/app_frame.style.ts +++ b/components/brave_rewards/resources/rewards_page/components/app_frame.style.ts @@ -98,14 +98,6 @@ export const style = scoped.css` background: ${color.container.highlight}; } } - - .expand-button { - visibility: hidden; - - .is-bubble & { - visibility: visible; - } - } } &.page-frame { diff --git a/components/brave_rewards/resources/rewards_page/components/app_frame.tsx b/components/brave_rewards/resources/rewards_page/components/app_frame.tsx index d3d5beb53140..098473c726de 100644 --- a/components/brave_rewards/resources/rewards_page/components/app_frame.tsx +++ b/components/brave_rewards/resources/rewards_page/components/app_frame.tsx @@ -103,13 +103,10 @@ function MoreMenu(props: { children: React.ReactNode }) { const { getString } = useLocaleContext() const tabOpener = React.useContext(TabOpenerContext) const eventHub = React.useContext(EventHubContext) - const isBubble = useAppState((state) => state.embedder.isBubble) + const embedder = useAppState((state) => state.embedder) + const hideReset = embedder.isBubble && embedder.platform === 'desktop' function onReset() { - if (isBubble) { - tabOpener.openTab(urls.resetURL) - return - } eventHub.dispatch('open-modal', 'reset') } @@ -127,7 +124,7 @@ function MoreMenu(props: { children: React.ReactNode }) { {getString('helpButtonLabel')} { - !isBubble && + !hideReset && {getString('resetRewardsButtonLabel')} @@ -144,6 +141,7 @@ interface Props { function PanelFrame(props: Props) { const tabOpener = React.useContext(TabOpenerContext) const { getString } = useLocaleContext() + const embedder = useAppState((state) => state.embedder) const [isScrolled, setIsScrolled] = React.useState(false) function onExpand() { @@ -162,9 +160,12 @@ function PanelFrame(props: Props) { return (
- + { + embedder.platform === 'desktop' && embedder.isBubble && + + }

{getString('rewardsPageTitle')}

diff --git a/components/brave_rewards/resources/rewards_page/stories/storybook_model.ts b/components/brave_rewards/resources/rewards_page/stories/storybook_model.ts index 6d71e0d793ef..66d69ea80b4b 100644 --- a/components/brave_rewards/resources/rewards_page/stories/storybook_model.ts +++ b/components/brave_rewards/resources/rewards_page/stories/storybook_model.ts @@ -20,6 +20,12 @@ export function createModel(): AppModel { const locale = createLocaleContextForTesting(localeStrings) const stateManager = createStateManager({ ...defaultState(), + embedder: { + platform: 'desktop', + isAutoResizeBubble: false, + isBubble: false, + animatedBackgroundEnabled: false + }, loading: false, paymentId: 'abc123', countryCode: 'US',