Skip to content

Commit

Permalink
Merge pull request #9072 from Expensify/update-staging-from-main
Browse files Browse the repository at this point in the history
Update version to 1.1.63-1 on staging
  • Loading branch information
OSBotify authored May 18, 2022
2 parents 4ecf59b + e20d535 commit 481c92f
Show file tree
Hide file tree
Showing 6 changed files with 21 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 @@ -152,8 +152,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
versionCode 1001016300
versionName "1.1.63-0"
versionCode 1001016301
versionName "1.1.63-1"
}
splits {
abi {
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.1.63.0</string>
<string>1.1.63.1</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.1.63.0</string>
<string>1.1.63.1</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion 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.1.63-0",
"version": "1.1.63-1",
"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
16 changes: 15 additions & 1 deletion src/pages/iou/IOUModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import CONST from '../../CONST';
import KeyboardAvoidingView from '../../components/KeyboardAvoidingView';
import * as PersonalDetails from '../../libs/actions/PersonalDetails';
import ROUTES from '../../ROUTES';
import networkPropTypes from '../../components/networkPropTypes';
import {withNetwork} from '../../components/OnyxProvider';

/**
* IOU modal for requesting money and splitting bills.
Expand All @@ -50,6 +52,9 @@ const propTypes = {
localCurrencyCode: PropTypes.string,
}),

/** Information about the network */
network: networkPropTypes.isRequired,

// Holds data related to IOU view state, rather than the underlying IOU data.
iou: PropTypes.shape({
/** Whether or not transaction creation has started */
Expand Down Expand Up @@ -138,11 +143,15 @@ class IOUModal extends Component {
}

componentDidMount() {
PersonalDetails.fetchLocalCurrency();
this.fetchData();
IOU.setIOUSelectedCurrency(this.props.myPersonalDetails.localCurrencyCode);
}

componentDidUpdate(prevProps) {
if (prevProps.network.isOffline && !this.props.network.isOffline) {
this.fetchData();
}

// Successfully close the modal if transaction creation has ended and there is no error
if (prevProps.iou.creatingIOUTransaction && !this.props.iou.creatingIOUTransaction && !this.props.iou.error) {
Navigation.dismissModal();
Expand Down Expand Up @@ -215,6 +224,10 @@ class IOUModal extends Component {
return this.props.translate(this.steps[currentStepIndex]) || '';
}

fetchData() {
PersonalDetails.fetchLocalCurrency();
}

/**
* Update comment whenever user enters any new text
*
Expand Down Expand Up @@ -453,6 +466,7 @@ IOUModal.defaultProps = defaultProps;

export default compose(
withLocalize,
withNetwork(),
withOnyx({
report: {
key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${lodashGet(route, 'params.reportID', '')}`,
Expand Down

0 comments on commit 481c92f

Please sign in to comment.