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 Settings Design/Text Updates #3727

Merged
merged 3 commits into from
Oct 18, 2019
Merged

Rewards Settings Design/Text Updates #3727

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
2225236
Grant detail button updates
ryanml Oct 16, 2019
4de0dd6
Disabled settings icon styles
ryanml Oct 16, 2019
c712854
Updating disabled rewards panel settings text
ryanml Oct 17, 2019
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
1 change: 1 addition & 0 deletions .storybook/locale.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ const locale: Record<string, string> = {
deposit: 'Deposit',
deposits: 'Deposits',
description: 'Description',
details: 'Details',
disabledPanelOff: 'Off',
disabledPanelSettings: 'Settings.',
disabledPanelPrivateText: 'Brave Rewards is not available while in a Private Window.',
Expand Down
1 change: 1 addition & 0 deletions browser/ui/webui/brave_webui_source.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,7 @@ void CustomizeWebUIHTMLSource(const std::string &name,
{ "deposit", IDS_BRAVE_UI_DEPOSIT },
{ "deposits", IDS_BRAVE_UI_DEPOSITS },
{ "description", IDS_BRAVE_UI_DESCRIPTION },
{ "details", IDS_BRAVE_UI_DETAILS },
{ "disabledPanelOff", IDS_BRAVE_UI_DISABLED_PANEL_OFF },
{ "disabledPanelSettings", IDS_BRAVE_UI_DISABLED_PANEL_SETTINGS },
{ "disabledPanelText", IDS_BRAVE_UI_DISABLED_PANEL_TEXT },
Expand Down
1 change: 1 addition & 0 deletions components/brave_rewards/resources/extension/brave_rewards/background/api/locale_api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export const getUIMessages = (): Record<string, string> => {
'claim',
'contributionTips',
'connectedText',
'details',
'disabledPanelTextTwo',
'donateMonthly',
'donateNow',
Expand Down
3 changes: 2 additions & 1 deletion components/brave_rewards/resources/ui/components/disabledContent/style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export const StyledTwoColumn = styled<{}, 'div'>('div')`
`

export const StyledIcon = styled<{}, 'div'>('div')`
width: 180px;
max-width: 50px;
padding: 4px;
margin-right: 20px;
`
5 changes: 3 additions & 2 deletions components/brave_rewards/resources/ui/components/walletWrapper/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
StyledAlertWrapper,
StyledAlertClose,
StyleGrantButton,
GrantButton,
StyledActionText,
StyledBAT,
StyledNotificationIcon,
Expand Down Expand Up @@ -671,8 +672,8 @@ export default class WalletWrapper extends React.PureComponent<Props, State> {
{
hasGrants
? <StyleGrantButton>
<Button
text={getLocale('grants')}
<GrantButton
text={getLocale('details')}
size={'small'}
type={'subtle'}
level={'secondary'}
Expand Down
9 changes: 9 additions & 0 deletions components/brave_rewards/resources/ui/components/walletWrapper/style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,15 @@ export const StyledBalance = styled<{}, 'div'>('div')`
export const StyleGrantButton = styled<{}, 'div'>('div')`
display: flex;
justify-content: center;

&:focus {
outline: 0;
}
`

export const GrantButton = styled(Button as ComponentType<ButtonProps>)`
min-width: 100px;
color: rgba(255, 255, 255, 0.8);
`

export const StyledBalanceTokens = styled<{}, 'div'>('div')`
Expand Down
7 changes: 4 additions & 3 deletions components/resources/brave_components_strings.grd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,11 @@
<message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_NEXT_DATE" desc="">Next contribution date</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_CONTR_SITES" desc="">Sites viewed</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_DONAT_TITLE" desc="">Tips</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_DONAT_DESC" desc="">Tip content creators directly as you browse. You can also set up recurring monthly tips so you can support sites continuously.</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_DONAT_DESC" desc="">Tip content creators directly as you browse by using the Rewards Panel, or by using the inline tip button on various sites including Twitter, Reddit and GitHub.</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_MONTHLY_CONTRIBUTION_TITLE" desc="">Monthly Contributions</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_MONTHLY_CONTRIBUTION_DESC" desc="">Set up recurring monthly contributions so you can support sites continuously.</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_MONTHLY_CONTRIBUTION_EMPTY" desc="">No monthly contributions set up yet.</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_MONTHLY_CONTRIBUTION_DISABLED_TEXT" desc="">Support your favorite sites with recurring monthly contributions. You can set this up from the tipping banner.</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_MONTHLY_CONTRIBUTION_DISABLED_TEXT" desc="">Your monthly contributions will be sent every 30 days.</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_ADS_DISABLED_TEXT" desc="">Coming soon.</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_ADS_DISABLED_TEXT_ONE" desc="">Earnings are paid every month.</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_ADS_DISABLED_TEXT_TWO" desc="">Set your desired frequency to increase or decrease earnings.</message>
Expand Down Expand Up @@ -265,7 +265,7 @@
<message name="IDS_BRAVE_REWARDS_LOCAL_DONAT_ABILITY_GH" desc="">GitHub</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_DONAT_ABILITY_TW" desc="">Twitter</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_DONAT_DISABLED_TEXT1" desc="">Tip on the spot as you find gems.</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_DONAT_DISABLED_TEXT2" desc="">Support your favorite sites with recurring monthly tips.</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_DONAT_DISABLED_TEXT2" desc="">If you like, let people know with a quick tweet.</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_WALLET_RECOVERY_SUCCESS" desc="">{{balance}} BAT was recovered. Your wallet key has been verified and loaded successfully.</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_WALLET_RESTORED" desc="">Wallet restored!</message>
<message name="IDS_BRAVE_REWARDS_LOCAL_WALLET_RECOVERY_FAIL" desc="">Please re-enter keys or try different keys.</message>
Expand Down Expand Up @@ -385,6 +385,7 @@
<message name="IDS_BRAVE_UI_DEPOSIT" desc="">Deposit</message>
<message name="IDS_BRAVE_UI_DEPOSITS" desc="">Deposits</message>
<message name="IDS_BRAVE_UI_DESCRIPTION" desc="">Description</message>
<message name="IDS_BRAVE_UI_DETAILS" desc="">Details</message>
<message name="IDS_BRAVE_UI_DISABLED_PANEL_OFF" desc="">Off</message>
<message name="IDS_BRAVE_UI_DISABLED_PANEL_SETTINGS" desc="">Settings.</message>
<message name="IDS_BRAVE_UI_DISABLED_PANEL_TEXT" desc="">You are not currently accruing any Rewards benefits while browsing. Turn Rewards back on in</message>
Expand Down