Skip to content

Commit 0b2ed59

Browse files
Merge branch 'main' into fix/ensure-toHex-uses-evm-networks
2 parents ad98cc1 + 54e0baa commit 0b2ed59

File tree

3 files changed

+23
-8
lines changed

3 files changed

+23
-8
lines changed

app/components/UI/Stake/components/StakeButton/index.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,17 @@ const StakeButtonContent = ({ asset }: StakeButtonProps) => {
110110
testID={WalletViewSelectorsIDs.STAKE_BUTTON}
111111
style={styles.stakeButton}
112112
>
113-
<Text variant={TextVariant.BodyLGMedium}>
113+
<Text variant={TextVariant.BodyMDMedium} style={styles.dot}>
114114
{' • '}
115-
<Text color={TextColor.Primary} variant={TextVariant.BodyLGMedium}>
116-
{`${strings('stake.earn')} `}
117-
</Text>
115+
</Text>
116+
<Text color={TextColor.Primary} variant={TextVariant.BodyMDMedium}>
117+
{`${strings('stake.earn')}`}
118118
</Text>
119119
<Icon
120120
name={IconName.Plant}
121121
size={IconSize.Sm}
122122
color={IconColor.Primary}
123+
style={styles.sprout}
123124
/>
124125
</Pressable>
125126
);

app/components/UI/Tokens/TokenList/TokenListItem/index.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -436,11 +436,13 @@ export const TokenListItem = React.memo(
436436
{asset.name || asset.symbol}
437437
</Text>
438438
{/** Add button link to Portfolio Stake if token is supported ETH chain and not a staked asset */}
439+
</View>
440+
<View style={styles.percentageChange}>
441+
{!isTestNet(chainId) && showPercentageChange ? (
442+
<PercentageChange value={getPricePercentChange1d()} />
443+
) : null}
439444
{renderEarnCta()}
440445
</View>
441-
{!isTestNet(chainId) && showPercentageChange ? (
442-
<PercentageChange value={getPricePercentChange1d()} />
443-
) : null}
444446
</View>
445447
<ScamWarningIcon
446448
asset={asset}

app/components/UI/Tokens/styles.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,21 @@ const createStyles = (colors: Colors) =>
112112
assetName: {
113113
flexDirection: 'row',
114114
},
115-
stakeButton: {
115+
percentageChange: {
116116
flexDirection: 'row',
117117
alignItems: 'center',
118+
alignContent: 'center',
119+
},
120+
stakeButton: {
121+
flexDirection: 'row',
122+
},
123+
dot: {
124+
marginLeft: 2,
125+
marginRight: 2,
126+
},
127+
sprout: {
128+
marginTop: 3,
129+
marginLeft: 2,
118130
},
119131
portfolioBalance: {
120132
flexDirection: 'row',

0 commit comments

Comments
 (0)