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

Jump to bottom

feat: update input colors and text formatting #12247

Merged
merged 3 commits into from
Nov 12, 2024
+12 −16
Merged

feat: update input colors and text formatting #12247

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
c06880f
feat: adjust spacing in staking banner
amitabh94 Nov 8, 2024
31d0384
feat: adjust text color in StakeInputView and UnstakeInputView
amitabh94 Nov 8, 2024
5453872
feat: update unstaking time tooltip
amitabh94 Nov 8, 2024
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 app/components/UI/Stake/Views/StakeInputView/__snapshots__/StakeInputView.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ exports[`StakeInputView render matches snapshot 1`] = `
accessibilityRole="text"
style={
{
"color": "#9fa6ae",
"color": "#141618",
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 32,
"fontWeight": "700",
Expand Down
2 changes: 1 addition & 1 deletion app/components/UI/Stake/Views/UnstakeInputView/__snapshots__/UnstakeInputView.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ exports[`UnstakeInputView render matches snapshot 1`] = `
accessibilityRole="text"
style={
{
"color": "#9fa6ae",
"color": "#141618",
"fontFamily": "EuclidCircularB-Bold",
"fontSize": 32,
"fontWeight": "700",
Expand Down
6 changes: 1 addition & 5 deletions app/components/UI/Stake/components/InputDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ const InputDisplay = ({
isOverMaximum,
balanceText,
balanceValue,
isNonZeroAmount,
isEth,
amountEth,
fiatAmount,
Expand All @@ -70,10 +69,7 @@ const InputDisplay = ({
)}
</View>
<View style={styles.amountRow}>
<Text
color={isNonZeroAmount ? TextColor.Default : TextColor.Muted}
variant={TextVariant.DisplayMD}
>
<Text color={TextColor.Default} variant={TextVariant.DisplayMD}>
{isEth ? amountEth : fiatAmount}
</Text>
<Text color={TextColor.Muted} variant={TextVariant.DisplayMD}>
Expand Down
14 changes: 7 additions & 7 deletions app/components/UI/Stake/components/StakingBalance/StakingCta/StakingCta.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ const StakingCta = ({ estimatedRewardRate, style }: StakingCtaProps) => {
});
trackEvent(
createEventBuilder(MetaMetricsEvents.STAKE_LEARN_MORE_CLICKED)
.addProperties({
selected_provider: 'consensys',
text: 'Learn More',
location: 'Token Details'
})
.build()
.addProperties({
selected_provider: 'consensys',
text: 'Learn More',
location: 'Token Details',
})
.build(),
);
};

Expand All @@ -51,7 +51,7 @@ const StakingCta = ({ estimatedRewardRate, style }: StakingCtaProps) => {
<Text style={styles.rightPad} color={TextColor.Success}>
{estimatedRewardRate}
</Text>
<Text>{strings('stake.stake_your_eth_cta.annually')}</Text>
<Text>{`${strings('stake.stake_your_eth_cta.annually')} `}</Text>
<Button
label={strings('stake.stake_your_eth_cta.learn_more_with_period')}
variant={ButtonVariants.Link}
Expand Down
2 changes: 1 addition & 1 deletion ...ents/UI/Stake/components/StakingBalance/StakingCta/__snapshots__/StakingCta.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ exports[`StakingCta render matches snapshot 1`] = `
}
}
>
annually.
annually.
</Text>
<Text
accessibilityRole="link"
Expand Down
2 changes: 1 addition & 1 deletion locales/languages/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3570,7 +3570,7 @@
},
"unstaking_time": {
"title": "Unstaking time",
"tooltip": "It can take between 1 and 11 days for your unstaking request to be processed. The exact duration depends on ETH staking activity."
"tooltip": "It typically takes less than 3 days to unstake your ETH, but it can take up to 11 days to process. The exact duration depends on the amount you unstake and ETH staking activity"
}
},
"confirm": {
Expand Down
Loading