From d21251aa9323b8407d2aafa447eeb5f69a9c5eef Mon Sep 17 00:00:00 2001
From: Alberto <alberto@expensify.com>
Date: Tue, 27 Dec 2022 11:35:48 +0100
Subject: [PATCH 1/4] Pass style on focus

---
 src/components/DatePicker/index.android.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/DatePicker/index.android.js b/src/components/DatePicker/index.android.js
index e034af725c17..371619b29af0 100644
--- a/src/components/DatePicker/index.android.js
+++ b/src/components/DatePicker/index.android.js
@@ -5,6 +5,7 @@ import _ from 'underscore';
 import TextInput from '../TextInput';
 import CONST from '../../CONST';
 import {propTypes, defaultProps} from './datepickerPropTypes';
+import styles from "../../styles/styles";
 
 class DatePicker extends React.Component {
     constructor(props) {
@@ -48,7 +49,7 @@ class DatePicker extends React.Component {
                     value={dateAsText}
                     placeholder={this.props.placeholder}
                     errorText={this.props.errorText}
-                    containerStyles={this.props.containerStyles}
+                    containerStyles={[...this.props.containerStyles, this.state.isPickerVisible ? styles.borderColorFocus : []]}
                     onPress={this.showPicker}
                     editable={false}
                     disabled={this.props.disabled}

From 403c67172b4bb57f71bc7c6e6bc3552e6df040cc Mon Sep 17 00:00:00 2001
From: Alberto <alberto@expensify.com>
Date: Tue, 27 Dec 2022 11:36:48 +0100
Subject: [PATCH 2/4] move to inputcontainerstyles

---
 src/components/DatePicker/index.android.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/DatePicker/index.android.js b/src/components/DatePicker/index.android.js
index 371619b29af0..324de98c9050 100644
--- a/src/components/DatePicker/index.android.js
+++ b/src/components/DatePicker/index.android.js
@@ -49,7 +49,8 @@ class DatePicker extends React.Component {
                     value={dateAsText}
                     placeholder={this.props.placeholder}
                     errorText={this.props.errorText}
-                    containerStyles={[...this.props.containerStyles, this.state.isPickerVisible ? styles.borderColorFocus : []]}
+                    containerStyles={this.props.containerStyles}
+                    textInputContainerStyles={this.state.isPickerVisible ? [styles.borderColorFocus] : []}
                     onPress={this.showPicker}
                     editable={false}
                     disabled={this.props.disabled}

From a867f833b97dbb5e204184565211cc81d3709a5f Mon Sep 17 00:00:00 2001
From: Alberto <alberto@expensify.com>
Date: Tue, 27 Dec 2022 11:37:49 +0100
Subject: [PATCH 3/4] fix on iOS too

---
 src/components/DatePicker/index.ios.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/DatePicker/index.ios.js b/src/components/DatePicker/index.ios.js
index 062134ea468d..c9d076b7836b 100644
--- a/src/components/DatePicker/index.ios.js
+++ b/src/components/DatePicker/index.ios.js
@@ -75,6 +75,7 @@ class DatePicker extends React.Component {
                     placeholder={this.props.placeholder}
                     errorText={this.props.errorText}
                     containerStyles={this.props.containerStyles}
+                    textInputContainerStyles={this.state.isPickerVisible ? [styles.borderColorFocus] : []}
                     onPress={this.showPicker}
                     editable={false}
                     disabled={this.props.disabled}

From 76fadd18536f5cb79a01f3defb144b73b9e2ca95 Mon Sep 17 00:00:00 2001
From: Alberto <alberto@expensify.com>
Date: Tue, 27 Dec 2022 12:14:16 +0100
Subject: [PATCH 4/4] mstyle

---
 src/components/DatePicker/index.android.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/DatePicker/index.android.js b/src/components/DatePicker/index.android.js
index 324de98c9050..ec1f23f70bd6 100644
--- a/src/components/DatePicker/index.android.js
+++ b/src/components/DatePicker/index.android.js
@@ -5,7 +5,7 @@ import _ from 'underscore';
 import TextInput from '../TextInput';
 import CONST from '../../CONST';
 import {propTypes, defaultProps} from './datepickerPropTypes';
-import styles from "../../styles/styles";
+import styles from '../../styles/styles';
 
 class DatePicker extends React.Component {
     constructor(props) {