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

[Rewards 3.0] Add Ads settings links to unconnected UI (uplift to 1.75.x) #27235

Merged
merged 1 commit into from
Jan 15, 2025
Merged

[Rewards 3.0] Add Ads settings links to unconnected UI (uplift to 1.75.x) #27235

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
39 changes: 24 additions & 15 deletions components/brave_rewards/resources/rewards_page/components/home/ads_settings_modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,22 +121,31 @@ export function AdsSettingsModal(props: Props) {
onClose={props.onClose}
/>
<div {...style}>
<p className='description'>
{getString('adsSettingsText')}
{' '}
<NewTabLink href={urls.adsLearnMoreURL}>
{getString('learnMoreLink')}
</NewTabLink>
</p>
{
externalWallet &&
<p className='description'>
{getString('adsSettingsText')}
{' '}
<NewTabLink href={urls.adsLearnMoreURL}>
{getString('learnMoreLink')}
</NewTabLink>
</p>
}
<section className='summary'>
<div className='row'>
<span>
{getString('adsSettingsPayoutDateLabel')}
</span>
<span className='value'>
{payoutDateFormatter.format(new Date(adsInfo.nextPaymentDate))}
</span>
</div>
{
externalWallet &&
<div className='row'>
<span>
{getString('adsSettingsPayoutDateLabel')}
</span>
<span className='value'>
{
payoutDateFormatter.format(
new Date(adsInfo.nextPaymentDate))
}
</span>
</div>
}
<div className='row'>
<span>
{getString('adsSettingsTotalAdsLabel')}
Expand Down
6 changes: 6 additions & 0 deletions components/brave_rewards/resources/rewards_page/components/home/earning_card.style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ export const style = scoped.css`
gap: 8px;
padding: 4px 0;
}

.unconnected & {
margin-top: 12px;
padding-top: 8px;
border-top: solid 1px ${color.divider.subtle};
}
}

.warning-box {
Expand Down
79 changes: 45 additions & 34 deletions components/brave_rewards/resources/rewards_page/components/home/earning_card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,19 @@ export function EarningCard() {
setShowAdsHistoryModal(!showAdsHistoryModal)
}

function renderAdsNav() {
return (
<div className='ads-summary-nav'>
<button onClick={toggleAdsHistoryModal}>
<Icon name='history' />{getString('adsHistoryButtonLabel')}
</button>
<button onClick={toggleAdsSettingsModal}>
<Icon name='settings' />{getString('adsSettingsButtonLabel')}
</button>
</div>
)
}

function renderLimited() {
return (
<div className='content-card' {...style}>
Expand All @@ -74,22 +87,25 @@ export function EarningCard() {
}
</div>
</div>
<section className='connect'>
<div className='connect-text'>
<div>
{getString('connectAccountText')}
</div>
<div className='connect-subtext'>
{getString('connectAccountSubtext')}
<section className='unconnected'>
<div className='connect'>
<div className='connect-text'>
<div>
{getString('connectAccountText')}
</div>
<div className='connect-subtext'>
{getString('connectAccountSubtext')}
</div>
</div>
<Button
className='connect-button'
size='small'
onClick={connectAccount}
>
{getString('connectButtonLabel')}
</Button>
</div>
<Button
className='connect-button'
size='small'
onClick={connectAccount}
>
{getString('connectButtonLabel')}
</Button>
{renderAdsNav()}
</section>
</div>
)
Expand Down Expand Up @@ -150,35 +166,30 @@ export function EarningCard() {
{
showAdDetails && <>
<AdsSummary />
<div className='ads-summary-nav'>
<button onClick={toggleAdsHistoryModal}>
<Icon name='history' />{getString('adsHistoryButtonLabel')}
</button>
<button onClick={toggleAdsSettingsModal}>
<Icon name='settings' />{getString('adsSettingsButtonLabel')}
</button>
</div>
{renderAdsNav()}
</>
}
</section>
)
}

if (!externalWallet) {
return renderLimited()
function renderConnected() {
return (
<div className='content-card' {...style}>
<PayoutStatusView />
<div className='counter'>
<img alt='BAT' src={batCoinColor} />
<div className='counter-text'>
{renderEarningsCounter()}
</div>
</div>
{renderAdsSummary()}
</div>
)
}

return <>
<div className='content-card' {...style}>
<PayoutStatusView />
<div className='counter'>
<img alt='BAT' src={batCoinColor} />
<div className='counter-text'>
{renderEarningsCounter()}
</div>
</div>
{renderAdsSummary()}
</div>
{externalWallet ? renderConnected() : renderLimited()}
{
showAdsHistoryModal ?
<AdsHistoryModal onClose={toggleAdsHistoryModal} /> :
Expand Down
8 changes: 4 additions & 4 deletions components/brave_rewards/resources/rewards_page/components/modal.style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ export const modalStyle = scoped.css`
border-radius: 16px 16px 0 0;
margin: auto 0 0 0;
}

.modal-skip-animations & {
--self-animation-duration: 0ms;
}
}

@keyframes modal-content-fade-in {
Expand All @@ -61,10 +65,6 @@ export const modalStyle = scoped.css`
animation-fill-mode: both;
}

.modal-skip-animations &::backdrop {
animation-duration: 0ms;
}

@keyframes modal-backdrop-fade {
from {
background: rgba(0, 0, 0, 0);
Expand Down
Loading