Skip to content

Update version to 1.0.66-13 on staging #3531

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

Merged
merged 59 commits into from
Jun 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
14af0ab
added file type check
parasharrajat Jun 3, 2021
266fc19
localized error
parasharrajat Jun 4, 2021
e37cb15
update Permissions logic to fix IOU regression
Julesssss Jun 9, 2021
3683b11
bump Onyx commit to fix IOU regression
Julesssss Jun 9, 2021
64f1307
Merge pull request #3481 from Expensify/jules-iouFixPermissionsRegres…
roryabraham Jun 9, 2021
bf29bbe
Merge branch 'main' into jules-bumpOnyxToFixRegression
Julesssss Jun 9, 2021
d5a77f5
Use hrefAttrs for links
marcaaron Jun 9, 2021
48e39fb
Merge pull request #3483 from Expensify/jules-bumpOnyxToFixRegression
Jun 9, 2021
8a254ee
Merge pull request #3486 from Expensify/marcaaron-fixAnchorsInComments
AndrewGable Jun 9, 2021
63ccda7
Update version to 1.0.66-1
Jun 9, 2021
f32bd7d
Merge pull request #3489 from Expensify/version-BUILD-8a254ee6396fe62…
OSBotify Jun 9, 2021
4f0ee3c
Single brackets not double brackets
roryabraham Jun 9, 2021
bac6769
Merge pull request #3491 from Expensify/Rory-FixCPConditional
AndrewGable Jun 9, 2021
eb66e02
Update version to 1.0.66-2
Jun 9, 2021
326917a
Merge pull request #3492 from Expensify/version-BUILD-bac6769833e9478…
OSBotify Jun 9, 2021
8e5ee09
Push changes before trying to create CP branch
roryabraham Jun 9, 2021
5e041b5
Merge pull request #3493 from Expensify/Rory-PushChangesToCPBranch
AndrewGable Jun 9, 2021
5d19798
Update version to 1.0.66-3
Jun 9, 2021
22e586f
Merge pull request #3494 from Expensify/version-BUILD-5e041b5536e83a4…
OSBotify Jun 9, 2021
fdc4c01
Update version to 1.0.66-4
Jun 9, 2021
c185800
Merge pull request #3496 from Expensify/version-BUILD-22e586f4680504f…
OSBotify Jun 9, 2021
c3cd696
Update version to 1.0.66-5
Jun 9, 2021
0a90b0f
Merge pull request #3500 from Expensify/version-BUILD-c1858001ab8b80e…
OSBotify Jun 9, 2021
91353e6
Fix line breaks in homepage texts
tugbadogan Jun 9, 2021
e9371f6
Update UrbanAirship version
Jag96 Jun 10, 2021
0d3ee13
Merge pull request #3502 from tugbadogan/tugbadogan-fix-textlink-regr…
francoisl Jun 10, 2021
445f170
Update version to 1.0.66-6
Jun 10, 2021
e05f004
Merge pull request #3505 from Expensify/version-BUILD-0d3ee13aa335ae6…
OSBotify Jun 10, 2021
9963819
update pods
Jag96 Jun 10, 2021
6078f11
re-build pods
Jag96 Jun 10, 2021
92429b5
Merge pull request #3332 from parasharrajat/video-fail
Jun 10, 2021
c335b92
Update version to 1.0.66-7
Jun 10, 2021
1951973
Merge pull request #3509 from Expensify/version-BUILD-92429b5411bc8d0…
OSBotify Jun 10, 2021
09b7e0a
[IS-3218] Fixed cursor issue
aliabbasmalik8 Jun 10, 2021
afb44ff
Quit early when persistedRequests is empty
Jun 10, 2021
2290e28
Merge pull request #3508 from Expensify/joe-upgrade-ua
TomatoToaster Jun 10, 2021
345c8c5
Update version to 1.0.66-8
Jun 10, 2021
103397d
Merge pull request #3516 from Expensify/version-BUILD-2290e2803d8d8d5…
OSBotify Jun 10, 2021
8abd528
fix: argument order
parasharrajat Jun 10, 2021
192b06d
Merge pull request #3510 from aliabbasmalik8/IS-3218-cursor-issue-edi…
Jun 10, 2021
f812fb6
Update version to 1.0.66-9
Jun 10, 2021
5f994c4
Merge pull request #3519 from Expensify/version-BUILD-192b06d7c6b70ea…
OSBotify Jun 10, 2021
4f52861
fix: betas for participant pages
parasharrajat Jun 10, 2021
56f152a
Keep original logic and move didLoad persisted call
Jun 10, 2021
c9146a4
Merge pull request #3511 from Expensify/amal-net-queue-exit
marcaaron Jun 10, 2021
42ad617
Update version to 1.0.66-10
Jun 10, 2021
b2b5643
Merge pull request #3520 from Expensify/version-BUILD-c9146a4bcf56402…
OSBotify Jun 10, 2021
649b3ca
Update staging,prod from a separate branch to auto-resolve conflicts
roryabraham Jun 10, 2021
655730f
Merge pull request #3517 from parasharrajat/betas
Jun 10, 2021
0c5dedb
Update version to 1.0.66-11
Jun 10, 2021
7af1c2d
Merge pull request #3522 from Expensify/version-BUILD-655730f3c39e62d…
OSBotify Jun 10, 2021
2d1f217
Merge pull request #3521 from Expensify/Rory-FixUpdateStagingMergeCon…
Jag96 Jun 10, 2021
f0194e9
Update version to 1.0.66-12
Jun 10, 2021
a38fe91
Merge pull request #3528 from Expensify/version-BUILD-2d1f217bf4b8c4b…
OSBotify Jun 10, 2021
236f537
Add committer name
roryabraham Jun 10, 2021
b2f30c6
Merge pull request #3529 from Expensify/Rory-AddCommiterName
Jag96 Jun 10, 2021
513f5bd
Update version to 1.0.66-13
Jun 10, 2021
07cc9d9
Merge pull request #3530 from Expensify/version-BUILD-b2f30c67d0da0c8…
OSBotify Jun 10, 2021
faa4d75
Merge branch 'main' into update-staging-from-main
Jun 10, 2021
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
5 changes: 4 additions & 1 deletion .github/workflows/cherryPick.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:

- name: Save correct NEW_VERSION to env
run: |
if [[ -z ${{ github.event.inputs.NEW_VERSION }} ]]; then
if [ -z ${{ github.event.inputs.NEW_VERSION }} ]; then
echo "NEW_VERSION=${{ needs.createNewVersion.outputs.NEW_VERSION }}" >> $GITHUB_ENV
echo "New version is ${{ env.NEW_VERSION }}"
else
Expand Down Expand Up @@ -120,6 +120,9 @@ jobs:
echo "::set-output name=SHOULD_AUTOMERGE::false"
fi

- name: Push changes to CP branch
run: git push

- name: Create Pull Request
id: createPullRequest
# Version: 2.4.3
Expand Down
26 changes: 18 additions & 8 deletions .github/workflows/updateProtectedBranch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ jobs:
echo "Cannot update main branch without specifying a source branch"
exit 1

# If updating staging, the head branch will always be main
# If updating production, the head branch will always be staging
# If updating staging, the source branch will always be main
# If updating production, the source branch will always be staging
- name: Set source branch
run: |
if [[ ${{ github.event.inputs.TARGET_BRANCH }} == 'staging' ]]; then
echo "HEAD_BRANCH=main" >> $GITHUB_ENV
echo "SOURCE_BRANCH=main" >> $GITHUB_ENV
elif [[ ${{ github.event.inputs.TARGET_BRANCH }} == 'production' ]]; then
echo "HEAD_BRANCH=staging" >> $GITHUB_ENV
echo "SOURCE_BRANCH=staging" >> $GITHUB_ENV
else
echo "HEAD_BRANCH=${{ github.event.inputs.SOURCE_BRANCH }}" >> $GITHUB_ENV
echo "SOURCE_BRANCH=${{ github.event.inputs.SOURCE_BRANCH }}" >> $GITHUB_ENV
fi

# Version: 2.3.4
Expand All @@ -48,18 +48,28 @@ jobs:
fetch-depth: 0
token: ${{ secrets.OS_BOTIFY_TOKEN }}

- name: Checkout head branch
run: git checkout ${{ env.HEAD_BRANCH }}
- name: Checkout source branch
run: git checkout ${{ env.SOURCE_BRANCH }}

- name: Set New Version
run: echo "NEW_VERSION=$(npm run print-version --silent)" >> $GITHUB_ENV

- name: Create temporary branch to resolve conflicts
if: ${{ contains(fromJSON('["staging", "production"]'), github.event.inputs.TARGET_BRANCH) }}
run: |
git config user.name ${{ github.actor }}
git checkout ${{ github.event.inputs.TARGET_BRANCH }}
git checkout -b update-${{ github.event.inputs.TARGET_BRANCH }}-from-${{ env.SOURCE_BRANCH }}
git merge -Xtheirs ${{ env.SOURCE_BRANCH }}
git push --set-upstream origin update-${{ github.event.inputs.TARGET_BRANCH }}-from-${{ env.SOURCE_BRANCH }}
echo "SOURCE_BRANCH=update-${{ github.event.inputs.TARGET_BRANCH }}-from-${{ env.SOURCE_BRANCH }}" >> $GITHUB_ENV

- name: Create Pull Request
id: createPullRequest
# Version: 2.4.3
uses: repo-sync/pull-request@65194d8015be7624d231796ddee1cd52a5023cb3
with:
source_branch: ${{ env.HEAD_BRANCH }}
source_branch: ${{ env.SOURCE_BRANCH }}
destination_branch: ${{ github.event.inputs.TARGET_BRANCH }}
github_token: ${{ secrets.OS_BOTIFY_TOKEN }}
pr_title: Update version to ${{ env.NEW_VERSION }} on ${{ github.event.inputs.TARGET_BRANCH }}
Expand Down
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 1001006605
versionName "1.0.66-5"
versionCode 1001006613
versionName "1.0.66-13"
}
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.66.5</string>
<string>1.0.66.13</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.66.5</string>
<string>1.0.66.13</string>
</dict>
</plist>
32 changes: 16 additions & 16 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
PODS:
- Airship (14.2.0):
- Airship/Automation (= 14.2.0)
- Airship/Core (= 14.2.0)
- Airship/ExtendedActions (= 14.2.0)
- Airship/MessageCenter (= 14.2.0)
- Airship/Automation (14.2.0):
- Airship (14.3.0):
- Airship/Automation (= 14.3.0)
- Airship/Core (= 14.3.0)
- Airship/ExtendedActions (= 14.3.0)
- Airship/MessageCenter (= 14.3.0)
- Airship/Automation (14.3.0):
- Airship/Core
- Airship/Core (14.2.0)
- Airship/ExtendedActions (14.2.0):
- Airship/Core (14.3.0)
- Airship/ExtendedActions (14.3.0):
- Airship/Core
- Airship/MessageCenter (14.2.0):
- Airship/MessageCenter (14.3.0):
- Airship/Core
- boost-for-react-native (1.63.0)
- CocoaAsyncSocket (7.6.5)
Expand Down Expand Up @@ -494,8 +494,8 @@ PODS:
- React-Core
- RNSVG (12.1.0):
- React
- urbanairship-react-native (10.0.0):
- Airship (= 14.2.0)
- urbanairship-react-native (11.0.1):
- Airship (= 14.3.0)
- React-Core
- Yoga (1.14.0)
- YogaKit (1.18.1):
Expand Down Expand Up @@ -728,12 +728,12 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
Airship: 02ad73780f9eed21870e36b0aaab327acda6a102
Airship: 7609d263d3a207f112d6db066af5852b80af6819
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
DoubleConversion: cde416483dac037923206447da6e1454df403714
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
FBLazyVector: 7b423f9e248eae65987838148c36eec1dbfe0b53
FBReactNativeSpec: 884d4cc2b011759361797a4035c47e10099393b5
FBReactNativeSpec: 825b0f0851f5cc5c6268a920286281f62fc96c37
Firebase: c23a36d9e4cdf7877dfcba8dd0c58add66358999
FirebaseAnalytics: 3bb096873ee0d7fa4b6c70f5e9166b6da413cc7f
FirebaseCore: d3a978a3cfa3240bf7e4ba7d137fdf5b22b628ec
Expand All @@ -747,7 +747,7 @@ SPEC CHECKSUMS:
Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
Flipper-RSocket: 127954abe8b162fcaf68d2134d34dc2bd7076154
FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00
glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
GoogleAppMeasurement: a6a3a066369828db64eda428cb2856dc1cdc7c4e
GoogleDataTransport: f56af7caa4ed338dc8e138a5d7c5973e66440833
GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3
Expand Down Expand Up @@ -808,7 +808,7 @@ SPEC CHECKSUMS:
RNReanimated: b8c8004b43446e3c2709fe64b2b41072f87428ad
RNScreens: e8e8dd0588b5da0ab57dcca76ab9b2d8987757e0
RNSVG: ce9d996113475209013317e48b05c21ee988d42e
urbanairship-react-native: dfb6dc22b2f41ccaadd636b73d51b448cd1b2bbc
urbanairship-react-native: d415a12e67ba93bf3ce914df9a310b66a88a5cc3
Yoga: a7de31c64fe738607e7a3803e3f591a4b1df7393
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
"version": "1.0.66-5",
"version": "1.0.66-13",
"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 Expand Up @@ -97,7 +97,7 @@
"rn-fetch-blob": "^0.12.0",
"save": "^2.4.0",
"underscore": "^1.10.2",
"urbanairship-react-native": "^10.0.0"
"urbanairship-react-native": "^11.0.1"
},
"devDependencies": {
"@actions/core": "^1.2.6",
Expand Down
2 changes: 2 additions & 0 deletions src/CONST.js
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,8 @@ const CONST = {
WARNING: 'warning',
DURATION: 2000,
},

DEFAULT_LOCALE: 'en',
};

export default CONST;
3 changes: 2 additions & 1 deletion src/components/withLocalize.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {translate} from '../libs/translate';
import DateUtils from '../libs/DateUtils';
import {toLocalPhone, fromLocalPhone} from '../libs/LocalePhoneNumber';
import numberFormat from '../libs/numberFormat';
import CONST from '../CONST';

const withLocalizePropTypes = {
/** Returns translated string for given locale and phrase */
Expand Down Expand Up @@ -66,7 +67,7 @@ function withLocalizeHOC(WrappedComponent) {
]),
};
WithLocalize.defaultProps = {
preferredLocale: 'en',
preferredLocale: CONST.DEFAULT_LOCALE,
forwardedRef: undefined,
};
return React.forwardRef((props, ref) => (
Expand Down
3 changes: 2 additions & 1 deletion src/languages/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ export default {
addAttachment: 'Add Attachment',
writeSomething: 'Write something...',
youAppearToBeOffline: 'You appear to be offline.',
fileUploadFailed: 'Upload Failed. File is not supported.',
},
reportActionContextMenu: {
copyToClipboard: 'Copy to Clipboard',
Expand Down Expand Up @@ -220,7 +221,7 @@ export default {
phrase2: 'terms of service',
phrase3: 'and',
phrase4: 'privacy policy',
phrase5: '. Money transmission is provided by Expensify Payments LLC (NMLS ID:2017010) pursuant to its',
phrase5: 'Money transmission is provided by Expensify Payments LLC (NMLS ID:2017010) pursuant to its',
phrase6: 'licenses',
},
passwordForm: {
Expand Down
2 changes: 1 addition & 1 deletion src/languages/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ export default {
phrase2: 'términos de servicio',
phrase3: 'y',
phrase4: 'política de privacidad',
phrase5: '. El envío de dinero es brindado por Expensify Payments LLC (NMLS ID:2017010) de conformidad con sus',
phrase5: 'El envío de dinero es brindado por Expensify Payments LLC (NMLS ID:2017010) de conformidad con sus',
phrase6: 'licencias',
},
passwordForm: {
Expand Down
2 changes: 1 addition & 1 deletion src/libs/Network.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ Onyx.connect({
// Merge the persisted requests with the requests in memory then clear out the queue as we only need to load
// this once when the app initializes
networkRequestQueue = [...networkRequestQueue, ...persistedRequests];
Onyx.set(ONYXKEYS.NETWORK_REQUEST_QUEUE, []);
didLoadPersistedRequests = true;
Onyx.set(ONYXKEYS.NETWORK_REQUEST_QUEUE, []);
},
});

Expand Down
24 changes: 23 additions & 1 deletion src/libs/actions/Report.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import Log from '../Log';
import {isReportMessageAttachment, sortReportsByLastVisited} from '../reportUtils';
import Timers from '../Timers';
import {dangerouslyGetReportActionsMaxSequenceNumber, isReportMissingActions} from './ReportActions';
import Growl from '../Growl';
import {translate} from '../translate';

let currentUserEmail;
let currentUserAccountID;
Expand Down Expand Up @@ -57,6 +59,16 @@ Onyx.connect({
},
});

let translateLocal = (phrase, variables) => translate(CONST.DEFAULT_LOCALE, phrase, variables);
Onyx.connect({
key: ONYXKEYS.PREFERRED_LOCALE,
callback: (preferredLocale) => {
if (preferredLocale) {
translateLocal = (phrase, variables) => translate(preferredLocale, phrase, variables);
}
},
});

const typingWatchTimers = {};

/**
Expand Down Expand Up @@ -1043,7 +1055,17 @@ function addAction(reportID, text, file) {
// the same way report actions can.
persist: !isAttachment,
})
.then(({reportAction}) => updateReportWithNewAction(reportID, reportAction));
.then((response) => {
if (response.jsonCode === 408) {
Growl.show(translateLocal('reportActionCompose.fileUploadFailed'), CONST.GROWL.ERROR);
Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {
[optimisticReportActionID]: null,
});
console.error(response.message);
return;
}
updateReportWithNewAction(reportID, response.reportAction);
});
}

/**
Expand Down
4 changes: 3 additions & 1 deletion src/libs/translate.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import Str from 'expensify-common/lib/str';
import Log from './Log';
import Config from '../CONFIG';
import translations from '../languages/translations';
import CONST from '../CONST';

/**
* Return translated string for given locale and phrase
Expand All @@ -12,7 +13,8 @@ import translations from '../languages/translations';
* @param {Object} [variables]
* @returns {String}
*/
function translate(locale = 'en', phrase, variables = {}) {
// eslint-disable-next-line no-undef
function translate(locale = CONST.DEFAULT_LOCALE, phrase, variables = {}) {
const localeLanguage = locale.substring(0, 2);
const fullLocale = lodashGet(translations, locale, {});
const language = lodashGet(translations, localeLanguage, {});
Expand Down
2 changes: 2 additions & 0 deletions src/pages/NewChatPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class NewChatPage extends Component {
props.reports,
props.personalDetails,
'',
false,
props.betas,
);

Expand Down Expand Up @@ -153,6 +154,7 @@ class NewChatPage extends Component {
this.props.reports,
this.props.personalDetails,
searchValue,
false,
this.props.betas,
);
this.setState({
Expand Down
2 changes: 2 additions & 0 deletions src/pages/home/report/ReportActionItemMessageEdit.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ class ReportActionItemMessageEdit extends React.Component {
* @param {String} newDraft
*/
updateDraft(newDraft) {
this.textInput.setNativeProps({text: newDraft});
const trimmedNewDraft = newDraft.trim();
this.setState({draft: trimmedNewDraft});
this.debouncedSaveDraft(trimmedNewDraft);
Expand Down Expand Up @@ -113,6 +114,7 @@ class ReportActionItemMessageEdit extends React.Component {
<View style={[styles.chatItemComposeBox, styles.flexRow, styles.chatItemComposeBoxColor]}>
<TextInputFocusable
multiline
ref={el => this.textInput = el}
onChangeText={this.updateDraft} // Debounced saveDraftComment
onKeyPress={this.triggerSaveOrCancel}
defaultValue={this.props.draftMessage}
Expand Down
Loading