Skip to content

Commit

Permalink
Merge pull request #3396 from Expensify/main
Browse files Browse the repository at this point in the history
  • Loading branch information
OSBotify authored Jun 7, 2021
2 parents 8c55edb + 0622b3d commit 36b8f51
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 7 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001006301
versionName "1.0.63-1"
versionCode 1001006302
versionName "1.0.63-2"
}
splits {
abi {
Expand Down
2 changes: 1 addition & 1 deletion ios/ExpensifyCash/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.0.63.1</string>
<string>1.0.63.2</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/ExpensifyCashTests/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.0.63.1</string>
<string>1.0.63.2</string>
</dict>
</plist>
5 changes: 3 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": "expensify.cash",
"version": "1.0.63-1",
"version": "1.0.63-2",
"author": "Expensify, Inc.",
"homepage": "https://expensify.cash",
"description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
Expand Down
1 change: 1 addition & 0 deletions src/languages/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ export default {
payPalMe: 'PayPal.me/',
yourPayPalUsername: 'Your PayPal username',
addPayPalAccount: 'Add PayPal Account',
growlMessageOnSave: 'Your PayPal username was successfully added',
},
preferencesPage: {
mostRecent: 'Most Recent',
Expand Down
6 changes: 6 additions & 0 deletions src/pages/settings/PaymentsPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import styles from '../../styles/styles';
import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
import compose from '../../libs/compose';
import Button from '../../components/Button';
import Growl from '../../libs/Growl';

const propTypes = {
/** Username for PayPal.Me */
Expand Down Expand Up @@ -54,6 +55,7 @@ class PaymentsPage extends React.Component {
*/
setPayPalMeUsername() {
NameValuePair.set(CONST.NVP.PAYPAL_ME_ADDRESS, this.state.payPalMeUsername, ONYXKEYS.NVP_PAYPAL_ME_ADDRESS);
Growl.show(this.props.translate('paymentsPage.growlMessageOnSave'), CONST.GROWL.SUCCESS, 3000);
}

render() {
Expand All @@ -74,14 +76,18 @@ class PaymentsPage extends React.Component {
{this.props.translate('paymentsPage.payPalMe')}
</Text>
<TextInput
autoCompleteType="off"
autoCorrect={false}
style={[styles.textInput]}
value={this.state.payPalMeUsername}
placeholder={this.props.translate('paymentsPage.yourPayPalUsername')}
onChangeText={text => this.setState({payPalMeUsername: text})}
editable={!this.props.payPalMeUsername}
/>
</View>
<Button
success
isDisabled={this.props.payPalMeUsername}
onPress={this.setPayPalMeUsername}
style={[styles.mt3]}
text={this.props.translate('paymentsPage.addPayPalAccount')}
Expand Down

0 comments on commit 36b8f51

Please sign in to comment.