Skip to content

Commit 045b07d

Browse files
committed
Merge branch 'main' of https://github.com/margelo/expensify-app-fork into feat/#Expensify#23220-bidirectional-pagination
2 parents e6f23df + f700942 commit 045b07d

File tree

117 files changed

+1097
-1118
lines changed

Some content is hidden

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

117 files changed

+1097
-1118
lines changed

Gemfile.lock

+42-43
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ GEM
99
minitest (>= 5.1)
1010
tzinfo (~> 2.0)
1111
zeitwerk (~> 2.3)
12-
addressable (2.8.3)
12+
addressable (2.8.5)
1313
public_suffix (>= 2.0.2, < 6.0)
1414
algoliasearch (1.27.5)
1515
httpclient (~> 2.8, >= 2.8.3)
@@ -19,20 +19,20 @@ GEM
1919
artifactory (3.0.15)
2020
atomos (0.1.3)
2121
aws-eventstream (1.2.0)
22-
aws-partitions (1.646.0)
23-
aws-sdk-core (3.160.0)
22+
aws-partitions (1.824.0)
23+
aws-sdk-core (3.181.1)
2424
aws-eventstream (~> 1, >= 1.0.2)
25-
aws-partitions (~> 1, >= 1.525.0)
26-
aws-sigv4 (~> 1.1)
25+
aws-partitions (~> 1, >= 1.651.0)
26+
aws-sigv4 (~> 1.5)
2727
jmespath (~> 1, >= 1.6.1)
28-
aws-sdk-kms (1.58.0)
29-
aws-sdk-core (~> 3, >= 3.127.0)
28+
aws-sdk-kms (1.71.0)
29+
aws-sdk-core (~> 3, >= 3.177.0)
3030
aws-sigv4 (~> 1.1)
31-
aws-sdk-s3 (1.114.0)
32-
aws-sdk-core (~> 3, >= 3.127.0)
31+
aws-sdk-s3 (1.134.0)
32+
aws-sdk-core (~> 3, >= 3.181.0)
3333
aws-sdk-kms (~> 1)
34-
aws-sigv4 (~> 1.4)
35-
aws-sigv4 (1.5.2)
34+
aws-sigv4 (~> 1.6)
35+
aws-sigv4 (1.6.0)
3636
aws-eventstream (~> 1, >= 1.0.2)
3737
babosa (1.0.4)
3838
claide (1.1.0)
@@ -79,7 +79,7 @@ GEM
7979
highline (~> 2.0.0)
8080
concurrent-ruby (1.2.2)
8181
declarative (0.0.20)
82-
digest-crc (0.6.4)
82+
digest-crc (0.6.5)
8383
rake (>= 12.0.0, < 14.0.0)
8484
domain_name (0.5.20190701)
8585
unf (>= 0.0.5, < 1.0.0)
@@ -88,8 +88,8 @@ GEM
8888
escape (0.0.4)
8989
ethon (0.16.0)
9090
ffi (>= 1.15.0)
91-
excon (0.93.0)
92-
faraday (1.10.2)
91+
excon (0.103.0)
92+
faraday (1.10.3)
9393
faraday-em_http (~> 1.0)
9494
faraday-em_synchrony (~> 1.0)
9595
faraday-excon (~> 1.1)
@@ -117,8 +117,8 @@ GEM
117117
faraday-retry (1.0.3)
118118
faraday_middleware (1.2.0)
119119
faraday (~> 1.0)
120-
fastimage (2.2.6)
121-
fastlane (2.210.1)
120+
fastimage (2.2.7)
121+
fastlane (2.215.1)
122122
CFPropertyList (>= 2.3, < 4.0.0)
123123
addressable (>= 2.8, < 3.0.0)
124124
artifactory (~> 3.0)
@@ -139,18 +139,19 @@ GEM
139139
google-apis-playcustomapp_v1 (~> 0.1)
140140
google-cloud-storage (~> 1.31)
141141
highline (~> 2.0)
142+
http-cookie (~> 1.0.5)
142143
json (< 3.0.0)
143144
jwt (>= 2.1.0, < 3)
144145
mini_magick (>= 4.9.4, < 5.0.0)
145-
multipart-post (~> 2.0.0)
146+
multipart-post (>= 2.0.0, < 3.0.0)
146147
naturally (~> 2.2)
147148
optparse (~> 0.1.1)
148149
plist (>= 3.1.0, < 4.0.0)
149150
rubyzip (>= 2.0.0, < 3.0.0)
150151
security (= 0.1.3)
151152
simctl (~> 1.6.3)
152153
terminal-notifier (>= 2.0.0, < 3.0.0)
153-
terminal-table (>= 1.4.5, < 2.0.0)
154+
terminal-table (~> 3)
154155
tty-screen (>= 0.6.3, < 1.0.0)
155156
tty-spinner (>= 0.8.0, < 1.0.0)
156157
word_wrap (~> 1.0.0)
@@ -165,9 +166,9 @@ GEM
165166
fourflusher (2.3.1)
166167
fuzzy_match (2.0.4)
167168
gh_inspector (1.1.3)
168-
google-apis-androidpublisher_v3 (0.29.0)
169-
google-apis-core (>= 0.9.0, < 2.a)
170-
google-apis-core (0.9.0)
169+
google-apis-androidpublisher_v3 (0.49.0)
170+
google-apis-core (>= 0.11.0, < 2.a)
171+
google-apis-core (0.11.1)
171172
addressable (~> 2.5, >= 2.5.1)
172173
googleauth (>= 0.16.2, < 2.a)
173174
httpclient (>= 2.8.1, < 3.a)
@@ -176,30 +177,29 @@ GEM
176177
retriable (>= 2.0, < 4.a)
177178
rexml
178179
webrick
179-
google-apis-iamcredentials_v1 (0.15.0)
180-
google-apis-core (>= 0.9.0, < 2.a)
181-
google-apis-playcustomapp_v1 (0.11.0)
182-
google-apis-core (>= 0.9.0, < 2.a)
180+
google-apis-iamcredentials_v1 (0.17.0)
181+
google-apis-core (>= 0.11.0, < 2.a)
182+
google-apis-playcustomapp_v1 (0.13.0)
183+
google-apis-core (>= 0.11.0, < 2.a)
183184
google-apis-storage_v1 (0.19.0)
184185
google-apis-core (>= 0.9.0, < 2.a)
185186
google-cloud-core (1.6.0)
186187
google-cloud-env (~> 1.0)
187188
google-cloud-errors (~> 1.0)
188189
google-cloud-env (1.6.0)
189190
faraday (>= 0.17.3, < 3.0)
190-
google-cloud-errors (1.3.0)
191-
google-cloud-storage (1.43.0)
191+
google-cloud-errors (1.3.1)
192+
google-cloud-storage (1.44.0)
192193
addressable (~> 2.8)
193194
digest-crc (~> 0.4)
194195
google-apis-iamcredentials_v1 (~> 0.1)
195196
google-apis-storage_v1 (~> 0.19.0)
196197
google-cloud-core (~> 1.6)
197198
googleauth (>= 0.16.2, < 2.a)
198199
mini_mime (~> 1.0)
199-
googleauth (1.2.0)
200+
googleauth (1.8.0)
200201
faraday (>= 0.17.3, < 3.a)
201202
jwt (>= 1.4, < 3.0)
202-
memoist (~> 0.16)
203203
multi_json (~> 1.11)
204204
os (>= 0.9, < 2.0)
205205
signet (>= 0.16, < 2.a)
@@ -209,50 +209,49 @@ GEM
209209
httpclient (2.8.3)
210210
i18n (1.13.0)
211211
concurrent-ruby (~> 1.0)
212-
jmespath (1.6.1)
212+
jmespath (1.6.2)
213213
json (2.6.3)
214-
jwt (2.5.0)
215-
memoist (0.16.2)
214+
jwt (2.7.1)
216215
mime-types (3.4.1)
217216
mime-types-data (~> 3.2015)
218217
mime-types-data (3.2023.0218.1)
219-
mini_magick (4.11.0)
220-
mini_mime (1.1.2)
218+
mini_magick (4.12.0)
219+
mini_mime (1.1.5)
221220
minitest (5.18.0)
222221
molinillo (0.8.0)
223222
multi_json (1.15.0)
224-
multipart-post (2.0.0)
223+
multipart-post (2.3.0)
225224
nanaimo (0.3.0)
226225
nap (1.1.0)
227226
naturally (2.2.1)
228227
netrc (0.11.0)
229228
optparse (0.1.1)
230229
os (1.1.4)
231-
plist (3.6.0)
230+
plist (3.7.0)
232231
public_suffix (4.0.7)
233232
rake (13.0.6)
234233
representable (3.2.0)
235234
declarative (< 0.1.0)
236235
trailblazer-option (>= 0.1.1, < 0.2.0)
237236
uber (< 0.2.0)
238237
retriable (3.1.2)
239-
rexml (3.2.5)
238+
rexml (3.2.6)
240239
rouge (2.0.7)
241240
ruby-macho (2.5.1)
242241
ruby2_keywords (0.0.5)
243242
rubyzip (2.3.2)
244243
security (0.1.3)
245-
signet (0.17.0)
244+
signet (0.18.0)
246245
addressable (~> 2.8)
247246
faraday (>= 0.17.5, < 3.a)
248247
jwt (>= 1.5, < 3.0)
249248
multi_json (~> 1.10)
250-
simctl (1.6.8)
249+
simctl (1.6.10)
251250
CFPropertyList
252251
naturally
253252
terminal-notifier (2.0.0)
254-
terminal-table (1.8.0)
255-
unicode-display_width (~> 1.1, >= 1.1.1)
253+
terminal-table (3.0.2)
254+
unicode-display_width (>= 1.1.1, < 3)
256255
trailblazer-option (0.1.2)
257256
tty-cursor (0.7.1)
258257
tty-screen (0.8.1)
@@ -266,8 +265,8 @@ GEM
266265
unf (0.1.4)
267266
unf_ext
268267
unf_ext (0.0.8.2)
269-
unicode-display_width (1.8.0)
270-
webrick (1.7.0)
268+
unicode-display_width (2.4.2)
269+
webrick (1.8.1)
271270
word_wrap (1.0.0)
272271
xcodeproj (1.22.0)
273272
CFPropertyList (>= 2.3.3, < 4.0)

android/app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ android {
9090
minSdkVersion rootProject.ext.minSdkVersion
9191
targetSdkVersion rootProject.ext.targetSdkVersion
9292
multiDexEnabled rootProject.ext.multiDexEnabled
93-
versionCode 1001037007
94-
versionName "1.3.70-7"
93+
versionCode 1001037106
94+
versionName "1.3.71-6"
9595
}
9696

9797
flavorDimensions "default"

contributingGuides/CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Welcome! Thanks for checking out the New Expensify app and taking the time to contribute!
33

44
## Getting Started
5-
If you would like to become an Expensify contributor, the first step is to read this document in its entirety. The second step is to review the README guidelines [here](https://github.com/Expensify/App/blob/main/README.md) to understand our coding philosophy and for a general overview of the code repository (i.e. how to run the app locally, testing, storage, our app philosophy, etc). Please read both documents before asking questions, as it may be covered within the documentation.
5+
If you would like to become an Expensify contributor, the first step is to read this document in its **entirety**. The second step is to review the README guidelines [here](https://github.com/Expensify/App/blob/main/README.md) to understand our coding philosophy and for a general overview of the code repository (i.e. how to run the app locally, testing, storage, our app philosophy, etc). Please read both documents before asking questions, as it may be covered within the documentation.
66

77
#### Test Accounts
88
You can create as many accounts as needed in order to test your changes directly from [the app](https://new.expensify.com/). An initial account can be created when logging in for the first time, and additional accounts can be created by opening the "New Chat" or "Group Chat" pages via the Global Create menu, inputting a valid email or phone number, and tapping the user's avatar.
@@ -47,7 +47,7 @@ Note: if you are hired for an Upwork job and have any job-specific questions, pl
4747
If you've found a vulnerability, please email [email protected] with the subject `Vulnerability Report` instead of creating an issue.
4848

4949
## Payment for Contributions
50-
We hire and pay external contributors via Upwork.com. If you'd like to be paid for contributing or reporting a bug, please create an Upwork account, apply for an available job in [GitHub](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22), and finally apply for the job in Upwork once your proposal gets selected in GitHub. If you think your compensation should be increased for a specific job, you can request a reevaluation by commenting in the Github issue where the Upwork job was posted.
50+
We hire and pay external contributors via Upwork.com. If you'd like to be paid for contributing or reporting a bug, please create an Upwork account, apply for an available job in [GitHub](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22), and finally apply for the job in Upwork once your proposal gets selected in GitHub. PLease make sure your Upwork profile is **fully verified** before applying, otherwise you run the risk of not being paid. If you think your compensation should be increased for a specific job, you can request a reevaluation by commenting in the Github issue where the Upwork job was posted.
5151

5252
Payment for your contributions and bug reports will be made no less than 7 days after the pull request is deployed to production to allow for [regression](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#regressions) testing. If you have not received payment after 8 days of the PR being deployed to production, and there are no [regressions](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#regressions), please add a comment to the issue mentioning the BugZero team member (Look for the melvin-bot "Triggered auto assignment to... (`Bug`)" to see who this is).
5353

fastlane/Fastfile

+4
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ platform :android do
6767
desc "Build and upload app to Google Play"
6868
lane :beta do
6969
ENV["ENVFILE"]=".env.production"
70+
# Google is very unreliable, so we retry a few times
71+
ENV["SUPPLY_UPLOAD_MAX_RETRIES"]="5"
7072

7173
gradle(
7274
project_dir: './android',
@@ -86,6 +88,8 @@ platform :android do
8688

8789
desc "Deploy app to Google Play production"
8890
lane :production do
91+
# Google is very unreliable, so we retry a few times
92+
ENV["SUPPLY_UPLOAD_MAX_RETRIES"]="5"
8993
google_play_track_version_codes(
9094
package_name: "com.expensify.chat",
9195
json_key: './android/app/android-fastlane-json-key.json',

ios/NewExpensify/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>1.3.70</string>
22+
<string>1.3.71</string>
2323
<key>CFBundleSignature</key>
2424
<string>????</string>
2525
<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
4040
</dict>
4141
</array>
4242
<key>CFBundleVersion</key>
43-
<string>1.3.70.7</string>
43+
<string>1.3.71.6</string>
4444
<key>ITSAppUsesNonExemptEncryption</key>
4545
<false/>
4646
<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

+2-2
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.3.70</string>
18+
<string>1.3.71</string>
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>1.3.70.7</string>
22+
<string>1.3.71.6</string>
2323
</dict>
2424
</plist>

ios/Podfile.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ PODS:
593593
- React-Core
594594
- react-native-pdf (6.7.1):
595595
- React-Core
596-
- react-native-performance (4.0.0):
596+
- react-native-performance (5.1.0):
597597
- React-Core
598598
- react-native-plaid-link-sdk (10.0.0):
599599
- Plaid (~> 4.1.0)
@@ -815,7 +815,7 @@ PODS:
815815
- RNScreens (3.21.0):
816816
- React-Core
817817
- React-RCTImage
818-
- RNSVG (13.9.0):
818+
- RNSVG (13.13.0):
819819
- React-Core
820820
- SDWebImage (5.11.1):
821821
- SDWebImage/Core (= 5.11.1)
@@ -1255,7 +1255,7 @@ SPEC CHECKSUMS:
12551255
react-native-netinfo: ccbe1085dffd16592791d550189772e13bf479e2
12561256
react-native-pager-view: 0ccb8bf60e2ebd38b1f3669fa3650ecce81db2df
12571257
react-native-pdf: 7c0e91ada997bac8bac3bb5bea5b6b81f5a3caae
1258-
react-native-performance: 224bd53e6a835fda4353302cf891d088a0af7406
1258+
react-native-performance: cef2b618d47b277fb5c3280b81a3aad1e72f2886
12591259
react-native-plaid-link-sdk: 9eb0f71dad94b3bdde649c7a384cba93024af46c
12601260
react-native-quick-sqlite: bcc7a7a250a40222f18913a97cd356bf82d0a6c4
12611261
react-native-render-html: 96c979fe7452a0a41559685d2f83b12b93edac8c
@@ -1300,7 +1300,7 @@ SPEC CHECKSUMS:
13001300
RNReactNativeHapticFeedback: 1e3efeca9628ff9876ee7cdd9edec1b336913f8c
13011301
RNReanimated: 020859659f64be2d30849a1fe88c821a7c3e0cbf
13021302
RNScreens: d037903436160a4b039d32606668350d2a808806
1303-
RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315
1303+
RNSVG: ed492aaf3af9ca01bc945f7a149d76d62e73ec82
13041304
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
13051305
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
13061306
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17

package-lock.json

+22-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)