Skip to content
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

[No QA] Update staging from main #4113

Merged
merged 471 commits into from
Jul 16, 2021
Merged
Changes from all commits
Commits
Show all changes
471 commits
Select commit Hold shift + click to select a range
31ce522
Merge pull request #3044 from Expensify/main
OSBotify May 20, 2021
f47d2b3
Merge pull request #3054 from Expensify/main
OSBotify May 21, 2021
9b0a3ee
Merge pull request #3057 from Expensify/main
OSBotify May 21, 2021
45e2796
Merge pull request #3063 from Expensify/main
OSBotify May 21, 2021
da29100
Merge pull request #3065 from Expensify/main
OSBotify May 21, 2021
efc9c74
Merge pull request #3075 from Expensify/main
OSBotify May 22, 2021
378add3
Merge pull request #3082 from Expensify/main
OSBotify May 24, 2021
bbbe1d4
Merge pull request #3084 from Expensify/main
OSBotify May 24, 2021
7267ab8
Merge pull request #3086 from Expensify/main
OSBotify May 24, 2021
f4b6f77
Merge pull request #3089 from Expensify/main
OSBotify May 24, 2021
e83c1e8
Merge pull request #3091 from Expensify/main
OSBotify May 24, 2021
03fd054
Merge pull request #3098 from Expensify/main
OSBotify May 24, 2021
18718ef
Merge pull request #3116 from Expensify/main
OSBotify May 25, 2021
f311fc1
Merge pull request #3118 from Expensify/main
OSBotify May 25, 2021
dfa1548
Merge pull request #3120 from Expensify/main
OSBotify May 25, 2021
bf31884
Merge pull request #3122 from Expensify/main
OSBotify May 25, 2021
a5f9d38
Merge pull request #3126 from Expensify/main
OSBotify May 25, 2021
ebaf800
Merge pull request #3132 from Expensify/main
OSBotify May 25, 2021
41dc9cc
Merge pull request #3142 from Expensify/main
OSBotify May 26, 2021
3577353
Merge pull request #3146 from Expensify/main
OSBotify May 26, 2021
20e6c0b
Merge pull request #3148 from Expensify/main
OSBotify May 26, 2021
b07a1a6
Merge pull request #3155 from Expensify/main
OSBotify May 26, 2021
23c56a3
Merge pull request #3159 from Expensify/main
OSBotify May 26, 2021
b04131e
Merge pull request #3161 from Expensify/main
OSBotify May 26, 2021
da26a54
Merge pull request #3163 from Expensify/main
OSBotify May 26, 2021
5dbcfe8
Merge pull request #3165 from Expensify/main
OSBotify May 26, 2021
44f4bce
Merge pull request #3177 from Expensify/main
OSBotify May 27, 2021
8d0ec69
Merge pull request #3180 from Expensify/main
OSBotify May 27, 2021
aa7b079
Merge pull request #3182 from Expensify/main
OSBotify May 27, 2021
968596c
Merge pull request #3185 from Expensify/main
OSBotify May 27, 2021
2386d0d
Merge pull request #3198 from Expensify/main
OSBotify May 28, 2021
2a13ace
Merge pull request #3203 from Expensify/main
OSBotify May 28, 2021
8796379
Merge pull request #3205 from Expensify/main
OSBotify May 28, 2021
5a87a4e
Merge pull request #3207 from Expensify/main
OSBotify May 28, 2021
5d13c26
Merge pull request #3211 from Expensify/main
OSBotify May 28, 2021
62b08ca
Merge pull request #3214 from Expensify/cherry-pick-staging-3208
OSBotify May 28, 2021
81113b6
Merge pull request #3226 from Expensify/main
OSBotify May 28, 2021
f161643
Merge pull request #3236 from Expensify/main
OSBotify May 31, 2021
280f36d
Merge pull request #3240 from Expensify/main
OSBotify May 31, 2021
bfb2647
Merge pull request #3242 from Expensify/main
OSBotify May 31, 2021
76ef4c6
Merge pull request #3244 from Expensify/main
OSBotify May 31, 2021
c806908
Merge pull request #3255 from Expensify/main
OSBotify Jun 1, 2021
bc01b93
Merge pull request #3259 from Expensify/main
OSBotify Jun 1, 2021
ae2b920
Merge pull request #3262 from Expensify/main
OSBotify Jun 1, 2021
fef87a5
Merge pull request #3265 from Expensify/main
OSBotify Jun 1, 2021
bede38c
Merge pull request #3268 from Expensify/main
OSBotify Jun 1, 2021
f8928b8
Merge pull request #3270 from Expensify/main
OSBotify Jun 1, 2021
c3af3a5
Merge pull request #3278 from Expensify/main
OSBotify Jun 1, 2021
cc6f464
Merge pull request #3282 from Expensify/main
OSBotify Jun 1, 2021
1249395
Merge pull request #3287 from Expensify/main
OSBotify Jun 2, 2021
c5f442d
Merge pull request #3290 from Expensify/main
OSBotify Jun 2, 2021
da1d192
Merge pull request #3292 from Expensify/main
OSBotify Jun 2, 2021
7bc7e9c
Merge pull request #3300 from Expensify/main
OSBotify Jun 2, 2021
5c43a97
Merge pull request #3306 from Expensify/main
OSBotify Jun 2, 2021
90b8bd7
Merge pull request #3341 from Expensify/main
OSBotify Jun 3, 2021
a9f1bf8
Merge pull request #3343 from Expensify/main
OSBotify Jun 3, 2021
3ed10e1
Merge pull request #3345 from Expensify/main
OSBotify Jun 3, 2021
0b0bb2a
Merge pull request #3358 from Expensify/main
OSBotify Jun 3, 2021
f534587
Merge pull request #3365 from Expensify/main
OSBotify Jun 4, 2021
a7afa44
Merge pull request #3367 from Expensify/main
OSBotify Jun 4, 2021
3fbf612
Merge pull request #3369 from Expensify/main
OSBotify Jun 4, 2021
2ea70e9
Merge pull request #3371 from Expensify/main
OSBotify Jun 4, 2021
2374c79
Merge pull request #3373 from Expensify/main
OSBotify Jun 4, 2021
16c50e4
Merge pull request #3376 from Expensify/main
OSBotify Jun 4, 2021
ec621e5
Merge pull request #3378 from Expensify/main
OSBotify Jun 4, 2021
8c55edb
Merge pull request #3394 from Expensify/main
OSBotify Jun 7, 2021
36b8f51
Merge pull request #3396 from Expensify/main
OSBotify Jun 7, 2021
147ec11
Merge pull request #3399 from Expensify/main
OSBotify Jun 7, 2021
7e8c075
Merge pull request #3406 from Expensify/main
OSBotify Jun 7, 2021
cb3a263
Merge pull request #3412 from Expensify/main
OSBotify Jun 8, 2021
4bf90b0
Merge pull request #3418 from Expensify/main
OSBotify Jun 8, 2021
6bbe25d
Merge pull request #3425 from Expensify/main
OSBotify Jun 8, 2021
dd4d820
Merge pull request #3428 from Expensify/main
OSBotify Jun 8, 2021
a0ef669
Merge pull request #3431 from Expensify/main
OSBotify Jun 8, 2021
d1ff81f
Merge pull request #3433 from Expensify/main
OSBotify Jun 8, 2021
e1bf96c
Merge pull request #3437 from Expensify/main
OSBotify Jun 8, 2021
0fa7436
Merge pull request #3440 from Expensify/main
OSBotify Jun 8, 2021
c796a02
Merge pull request #3449 from Expensify/main
OSBotify Jun 8, 2021
9b4fa6f
Merge pull request #3452 from Expensify/main
OSBotify Jun 8, 2021
9e83687
Merge pull request #3454 from Expensify/main
OSBotify Jun 8, 2021
a8f731b
Merge pull request #3458 from Expensify/main
OSBotify Jun 9, 2021
15ed522
Merge pull request #3462 from Expensify/main
OSBotify Jun 9, 2021
e7d28ff
Merge pull request #3465 from Expensify/main
OSBotify Jun 9, 2021
91ec6ce
Merge pull request #3467 from Expensify/main
OSBotify Jun 9, 2021
8087011
Merge pull request #3469 from Expensify/main
OSBotify Jun 9, 2021
a9cffa5
Merge pull request #3471 from Expensify/main
OSBotify Jun 9, 2021
13c2f6f
Merge pull request #3473 from Expensify/main
OSBotify Jun 9, 2021
09f6922
Merge pull request #3475 from Expensify/main
OSBotify Jun 9, 2021
5060af0
Merge pull request #3479 from Expensify/main
OSBotify Jun 9, 2021
248851b
Merge pull request #3494 from Expensify/version-BUILD-5e041b5536e83a4…
OSBotify Jun 9, 2021
c0246d8
Merge pull request #3486 from Expensify/marcaaron-fixAnchorsInComments
AndrewGable Jun 9, 2021
31395ae
Merge pull request #3495 from Expensify/cherry-pick-staging-3486
OSBotify Jun 9, 2021
236216a
Merge pull request #3496 from Expensify/version-BUILD-22e586f4680504f…
OSBotify Jun 9, 2021
c521094
Merge pull request #3483 from Expensify/jules-bumpOnyxToFixRegression
Jun 9, 2021
d7a0d1a
Merge pull request #3497 from Expensify/cherry-pick-staging-3483
OSBotify Jun 9, 2021
dd48c8c
Merge pull request #3500 from Expensify/version-BUILD-c1858001ab8b80e…
OSBotify Jun 9, 2021
9b26ab0
Merge pull request #3481 from Expensify/jules-iouFixPermissionsRegres…
roryabraham Jun 9, 2021
4fa064e
Merge pull request #3501 from Expensify/cherry-pick-staging-3481
OSBotify Jun 9, 2021
faa4d75
Merge branch 'main' into update-staging-from-main
Jun 10, 2021
ab9b642
Merge pull request #3531 from Expensify/update-staging-from-main
OSBotify Jun 10, 2021
f61dca2
Merge branch 'main' into update-staging-from-main
Jun 10, 2021
887d1b0
Merge pull request #3533 from Expensify/update-staging-from-main
OSBotify Jun 10, 2021
d20f589
Merge branch 'main' into update-staging-from-main
Jun 11, 2021
8c94b73
Merge pull request #3549 from Expensify/update-staging-from-main
OSBotify Jun 11, 2021
d02893c
Merge pull request #3553 from Expensify/version-BUILD-3e2f266c5399022…
OSBotify Jun 11, 2021
6368086
Merge pull request #3550 from Expensify/Rory-Upgrade-react-native-doc…
roryabraham Jun 11, 2021
a810df2
Merge pull request #3554 from Expensify/cherry-pick-staging-3550
OSBotify Jun 11, 2021
c66c5b2
Merge pull request #3556 from Expensify/version-BUILD-584183f77615d2e…
OSBotify Jun 11, 2021
f7b3699
Merge pull request #3555 from Expensify/Rory-FixHotkeys
marcaaron Jun 11, 2021
2d0a3e6
Merge pull request #3557 from Expensify/cherry-pick-staging-3555
OSBotify Jun 11, 2021
5e9f542
Merge pull request #3563 from Expensify/version-BUILD-be7fee0ddc56a53…
OSBotify Jun 11, 2021
a7cfb18
Merge pull request #3535 from Expensify/amechler-fix-signout
marcaaron Jun 11, 2021
6e63a2b
Merge pull request #3564 from Expensify/cherry-pick-staging-3535
OSBotify Jun 11, 2021
a0ea7db
Merge pull request #3583 from Expensify/version-BUILD-5a043715a7d670b…
OSBotify Jun 14, 2021
258744f
Merge pull request #3581 from parasharrajat/attachment-picker
Jun 14, 2021
d71ae41
Merge pull request #3584 from Expensify/cherry-pick-staging-3581
OSBotify Jun 14, 2021
d982352
Merge branch 'main' into update-staging-from-main
Jun 15, 2021
d0c55f1
Merge pull request #3592 from Expensify/update-staging-from-main
OSBotify Jun 15, 2021
6e3dae1
Merge branch 'main' into update-staging-from-main
Jun 15, 2021
b44eaa4
Merge pull request #3595 from Expensify/update-staging-from-main
OSBotify Jun 15, 2021
1bce988
Merge branch 'main' into update-staging-from-main
Jun 16, 2021
6c47826
Merge pull request #3618 from Expensify/update-staging-from-main
OSBotify Jun 16, 2021
1fc1a8b
Merge branch 'main' into update-staging-from-main
Jun 16, 2021
3c0bf4d
Merge pull request #3622 from Expensify/update-staging-from-main
OSBotify Jun 16, 2021
2ceae28
Merge branch 'main' into update-staging-from-main
Jun 16, 2021
c04e8d7
Merge pull request #3625 from Expensify/update-staging-from-main
OSBotify Jun 16, 2021
a62d52f
Merge branch 'main' into update-staging-from-main
Jun 16, 2021
4166381
Merge pull request #3629 from Expensify/update-staging-from-main
OSBotify Jun 16, 2021
298804c
Merge branch 'main' into update-staging-from-main
Jun 17, 2021
a33948f
Merge pull request #3641 from Expensify/update-staging-from-main
OSBotify Jun 17, 2021
025a7dc
Merge branch 'main' into update-staging-from-main
Jun 17, 2021
0af3f1c
Merge pull request #3644 from Expensify/update-staging-from-main
OSBotify Jun 17, 2021
43128d1
Merge branch 'main' into update-staging-from-main
saurabhssahu Jun 17, 2021
eb2e654
Merge pull request #3646 from Expensify/update-staging-from-main
OSBotify Jun 17, 2021
c2bbd9d
Merge branch 'main' into update-staging-from-main
Jun 17, 2021
0520ab6
Merge pull request #3649 from Expensify/update-staging-from-main
OSBotify Jun 17, 2021
c7b51be
Merge branch 'main' into update-staging-from-main
Jun 17, 2021
b06e95e
Merge pull request #3653 from Expensify/update-staging-from-main
OSBotify Jun 17, 2021
0ee1d23
Merge branch 'main' into update-staging-from-main
Jun 17, 2021
960dece
Merge pull request #3655 from Expensify/update-staging-from-main
OSBotify Jun 17, 2021
cc20221
Merge branch 'main' into update-staging-from-main
Jun 17, 2021
f179aca
Merge pull request #3658 from Expensify/update-staging-from-main
OSBotify Jun 17, 2021
1ea2e8c
Merge branch 'main' into update-staging-from-main
saurabhssahu Jun 17, 2021
771e06f
Merge pull request #3661 from Expensify/update-staging-from-main
OSBotify Jun 17, 2021
8879abe
Merge branch 'main' into update-staging-from-main
Jun 17, 2021
6d21def
Merge pull request #3666 from Expensify/update-staging-from-main
OSBotify Jun 17, 2021
c61d3fc
Merge branch 'main' into update-staging-from-main
saurabhssahu Jun 18, 2021
5e6b56c
Merge pull request #3680 from Expensify/update-staging-from-main
OSBotify Jun 18, 2021
d8bee50
Merge branch 'main' into update-staging-from-main
Jun 18, 2021
6ff59c6
Merge pull request #3683 from Expensify/update-staging-from-main
OSBotify Jun 18, 2021
5d70be9
Merge branch 'main' into update-staging-from-main
saurabhssahu Jun 18, 2021
5acafc4
Merge pull request #3688 from Expensify/update-staging-from-main
OSBotify Jun 18, 2021
63db295
Merge branch 'main' into update-staging-from-main
saurabhssahu Jun 21, 2021
6fa8673
Merge pull request #3699 from Expensify/update-staging-from-main
OSBotify Jun 21, 2021
f3427b6
Merge branch 'main' into update-staging-from-main
saurabhssahu Jun 21, 2021
e9ad2d5
Merge pull request #3701 from Expensify/update-staging-from-main
OSBotify Jun 21, 2021
fb0abc6
Merge branch 'main' into update-staging-from-main
Jun 21, 2021
dcd3d48
Merge pull request #3704 from Expensify/update-staging-from-main
OSBotify Jun 21, 2021
0382712
Merge branch 'main' into update-staging-from-main
Jun 21, 2021
1d265a7
Merge pull request #3707 from Expensify/update-staging-from-main
OSBotify Jun 21, 2021
a817803
Merge pull request #3722 from Expensify/version-BUILD-c94c24a6e16fbf3…
OSBotify Jun 22, 2021
fd10c63
Merge pull request #3719 from Expensify/Rory-FixPhoneNumberPageAutoFocus
tgolen Jun 22, 2021
06eac96
Merge pull request #3723 from Expensify/cherry-pick-staging-3719
OSBotify Jun 22, 2021
5375c76
Merge pull request #3725 from Expensify/version-BUILD-2c831b06e70b19a…
OSBotify Jun 22, 2021
d9413ff
Merge pull request #3713 from Expensify/cmartins-android-add-venmo-su…
luacmartins Jun 21, 2021
05c925a
Merge pull request #3726 from Expensify/cherry-pick-staging-3713
OSBotify Jun 22, 2021
2dfc177
Merge pull request #3750 from Expensify/version-BUILD-20312dee35b88cd…
OSBotify Jun 25, 2021
3fd2817
Merge pull request #3749 from Expensify/Rory-FixLanguagePicker
roryabraham Jun 25, 2021
f48db61
Merge pull request #3751 from Expensify/cherry-pick-staging-3749
OSBotify Jun 25, 2021
d0919a6
Merge branch 'main' into update-staging-from-main
Jun 25, 2021
7bcf02c
Merge pull request #3758 from Expensify/update-staging-from-main
OSBotify Jun 25, 2021
89b899d
Merge branch 'main' into update-staging-from-main
Jun 25, 2021
cc75586
Merge pull request #3762 from Expensify/update-staging-from-main
OSBotify Jun 25, 2021
9eff20e
Merge branch 'main' into update-staging-from-main
Jun 29, 2021
15a83ad
Merge pull request #3801 from Expensify/update-staging-from-main
OSBotify Jun 29, 2021
d2298fa
Merge branch 'main' into update-staging-from-main
Jun 29, 2021
25a20cb
Merge pull request #3808 from Expensify/update-staging-from-main
OSBotify Jun 29, 2021
705f0bd
Merge branch 'main' into update-staging-from-main
Jun 29, 2021
15b5c89
Merge pull request #3812 from Expensify/update-staging-from-main
OSBotify Jun 29, 2021
e1ecb20
Merge branch 'main' into update-staging-from-main
Jun 29, 2021
c98d795
Merge pull request #3814 from Expensify/update-staging-from-main
OSBotify Jun 29, 2021
b79d047
Merge pull request #3833 from Expensify/version-BUILD-454664cb514079c…
OSBotify Jun 30, 2021
6c49589
Merge pull request #3816 from Expensify/Rory-RevertSuppressTouch
roryabraham Jun 30, 2021
020ebef
Merge pull request #3834 from Expensify/cherry-pick-staging-3816
OSBotify Jun 30, 2021
a5e6d46
Merge pull request #3836 from Expensify/version-BUILD-5c24bd600944b84…
OSBotify Jun 30, 2021
80c6451
Merge pull request #3824 from Expensify/revert-3760-thibault-FixSearc…
tgolen Jun 30, 2021
f9d7460
Merge pull request #3837 from Expensify/cherry-pick-staging-3824
OSBotify Jun 30, 2021
e7effde
Merge pull request #3842 from Expensify/version-BUILD-d627947ae5a8d6c…
OSBotify Jun 30, 2021
e03643c
Merge pull request #3840 from Expensify/yuwen-sidebarOptionsBetas
yuwenmemon Jun 30, 2021
3f4b8f1
Merge pull request #3843 from Expensify/cherry-pick-staging-3840
OSBotify Jun 30, 2021
311e86a
Merge branch 'main' into update-staging-from-main
Jul 7, 2021
f0a26c2
Merge pull request #3904 from Expensify/update-staging-from-main
OSBotify Jul 7, 2021
afd2796
Merge branch 'main' into update-staging-from-main
Jul 7, 2021
ebd76ac
Merge pull request #3907 from Expensify/update-staging-from-main
OSBotify Jul 7, 2021
3066d02
Merge branch 'main' into update-staging-from-main
Jul 7, 2021
705b142
Merge pull request #3911 from Expensify/update-staging-from-main
OSBotify Jul 7, 2021
db74374
Merge branch 'main' into update-staging-from-main
Jul 7, 2021
42a9300
Merge pull request #3915 from Expensify/update-staging-from-main
OSBotify Jul 7, 2021
a678e07
Merge branch 'main' into update-staging-from-main
Jul 8, 2021
bd8d243
Merge pull request #3917 from Expensify/update-staging-from-main
OSBotify Jul 8, 2021
05b6773
Merge branch 'main' into update-staging-from-main
Jul 8, 2021
2edb758
Merge pull request #3919 from Expensify/update-staging-from-main
OSBotify Jul 8, 2021
d546c68
Merge branch 'main' into update-staging-from-main
Jul 8, 2021
dddf5b9
Merge pull request #3930 from Expensify/update-staging-from-main
OSBotify Jul 8, 2021
5512d06
Merge pull request #3934 from Expensify/version-BUILD-1cc22a1340b5e8c…
OSBotify Jul 8, 2021
cf0c46c
Merge pull request #3932 from Expensify/Rory-FixIOUCurrencyRoutes
cead22 Jul 8, 2021
92756ea
Merge pull request #3935 from Expensify/cherry-pick-staging-3932
OSBotify Jul 8, 2021
38a852c
Merge pull request #3948 from Expensify/version-BUILD-2db53ecdca5e276…
OSBotify Jul 9, 2021
28814e5
Merge pull request #3908 from rdjuric/transitionFix
roryabraham Jul 8, 2021
9241854
Merge pull request #3949 from Expensify/cherry-pick-staging-3908
OSBotify Jul 9, 2021
656b36c
Merge branch 'main' into update-staging-from-main
Jul 9, 2021
f0f1a75
Merge pull request #3956 from Expensify/update-staging-from-main
OSBotify Jul 9, 2021
e3f8d53
Merge branch 'main' into update-staging-from-main
Jul 9, 2021
c97cc65
Merge pull request #3962 from Expensify/update-staging-from-main
OSBotify Jul 9, 2021
7365dc3
Merge pull request #3990 from Expensify/version-BUILD-bb042f5810d4861…
OSBotify Jul 12, 2021
4885078
Merge pull request #3989 from Expensify/Rory-FixMobileInviteForm
AndrewGable Jul 12, 2021
8a90b30
Merge pull request #3991 from Expensify/cherry-pick-staging-3989
OSBotify Jul 12, 2021
fee2b00
Merge pull request #3996 from Expensify/version-BUILD-d0c95782a407809…
OSBotify Jul 13, 2021
3d07b7a
Merge pull request #3966 from Expensify/Rory-FixLineHeight
thienlnam Jul 13, 2021
415841b
Merge pull request #3997 from Expensify/cherry-pick-staging-3966
OSBotify Jul 13, 2021
ef752cd
Merge pull request #4032 from Expensify/version-BUILD-0639c6771204ceb…
OSBotify Jul 14, 2021
53fd87c
Merge pull request #4020 from Expensify/Rory-FixUserTypingIndicator
Beamanator Jul 14, 2021
fddf40a
Manually resolve merge conflicts
roryabraham Jul 14, 2021
17e30ab
Merge pull request #4033 from Expensify/cherry-pick-staging-4020
roryabraham Jul 14, 2021
b010f79
Merge pull request #4038 from Expensify/version-BUILD-9d900a89ac676dd…
OSBotify Jul 14, 2021
fa5b200
Merge pull request #4016 from Expensify/new-expensify-com
rafecolton Jul 14, 2021
55b24fd
Merge pull request #4039 from Expensify/cherry-pick-staging-4016
OSBotify Jul 14, 2021
e2eb0f7
Merge pull request #4041 from Expensify/version-BUILD-9da2ab6a4f066fe…
OSBotify Jul 14, 2021
b5cb694
Merge pull request #4037 from Expensify/follow-up
roryabraham Jul 14, 2021
7e5684f
Merge pull request #4042 from Expensify/cherry-pick-staging-4037
OSBotify Jul 14, 2021
9b5b08c
Merge branch 'main' into update-staging-from-main
Jul 14, 2021
47e871a
Merge pull request #4045 from Expensify/update-staging-from-main
OSBotify Jul 14, 2021
e57273a
Merge branch 'main' into update-staging-from-main
Jul 14, 2021
8f4234b
Merge pull request #4051 from Expensify/update-staging-from-main
OSBotify Jul 14, 2021
3e609c3
Merge branch 'main' into update-staging-from-main
Jul 14, 2021
adb2098
Merge pull request #4054 from Expensify/update-staging-from-main
OSBotify Jul 14, 2021
bb6e612
Merge pull request #4064 from Expensify/version-BUILD-951308fb3319f64…
OSBotify Jul 15, 2021
4d59949
Merge pull request #4059 from Expensify/joe-report-action-count
marcaaron Jul 15, 2021
a4d0417
Merge pull request #4065 from Expensify/cherry-pick-staging-4059
OSBotify Jul 15, 2021
18e7ea3
Merge pull request #4087 from Expensify/version-BUILD-d15c65a3095fe16…
OSBotify Jul 15, 2021
c2f92b6
Merge pull request #4085 from Expensify/chirag-revert-3979
chiragsalian Jul 15, 2021
6eb655d
Merge pull request #4088 from Expensify/cherry-pick-staging-4085
OSBotify Jul 15, 2021
54b1165
Merge branch 'main' into update-staging-from-main
Jul 15, 2021
47395d2
Merge pull request #4093 from Expensify/update-staging-from-main
OSBotify Jul 15, 2021
7ebb237
Merge branch 'main' into update-staging-from-main
Jul 15, 2021
7562574
Merge pull request #4095 from Expensify/update-staging-from-main
OSBotify Jul 15, 2021
604c4a2
Merge branch 'main' into update-staging-from-main
Jul 15, 2021
37563e5
Merge pull request #4100 from Expensify/update-staging-from-main
OSBotify Jul 15, 2021
933a42d
Merge branch 'main' into update-staging-from-main
Jul 15, 2021
ee15adb
Merge pull request #4103 from Expensify/update-staging-from-main
OSBotify Jul 15, 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
43 changes: 34 additions & 9 deletions src/pages/workspace/WorkspaceInvitePage.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,40 @@ class WorkspaceInvitePage extends React.Component {
<Text style={[styles.mb2]}>
{this.props.translate('workspace.invite.enterEmailOrPhone')}
</Text>
<TextInput
autoCompleteType="email"
autoCorrect={false}
autoCapitalize="none"
style={[styles.textInput]}
value={this.state.emailOrPhone}
keyboardType={getEmailKeyboardType()}
onChangeText={text => this.setState({emailOrPhone: text})}
/>
<View style={styles.mb6}>
<Text style={[styles.mb2]}>
{this.props.translate('workspace.invite.enterEmailOrPhone')}
</Text>
<TextInput
autoCompleteType="email"
autoCorrect={false}
autoCapitalize="none"
style={[styles.textInput]}
value={this.state.emailOrPhone}
keyboardType={getEmailKeyboardType()}
onChangeText={text => this.setState({emailOrPhone: text})}
/>
</View>
<View style={styles.mb6}>
<Text style={[styles.mb2]}>
{this.props.translate('workspace.invite.personalMessagePrompt')}
</Text>
<TextInput
autoCompleteType="off"
autoCorrect={false}
style={[styles.textInput, styles.workspaceInviteWelcome, styles.mb6]}
numberOfLines={10}
textAlignVertical="top"
multiline
value={this.state.welcomeNote}
placeholder={this.getWelcomeNotePlaceholder()}
placeholderTextColor={themeColors.placeholderText}
onChangeText={text => this.setState({welcomeNote: text})}
/>
<TextLink href="https://use.expensify.com/privacy">
{this.props.translate('common.privacy')}
</TextLink>
</View>
</View>
<View style={styles.mb6}>
<Text style={[styles.mb2]}>
Expand Down