fix Locale Picker and small picker styles

Expensify · Aug 24, 2021 · bf73f5c · bf73f5c
1 parent 396e320
commit bf73f5c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/src/components/ExpensiPicker.js b/src/components/ExpensiPicker.js
@@ -1,4 +1,4 @@
-import React, {PureComponent} from 'react';
+import React, {Component} from 'react';
 import {Text, View} from 'react-native';
 import PropTypes from 'prop-types';
 import Picker from './Picker';
@@ -17,7 +17,7 @@ const defaultProps = {
     isDisabled: false,
 };
 
-class ExpensiPicker extends PureComponent {
+class ExpensiPicker extends Component {
     constructor() {
         super();
         this.state = {

diff --git a/src/components/Picker/index.js b/src/components/Picker/index.js
@@ -28,6 +28,10 @@ const Picker = ({
         fixAndroidTouchableBug
         onOpen={onOpen}
         onClose={onClose}
+        pickerProps={{
+            onFocus: onOpen,
+            onBlur: onClose,
+        }}
     />
 );
 

diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
@@ -36,7 +36,9 @@ function setCurrentURL(url) {
 * @param {String} locale
 */
 function setLocale(locale) {
-    API.PreferredLocale_Update({name: 'preferredLocale', value: locale});
+    if (currentUserAccountID) {
+        API.PreferredLocale_Update({name: 'preferredLocale', value: locale});
+    }
     Onyx.merge(ONYXKEYS.NVP_PREFERRED_LOCALE, locale);
 }
 

diff --git a/src/styles/styles.js b/src/styles/styles.js
@@ -370,6 +370,7 @@ const styles = {
             borderRadius: variables.componentBorderRadius,
             borderWidth: 1,
             borderColor: themeColors.border,
+            borderStyle: 'solid',
             color: themeColors.text,
             height: variables.componentSizeSmall,
             opacity: 1,
@@ -385,6 +386,7 @@ const styles = {
             borderWidth: 1,
             borderRadius: variables.componentBorderRadius,
             borderColor: themeColors.border,
+            borderStyle: 'solid',
             color: themeColors.text,
             appearance: 'none',
             height: variables.componentSizeSmall,
@@ -402,6 +404,7 @@ const styles = {
             borderWidth: 1,
             borderRadius: variables.componentBorderRadius,
             borderColor: themeColors.border,
+            borderStyle: 'solid',
             color: themeColors.text,
             height: variables.componentSizeSmall,
             opacity: 1,