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

fix: use the right colors #6193

Open
wants to merge 2 commits into
base: satish/act-1432-1
Choose a base branch
from
+31 −35
Open

fix: use the right colors #6193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc50892
fix: use the right colors
satish-ravi Oct 25, 2024
2e7a188
fix snapshots
satish-ravi Oct 25, 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
8 changes: 4 additions & 4 deletions src/account/__snapshots__/AccountKeyEducation.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ exports[`AccountKeyEducation renders correctly 1`] = `
<View
style={
{
"backgroundColor": "#2E3338",
"backgroundColor": "#1AB775",
"borderRadius": 5,
"flex": 0,
"height": 5,
Expand All @@ -429,7 +429,7 @@ exports[`AccountKeyEducation renders correctly 1`] = `
<View
style={
{
"backgroundColor": "#666666",
"backgroundColor": "#E6E6E6",
"borderRadius": 5,
"flex": 0,
"height": 5,
Expand All @@ -441,7 +441,7 @@ exports[`AccountKeyEducation renders correctly 1`] = `
<View
style={
{
"backgroundColor": "#666666",
"backgroundColor": "#E6E6E6",
"borderRadius": 5,
"flex": 0,
"height": 5,
Expand All @@ -453,7 +453,7 @@ exports[`AccountKeyEducation renders correctly 1`] = `
<View
style={
{
"backgroundColor": "#666666",
"backgroundColor": "#E6E6E6",
"borderRadius": 5,
"flex": 0,
"height": 5,
Expand Down
8 changes: 4 additions & 4 deletions src/account/__snapshots__/GoldEducation.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ exports[`renders correctly 1`] = `
<View
style={
{
"backgroundColor": "#2E3338",
"backgroundColor": "#1AB775",
"borderRadius": 5,
"flex": 0,
"height": 5,
Expand All @@ -429,7 +429,7 @@ exports[`renders correctly 1`] = `
<View
style={
{
"backgroundColor": "#666666",
"backgroundColor": "#E6E6E6",
"borderRadius": 5,
"flex": 0,
"height": 5,
Expand All @@ -441,7 +441,7 @@ exports[`renders correctly 1`] = `
<View
style={
{
"backgroundColor": "#666666",
"backgroundColor": "#E6E6E6",
"borderRadius": 5,
"flex": 0,
"height": 5,
Expand All @@ -453,7 +453,7 @@ exports[`renders correctly 1`] = `
<View
style={
{
"backgroundColor": "#666666",
"backgroundColor": "#E6E6E6",
"borderRadius": 5,
"flex": 0,
"height": 5,
Expand Down
6 changes: 3 additions & 3 deletions src/components/SegmentedControl.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default function SegmentedControl({ values, selectedIndex = 0, onChange }
Extrapolation.CLAMP
)

const color = interpolateColor(selectedIndex, [0.5, 1], [colors.accent, colors.white])
const color = interpolateColor(selectedIndex, [0.5, 1], [colors.black, colors.white])
const colorInverted = interpolateColor(selectedIndex, [0.5, 1], [colors.white, colors.black])

const onLayout = ({
Expand Down Expand Up @@ -118,7 +118,7 @@ const styles = StyleSheet.create({
height: HEIGHT,
borderRadius: HEIGHT / 2,
borderWidth: 1,
borderColor: colors.accent,
borderColor: colors.black,
overflow: 'hidden',
marginHorizontal: 30,
},
Expand All @@ -128,7 +128,7 @@ const styles = StyleSheet.create({
bottom: 0,
right: 0,
left: 0,
backgroundColor: colors.accent,
backgroundColor: colors.black,
},
maskedContainer: {
// Transparent background because mask is based off alpha channel.
Expand Down
8 changes: 4 additions & 4 deletions src/home/__snapshots__/NotificationBox.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,7 @@ exports[`NotificationBox renders correctly for with all notifications 1`] = `
<View
style={
{
"backgroundColor": "#2E3338",
"backgroundColor": "#1AB775",
"borderRadius": 5,
"flex": 0,
"height": 5,
Expand All @@ -891,7 +891,7 @@ exports[`NotificationBox renders correctly for with all notifications 1`] = `
<View
style={
{
"backgroundColor": "#666666",
"backgroundColor": "#E6E6E6",
"borderRadius": 5,
"flex": 0,
"height": 5,
Expand All @@ -903,7 +903,7 @@ exports[`NotificationBox renders correctly for with all notifications 1`] = `
<View
style={
{
"backgroundColor": "#666666",
"backgroundColor": "#E6E6E6",
"borderRadius": 5,
"flex": 0,
"height": 5,
Expand All @@ -915,7 +915,7 @@ exports[`NotificationBox renders correctly for with all notifications 1`] = `
<View
style={
{
"backgroundColor": "#666666",
"backgroundColor": "#E6E6E6",
"borderRadius": 5,
"flex": 0,
"height": 5,
Expand Down
2 changes: 1 addition & 1 deletion src/keylessBackup/KeylessBackupIntro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ const styles = StyleSheet.create({
recoveryPhrase: {
...typeScale.labelSemiBoldMedium,
textAlign: 'center',
color: Colors.black,
color: Colors.accent,
margin: Spacing.Thick24,
},
button: {
Expand Down
15 changes: 10 additions & 5 deletions src/keylessBackup/SignInWithEmail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import BackButton from 'src/components/BackButton'
import BottomSheet, { BottomSheetModalRefType } from 'src/components/BottomSheet'
import Button, { BtnSizes, BtnTypes } from 'src/components/Button'
import CustomHeader from 'src/components/header/CustomHeader'
import TextButton from 'src/components/TextButton'
import AppleIcon from 'src/icons/Apple'
import GoogleIcon from 'src/icons/Google'
import { email } from 'src/images/Images'
Expand Down Expand Up @@ -255,13 +256,13 @@ function SignInWithEmail({ route }: Props) {
/>
)}
{isSetupInOnboarding && (
<Button
<TextButton
style={styles.signInAnotherWay}
testID="SignInWithEmail/SignInAnotherWay"
onPress={onPressSignInAnotherWay}
size={BtnSizes.FULL}
type={BtnTypes.SECONDARY}
text={t('signInWithEmail.signInAnotherWay')}
/>
>
{t('signInWithEmail.signInAnotherWay')}
</TextButton>
)}
</View>
{isSetupInOnboarding && (
Expand Down Expand Up @@ -328,4 +329,8 @@ const styles = StyleSheet.create({
bottomSheetButtonContainer: {
gap: Spacing.Smallest8,
},
signInAnotherWay: {
alignSelf: 'center',
marginTop: Spacing.Smallest8,
},
})
6 changes: 3 additions & 3 deletions src/onboarding/registration/OnboardingRecoveryPhrase.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function OnboardingRecoveryPhrase({ navigation, route }: Props) {
testID="helpButton"
title={t('help')}
onPress={onPressHelp}
titleStyle={{ color: colors.black }}
titleStyle={{ color: colors.accent }}
/>
),
})
Expand Down Expand Up @@ -105,7 +105,7 @@ function OnboardingRecoveryPhrase({ navigation, route }: Props) {
testID={'protectWalletCopy'}
>
<View style={styles.copyIconStyle}>
<CopyIcon color={colors.black} />
<CopyIcon color={colors.accent} />
</View>
{t('recoveryPhrase.copy')}
</TextButton>
Expand Down Expand Up @@ -161,7 +161,7 @@ const styles = StyleSheet.create({
alignSelf: 'center',
justifyContent: 'center',
paddingBottom: 30,
color: colors.black,
color: colors.accent,
},
buttonStyle: {
marginTop: 37,
Expand Down
13 changes: 2 additions & 11 deletions src/styles/progressDots.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,10 @@ const circle = {
export default StyleSheet.create({
circlePassive: {
...circle,
backgroundColor: colors.gray4,
backgroundColor: colors.gray2,
},
circleActive: {
...circle,
backgroundColor: colors.black,
},
circlePassiveOnboarding: {
...circle,
backgroundColor: colors.onboardingBrownLight,
opacity: 0.5,
},
circleActiveOnboarding: {
...circle,
backgroundColor: colors.infoDark,
backgroundColor: colors.accent,
},
})