Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🍒 Cherry pick PR #13174 to staging 🍒 #13176

Merged
merged 2 commits into from
Nov 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001023305
versionName "1.2.33-5"
versionCode 1001023307
versionName "1.2.33-7"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()

if (isNewArchitectureEnabled()) {
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensify/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.2.33.5</string>
<string>1.2.33.7</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/NewExpensifyTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.2.33.5</string>
<string>1.2.33.7</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
"version": "1.2.33-5",
"version": "1.2.33-7",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
Expand Down
24 changes: 22 additions & 2 deletions src/components/Picker/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ import Icon from '../Icon';
import * as Expensicons from '../Icon/Expensicons';
import FormHelpMessage from '../FormHelpMessage';
import Text from '../Text';
import CONST from '../../CONST';
import styles from '../../styles/styles';
import pickerStyles from './pickerStyles';
import getOperatingSystem from '../../libs/getOperatingSystem';

const propTypes = {
/** Picker label */
Expand Down Expand Up @@ -102,10 +104,28 @@ class Picker extends PureComponent {
};

this.onInputChange = this.onInputChange.bind(this);
this.placeholder = this.props.placeholder;
this.items = this.props.items;
}

componentDidMount() {
this.setDefaultValue();

// Windows will reuse the text color of the select for each one of the options
// so we might need to color accordingly so it doesn't blend with the background.
if (getOperatingSystem() === CONST.OS.WINDOWS) {
this.placeholder = _.isEmpty(this.placeholder) ? {} : {
...this.placeholder,
color: '#002140',
};

this.items = _.map(this.items, item => (
{
...item,
color: '#002140',
}
));
}
}

componentDidUpdate(prevProps) {
Expand Down Expand Up @@ -157,10 +177,10 @@ class Picker extends PureComponent {
)}
<RNPickerSelect
onValueChange={this.onInputChange}
items={this.props.items}
items={this.items}
style={this.props.size === 'normal' ? pickerStyles(this.props.isDisabled) : styles.pickerSmall}
useNativeAndroidPickerStyle={false}
placeholder={this.props.placeholder}
placeholder={this.placeholder}
value={this.props.value}
Icon={() => this.props.icon(this.props.size)}
disabled={this.props.isDisabled}
Expand Down