Merge pickerTextDark/Light theme colors

EdgeApp · Sep 4, 2023 · 07ced1d · 07ced1d
1 parent ed81c14
commit 07ced1d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 15 deletions.
diff --git a/src/__tests__/scenes/__snapshots__/FioAddressListScene.test.tsx.snap b/src/__tests__/scenes/__snapshots__/FioAddressListScene.test.tsx.snap
@@ -272,8 +272,7 @@ exports[`FioAddressList should render with loading props 1`] = `
               "paymentTypeVisa": {
                 "testUri": "../../../src/assets/images/paymentTypes/paymentTypeVisa.png",
               },
-              "pickerTextDark": "#FFFFFF",
-              "pickerTextLight": "#000000",
+              "pickerText": "#FFFFFF",
               "pinUsernameButton": [
                 "rgba(255, 255, 255, 0)",
                 "rgba(255, 255, 255, 0)",
@@ -721,8 +720,7 @@ exports[`FioAddressList should render with loading props 1`] = `
               "paymentTypeVisa": {
                 "testUri": "../../../src/assets/images/paymentTypes/paymentTypeVisa.png",
               },
-              "pickerTextDark": "#FFFFFF",
-              "pickerTextLight": "#000000",
+              "pickerText": "#FFFFFF",
               "pinUsernameButton": [
                 "rgba(255, 255, 255, 0)",
                 "rgba(255, 255, 255, 0)",

diff --git a/src/components/modals/AutoLogoutModal.tsx b/src/components/modals/AutoLogoutModal.tsx
@@ -20,7 +20,7 @@ export const AutoLogoutModal = (props: Props) => {
   const { autoLogoutTimeInSeconds, bridge } = props
   const theme = useTheme()
   const styles = getStyles(theme)
-  const textColor = theme.pickerTextDark
+  const textColor = theme.pickerText
   const itemStyle = [styles.text, Platform.OS === 'android' ? styles.androidAdjust : null]
 
   const [displayTime, setDisplayTime] = React.useState<DisplayTime>(secondsToDisplay(autoLogoutTimeInSeconds))

diff --git a/src/theme/variables/edgeDark.ts b/src/theme/variables/edgeDark.ts
@@ -335,8 +335,7 @@ export const edgeDark: Theme = {
   qrBackgroundColor: palette.white,
 
   // Picker Color
-  pickerTextDark: palette.white,
-  pickerTextLight: palette.black,
+  pickerText: palette.white,
 
   // Input Accessory
   inputAccessoryBackground: palette.white,

diff --git a/src/theme/variables/edgeLight.ts b/src/theme/variables/edgeLight.ts
@@ -335,8 +335,7 @@ export const edgeLight: Theme = {
   qrBackgroundColor: palette.white,
 
   // Picker Color
-  pickerTextDark: palette.white,
-  pickerTextLight: palette.black,
+  pickerText: palette.white,
 
   // Input Accessory
   inputAccessoryBackground: palette.white,

diff --git a/src/theme/variables/testDark.ts b/src/theme/variables/testDark.ts
@@ -349,8 +349,7 @@ export const testDark: Theme = {
   qrBackgroundColor: palette.white,
 
   // Picker Color
-  pickerTextDark: palette.white,
-  pickerTextLight: palette.black,
+  pickerText: palette.white,
 
   // Input Accessory
   inputAccessoryBackground: palette.white,

diff --git a/src/theme/variables/testLight.ts b/src/theme/variables/testLight.ts
@@ -334,8 +334,7 @@ export const testLight: Theme = {
   qrBackgroundColor: palette.white,
 
   // Picker Color
-  pickerTextDark: palette.white,
-  pickerTextLight: palette.black,
+  pickerText: palette.white,
 
   // Input Accessory
   inputAccessoryBackground: palette.white,

diff --git a/src/types/Theme.ts b/src/types/Theme.ts
@@ -336,8 +336,7 @@ export interface Theme {
   qrBackgroundColor: string
 
   // Picker Color
-  pickerTextDark: string
-  pickerTextLight: string
+  pickerText: string
 
   // Input Accessory
   inputAccessoryBackground: string