remove inputActive and inputInactive constants

rsksmart · Mar 21, 2024 · 70fe24e · 70fe24e
1 parent bf4c37a
commit 70fe24e
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 35 deletions.
diff --git a/src/components/InfoBox/index.tsx b/src/components/InfoBox/index.tsx
@@ -24,7 +24,7 @@ export const InfoBox = ({
   description,
   buttonText,
   onPress,
-  backgroundColor = sharedColors.inputInactive,
+  backgroundColor = sharedColors.background.secondary,
   avatarBackgroundColor = sharedColors.qrColor,
 }: InfoBoxProps) => {
   const [shouldHide, setShouldHide] = useState(false)

diff --git a/src/components/accounts/AccountBox.tsx b/src/components/accounts/AccountBox.tsx
@@ -231,7 +231,7 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     justifyContent: 'space-between',
     alignItems: 'center',
-    backgroundColor: sharedColors.inputInactive,
+    backgroundColor: sharedColors.background.secondary,
     paddingLeft: 16,
     paddingRight: 24,
     marginTop: 12,

diff --git a/src/components/appTouchable/index.tsx b/src/components/appTouchable/index.tsx
@@ -41,7 +41,7 @@ export const AppTouchable = ({ children, style, width, ...props }: Props) => {
       android_ripple={{
         borderless: false,
         foreground: true,
-        color: sharedColors.inputActive,
+        color: sharedColors.background.accent,
       }}
       {...props}>
       {children}

diff --git a/src/components/button/index.tsx b/src/components/button/index.tsx
@@ -186,6 +186,6 @@ const styles = StyleSheet.create({
     paddingTop: 2,
   }),
   disabledButton: castStyle.view({
-    backgroundColor: sharedColors.inputActive,
+    backgroundColor: sharedColors.background.accent,
   }),
 })
diff --git a/src/components/checkbox/index.tsx b/src/components/checkbox/index.tsx
@@ -61,7 +61,7 @@ const styles = StyleSheet.create({
     height: 16,
     width: 16,
     borderRadius: 4,
-    backgroundColor: sharedColors.inputInactive,
+    backgroundColor: sharedColors.background.secondary,
     overflow: 'hidden',
   }),
   checkboxEnabled: castStyle.view({

diff --git a/src/lib/rns/useProfileStatusColors.ts b/src/lib/rns/useProfileStatusColors.ts
@@ -9,12 +9,12 @@ export const useProfileStatusColors = () => {
     case ProfileStatus.REQUESTING:
       return {
         startColor: sharedColors.warning,
-        endColor: sharedColors.inputActive,
+        endColor: sharedColors.background.accent,
       }
     case ProfileStatus.READY_TO_PURCHASE:
       return {
         startColor: sharedColors.successLight,
-        endColor: sharedColors.inputActive,
+        endColor: sharedColors.background.accent,
       }
     case ProfileStatus.PURCHASING:
       return {
@@ -24,11 +24,11 @@ export const useProfileStatusColors = () => {
     case ProfileStatus.REQUESTING_ERROR:
       return {
         startColor: sharedColors.danger,
-        endColor: sharedColors.inputActive,
+        endColor: sharedColors.background.accent,
       }
   }
   return {
-    startColor: sharedColors.inputActive,
-    endColor: sharedColors.inputActive,
+    startColor: sharedColors.background.accent,
+    endColor: sharedColors.background.accent,
   }
 }
diff --git a/src/navigation/contactsNavigator/index.tsx b/src/navigation/contactsNavigator/index.tsx
@@ -42,7 +42,7 @@ export const ContactsNavigation = ({
         options={screenOptionsWithHeader(
           top,
           undefined,
-          sharedColors.inputInactive,
+          sharedColors.background.secondary,
         )}
       />
     </Stack.Navigator>

diff --git a/src/screens/contacts/ContactDetails.tsx b/src/screens/contacts/ContactDetails.tsx
@@ -136,7 +136,7 @@ export const ContactDetails = ({
         </AppTouchable>
       ),
       headerStyle: {
-        backgroundColor: sharedColors.inputActive,
+        backgroundColor: sharedColors.background.accent,
       },
       headerRightContainerStyle: {
         paddingTop: 0,
@@ -197,7 +197,8 @@ export const ContactDetails = ({
             </Typography>
           </View>
         </View>
-        <BarButtonGroupContainer backgroundColor={sharedColors.inputActive}>
+        <BarButtonGroupContainer
+          backgroundColor={sharedColors.background.accent}>
           <BarButtonGroupIcon
             onPress={onSendToContact}
             iconName={'north-east'}

diff --git a/src/screens/contacts/components/ContactCard.tsx b/src/screens/contacts/components/ContactCard.tsx
@@ -40,7 +40,7 @@ export const ContactCard = ({ name, style, onPress }: Props) => {
 
 const styles = StyleSheet.create({
   contactCard: castStyle.view({
-    backgroundColor: sharedColors.inputInactive,
+    backgroundColor: sharedColors.background.secondary,
     paddingVertical: 13.5,
     borderRadius: 10,
     marginHorizontal: 5,

diff --git a/src/screens/createKeys/import/ImportMasterKeyScreen.tsx b/src/screens/createKeys/import/ImportMasterKeyScreen.tsx
@@ -268,7 +268,7 @@ export const ImportMasterKeyScreen = (
             activeColor={sharedColors.white}
             activeDotWidth={8}
             activeDotHeight={8}
-            passiveColor={sharedColors.inputActive}
+            passiveColor={sharedColors.background.accent}
             passiveDotHeight={6}
             passiveDotWidth={6}
             marginHorizontal={6}

diff --git a/src/screens/pinScreen/index.tsx b/src/screens/pinScreen/index.tsx
@@ -44,19 +44,19 @@ const defaultPin = [null, null, null, null]
 
 // pin exist
 const pinExistNoSteps = [
-  sharedColors.inputActive,
-  sharedColors.inputActive,
-  sharedColors.inputActive,
+  sharedColors.background.accent,
+  sharedColors.background.accent,
+  sharedColors.background.accent,
 ]
 const pinExistFirstStep = [
   sharedColors.successLight,
-  sharedColors.inputActive,
-  sharedColors.inputActive,
+  sharedColors.background.accent,
+  sharedColors.background.accent,
 ]
 const pinExistSecondStep = [
   sharedColors.successLight,
   sharedColors.successLight,
-  sharedColors.inputActive,
+  sharedColors.background.accent,
 ]
 const pinExistComplete = [
   sharedColors.successLight,
@@ -65,10 +65,13 @@ const pinExistComplete = [
 ]
 
 // no pin exist
-const noPinExistNoSteps = [sharedColors.inputActive, sharedColors.inputActive]
+const noPinExistNoSteps = [
+  sharedColors.background.accent,
+  sharedColors.background.accent,
+]
 const noPinExistFirstStep = [
   sharedColors.successLight,
-  sharedColors.inputActive,
+  sharedColors.background.accent,
 ]
 const noPinExistComplete = [
   sharedColors.successLight,

diff --git a/src/screens/profile/ProfileCreateScreen.tsx b/src/screens/profile/ProfileCreateScreen.tsx
@@ -190,7 +190,7 @@ export const ProfileCreateScreen = ({
         </View>
       </View>
 
-      <BarButtonGroupContainer backgroundColor={sharedColors.primaryDark}>
+      <BarButtonGroupContainer>
         <BarButtonGroupIcon
           iconName="qr-code"
           IconComponent={MaterialIcon}

diff --git a/src/screens/receive/ReceiveScreen.tsx b/src/screens/receive/ReceiveScreen.tsx
@@ -158,7 +158,7 @@ export const ReceiveScreen = ({
 
               const color = isSelected
                 ? getTokenColor(asset.symbol)
-                : sharedColors.inputInactive
+                : sharedColors.background.secondary
 
               return (
                 <PortfolioCard

diff --git a/src/screens/rnsManager/AvatarIconBox.tsx b/src/screens/rnsManager/AvatarIconBox.tsx
@@ -31,7 +31,7 @@ export const AvatarIconBox = ({
 
 const styles = StyleSheet.create({
   avatarBoxViewStyle: castStyle.view({
-    backgroundColor: sharedColors.inputInactive,
+    backgroundColor: sharedColors.background.secondary,
     alignItems: 'center',
     paddingVertical: 30,
     borderRadius: 20,

diff --git a/src/screens/rnsManager/SearchDomainScreen.tsx b/src/screens/rnsManager/SearchDomainScreen.tsx
@@ -250,9 +250,7 @@ export const SearchDomainScreen = ({ navigation }: Props) => {
       // it exists for ios but shows error https://reactnative.dev/docs/scrollview#automaticallyadjustkeyboardinsets-ios
       automaticallyAdjustKeyboardInsets>
       <View style={rnsManagerStyles.container}>
-        <Typography
-          type="h2"
-          style={[rnsManagerStyles.subtitle, rnsManagerStyles.marginBottom]}>
+        <Typography type="h2" style={rnsManagerStyles.marginBottom}>
           {t('request_username_title')}
         </Typography>
         <AvatarIconBox text={(domain || '') + '.rsk'} />

diff --git a/src/screens/rnsManager/rnsManagerStyles.ts b/src/screens/rnsManager/rnsManagerStyles.ts
@@ -23,7 +23,7 @@ export const rnsManagerStyles = StyleSheet.create({
   }),
   profileImageContainer: castStyle.view({
     alignItems: 'center',
-    backgroundColor: sharedColors.inputInactive,
+    backgroundColor: sharedColors.background.secondary,
     borderRadius: 10,
     paddingVertical: 20,
   }),

diff --git a/src/screens/transactionSummary/TransactionSummaryComponent.tsx b/src/screens/transactionSummary/TransactionSummaryComponent.tsx
@@ -138,7 +138,9 @@ export const TransactionSummaryComponent = ({
             style={[
               styles.summaryAlignment,
               styles.statusContainer,
-              status ? { backgroundColor: sharedColors.inputInactive } : null,
+              status
+                ? { backgroundColor: sharedColors.background.secondary }
+                : null,
             ]}>
             <Typography type={'h4'}>
               {status ? t('transaction_summary_status') : ''}

diff --git a/src/screens/walletConnect/DappItem.tsx b/src/screens/walletConnect/DappItem.tsx
@@ -60,7 +60,7 @@ export const DappItem = ({
 const styles = StyleSheet.create({
   container: castStyle.view({
     flexDirection: 'row',
-    backgroundColor: sharedColors.inputInactive,
+    backgroundColor: sharedColors.background.secondary,
     borderRadius: 10,
     marginBottom: 12,
     alignItems: 'center',

diff --git a/src/shared/constants/index.ts b/src/shared/constants/index.ts
@@ -25,9 +25,6 @@ export const sharedColors = {
   danger: '#E94141',
   dangerLight: '#ED6060',
   white: '#FFFFFF',
-  inputInactive: '#252525',
-  inputActive: '#3A3A3A',
-  inputLabelColor: '#B8B8B8',
   borderColor: '#575757',
   labelLight: '#B8B8B8',
   subTitle: '#FBFBFB',