Skip to content

Commit d87f569

Browse files
mdneyazahmadmdneyazahmad
committed
fix: merge conflict
2 parents c93b4cb + 36a3b39 commit d87f569

File tree

143 files changed

+2700
-1863
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+2700
-1863
lines changed

‎.github/workflows/cherryPick.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ jobs:
148148
--body "🍒 Cherry pick https://github.com/Expensify/App/pull/${{ github.event.inputs.PULL_REQUEST_NUMBER }} to staging 🍒" \
149149
--label "automerge" \
150150
--base "staging"
151+
sleep 5
151152
echo "::set-output name=PR_NUMBER::$(gh pr view --json 'number' --jq '.number')"
152153
env:
153154
GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}

‎.github/workflows/platformDeploy.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,11 @@ jobs:
210210
command: npm ci
211211

212212
- name: Install cocoapods
213-
run: cd ios && pod install
213+
uses: nick-invision/retry@7c68161adf97a48beb850a595b8784ec57a98cbb
214+
with:
215+
timeout_minutes: 10
216+
max_attempts: 5
217+
command: cd ios && pod install
214218

215219
- name: Decrypt profile
216220
run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output chat_expensify_appstore.mobileprovision chat_expensify_appstore.mobileprovision.gpg

‎.github/workflows/updateProtectedBranch.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ jobs:
8686
--body "Update version to ${{ env.NEW_VERSION }}" \
8787
--label "automerge" \
8888
--base ${{ github.event.inputs.TARGET_BRANCH }}
89+
sleep 5
8990
echo "::set-output name=PR_NUMBER::$(gh pr view --json 'number' --jq '.number')"
9091
env:
9192
GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}

‎FORMS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,4 +210,4 @@ Form.js will automatically provide the following props to any input with the inp
210210
- defaultValue: The input default value.
211211
- errorText: The translated error text that is returned by validate for that specific input.
212212
- onBlur: An onBlur handler that calls validate.
213-
- onChange: An onChange handler that saves draft values and calls validate.
213+
- onInputChange: An onChange handler that saves draft values and calls validate for that input (inputA). Passing an inputID as a second param allows inputA to manipulate the input value of the provided inputID (inputB).

‎android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ android {
152152
minSdkVersion rootProject.ext.minSdkVersion
153153
targetSdkVersion rootProject.ext.targetSdkVersion
154154
multiDexEnabled rootProject.ext.multiDexEnabled
155-
versionCode 1001016103
156-
versionName "1.1.61-3"
155+
versionCode 1001017101
156+
versionName "1.1.71-1"
157157
}
158158
splits {
159159
abi {

‎assets/images/avatars/fallback-avatar.svg

Lines changed: 25 additions & 0 deletions
Loading

‎assets/images/avatars/fallback-workspace-avatar.svg

Lines changed: 15 additions & 0 deletions
Loading

‎assets/images/offline-cloud.svg

Lines changed: 5 additions & 0 deletions
Loading

‎config/webpack/webpack.common.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ const includeModules = [
1515
'react-native-webview',
1616
'@react-native-picker',
1717
'react-native-modal',
18-
'react-native-onyx',
1918
'react-native-gesture-handler',
2019
'react-native-flipper',
2120
'react-native-google-places-autocomplete',

‎desktop/notarize.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@ exports.default = function notarizing(context) {
1010
const appName = context.packager.appInfo.productFilename;
1111

1212
return notarize({
13+
tool: 'notarytool',
1314
appBundleId: electron.appId,
1415
appPath: `${appOutDir}/${appName}.app`,
1516
appleId: process.env.APPLE_ID,
1617
appleIdPassword: process.env.APPLE_ID_PASSWORD,
18+
teamId: '368M544MTT',
1719
});
1820
};

‎ios/NewExpensify/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.1.61</string>
20+
<string>1.1.71</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
3030
</dict>
3131
</array>
3232
<key>CFBundleVersion</key>
33-
<string>1.1.61.3</string>
33+
<string>1.1.71.1</string>
3434
<key>ITSAppUsesNonExemptEncryption</key>
3535
<false/>
3636
<key>LSApplicationQueriesSchemes</key>

‎ios/NewExpensifyTests/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
<key>CFBundlePackageType</key>
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.1.61</string>
18+
<string>1.1.71</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>1.1.61.3</string>
22+
<string>1.1.71.1</string>
2323
</dict>
2424
</plist>

‎ios/Podfile.lock

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,8 @@ PODS:
435435
- React-jsinspector (0.66.4)
436436
- React-logger (0.66.4):
437437
- glog
438+
- react-native-cameraroll (4.1.2):
439+
- React-Core
438440
- react-native-config (1.4.5):
439441
- react-native-config/App (= 1.4.5)
440442
- react-native-config/App (1.4.5):
@@ -445,7 +447,7 @@ PODS:
445447
- React-Core
446448
- react-native-image-picker (4.7.3):
447449
- React-Core
448-
- react-native-netinfo (8.0.0):
450+
- react-native-netinfo (8.3.0):
449451
- React-Core
450452
- react-native-pdf (6.2.2):
451453
- React-Core
@@ -535,7 +537,7 @@ PODS:
535537
- React-Core
536538
- RNCMaskedView (0.2.4):
537539
- React-Core
538-
- RNCPicker (1.9.11):
540+
- RNCPicker (2.3.1):
539541
- React-Core
540542
- RNDateTimePicker (3.5.2):
541543
- React-Core
@@ -659,6 +661,7 @@ DEPENDENCIES:
659661
- React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`)
660662
- React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`)
661663
- React-logger (from `../node_modules/react-native/ReactCommon/logger`)
664+
- "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)"
662665
- react-native-config (from `../node_modules/react-native-config`)
663666
- react-native-document-picker (from `../node_modules/react-native-document-picker`)
664667
- react-native-flipper (from `../node_modules/react-native-flipper`)
@@ -787,6 +790,8 @@ EXTERNAL SOURCES:
787790
:path: "../node_modules/react-native/ReactCommon/jsinspector"
788791
React-logger:
789792
:path: "../node_modules/react-native/ReactCommon/logger"
793+
react-native-cameraroll:
794+
:path: "../node_modules/@react-native-community/cameraroll"
790795
react-native-config:
791796
:path: "../node_modules/react-native-config"
792797
react-native-document-picker:
@@ -878,7 +883,7 @@ SPEC CHECKSUMS:
878883
Airship: 29d674abeac754f783fc46c7d383d6f046687341
879884
boost: a7c83b31436843459a1961bfd74b96033dc77234
880885
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
881-
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
886+
DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
882887
FBLazyVector: e5569e42a1c79ca00521846c223173a57aca1fe1
883888
FBReactNativeSpec: fe08c1cd7e2e205718d77ad14b34957cce949b58
884889
Firebase: 54cdc8bc9c9b3de54f43dab86e62f5a76b47034f
@@ -900,7 +905,7 @@ SPEC CHECKSUMS:
900905
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
901906
FlipperKit: d8d346844eca5d9120c17d441a2f38596e8ed2b9
902907
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
903-
glog: 73c2498ac6884b13ede40eda8228cb1eee9d9d62
908+
glog: 5337263514dd6f09803962437687240c5dc39aa4
904909
GoogleAppMeasurement: 6b6a08fd9c71f4dbc89e0e812acca81d797aa342
905910
GoogleDataTransport: 629c20a4d363167143f30ea78320d5a7eb8bd940
906911
GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1
@@ -930,11 +935,12 @@ SPEC CHECKSUMS:
930935
React-jsiexecutor: 94ce921e1d8ce7023366873ec371f3441383b396
931936
React-jsinspector: d0374f7509d407d2264168b6d0fad0b54e300b85
932937
React-logger: 933f80c97c633ee8965d609876848148e3fef438
938+
react-native-cameraroll: 60ac50a5209777cbccfe8d7a62d0743a9da87060
933939
react-native-config: 6502b1879f97ed5ac570a029961fc35ea606cd14
934940
react-native-document-picker: 772d04a4bc5c35da9abe27b08ac271420ae3f9ef
935941
react-native-flipper: cd9eabd8917104c1bbdca2621717cdca3b2addef
936942
react-native-image-picker: ae1202414bd5c37c00b2a701daa5b6194a06b7d9
937-
react-native-netinfo: 0124c0695373fce63cea24aeebb97ab2d237947a
943+
react-native-netinfo: ebbcd8fbe1a0ce7035e43cd18c5a545dcb93dd08
938944
react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f
939945
react-native-performance: 8edfa2bbc9a2af4a02f01d342118e413a95145e0
940946
react-native-plaid-link-sdk: 9e0ebdaed648a237b36d5f6f6292b5147af92da7
@@ -958,7 +964,7 @@ SPEC CHECKSUMS:
958964
RNCAsyncStorage: 8324611026e8dc3706f829953aa6e3899f581589
959965
RNCClipboard: 5e299c6df8e0c98f3d7416b86ae563d3a9f768a3
960966
RNCMaskedView: 138134c4d8a9421b4f2bf39055a79aa05c2d47b1
961-
RNCPicker: 6780c753e9e674065db90d9c965920516402579d
967+
RNCPicker: f6c760d4b314585ff35165d8640d7917ae30afb1
962968
RNDateTimePicker: c9911be59b1f8670b9f244b85af3a7c295e175ed
963969
RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7
964970
RNFBAnalytics: 8ba84c2d31c64374d054c8621b998f25145ffddc
@@ -979,4 +985,4 @@ SPEC CHECKSUMS:
979985

980986
PODFILE CHECKSUM: 431123d7514c52fa4516724b89c20d02c87ad8c8
981987

982-
COCOAPODS: 1.11.2
988+
COCOAPODS: 1.10.1

0 commit comments

Comments
 (0)