Merge remote-tracking branch 'origin/development' into sa/qr-purchase

src/components/horizontalIconList/horizontalIconListStyles.js

@@ -33,7 +33,7 @@ export default EStyleSheet.create({
   },
   icon: {
     fontSize: 24,
-    color: '$primaryDarkText',
+    color: '$darkGrayBackground',
   },
   badge: {
     position: 'absolute',

src/components/toastNotification/view/toastNotificationStyles.js

@@ -11,7 +11,7 @@ export default EStyleSheet.create({
     minWidth: '$deviceWidth / 1.9',
     height: 44,
     borderRadius: 30,
-    backgroundColor: '$primaryDarkText',
+    backgroundColor: '$darkGrayBackground',
     margin: 5,
     shadowOffset: {
       height: 5,

src/screens/coinDetails/children/rangeSelector.tsx

@@ -28,7 +28,7 @@ export const RangeSelector = ({range, onRangeChange}:RangeSelectorProps) => {
                 ...styles.rangeOptionWrapper, 
                 backgroundColor: EStyleSheet.value(
                         item.value === range ? 
-                            '$primaryDarkText':'$primaryLightBackground'
+                            '$darkGrayBackground':'$primaryLightBackground'
                     ) 
                 }}>
                 <Text style={{

src/screens/editor/children/postOptionsModal.tsx

@@ -7,7 +7,6 @@ import styles from './postOptionsModalStyles';
 import ThumbSelectionContent from './thumbSelectionContent';
 import {View as AnimatedView} from 'react-native-animatable';
 import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
-import EStyleSheet from 'react-native-extended-stylesheet';
 
 const REWARD_TYPES = [
   {
@@ -224,7 +223,7 @@ const PostOptionsModal =  forwardRef(({
         </KeyboardAwareScrollView>
 
         <MainButton
-          style={{...styles.saveButton, backgroundColor:EStyleSheet.value(disableDone?'$primaryDarkGray':'$primaryBlue') }}
+          style={{...styles.saveButton }}
           isDisable={disableDone}
           onPress={_onDonePress}
           text={intl.formatMessage({id:"editor.done"})}

src/screens/editor/children/postOptionsModalStyles.ts

@@ -68,7 +68,6 @@ export default EStyleSheet.create({
         color:'$pureWhite'
     } as TextStyle,
     saveButton:{
-        backgroundColor:'$primaryBlue',
         width:150,
         paddingVertical:16,
         borderRadius:32,

src/screens/wallet/children/children.styles.ts

@@ -79,7 +79,7 @@ export default EStyleSheet.create({
     backgroundColor: '$primaryBackgroundColor',
   },
   dotStyle: {
-    backgroundColor: '$primaryDarkText',
+    backgroundColor: '$darkGrayBackground',
   },
   chartContainer: {
     height: 112,

src/themes/darkTheme.js

@@ -8,6 +8,7 @@ export default {
   $primaryLightBackground: '#2e3d51',
   $primaryGrayBackground: '#1e2835',
   $primaryWhiteLightBackground: '#2e3d51',
+  $darkGrayBackground: '#526d91',
   $modalBackground: '#1e2835',
   $white: '#1e2835',
   $black: '#000000',

src/themes/lightTheme.js

@@ -8,6 +8,7 @@ export default {
   $primaryLightBackground: '#f6f6f6',
   $primaryGrayBackground: '#f5f5f5',
   $primaryWhiteLightBackground: '#ffffff',
+  $darkGrayBackground: '#788187',
   $modalBackground: '#ededed',
   $white: '#FFFFFF',
   $black: '#000000',