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

adding some types, and do some refactor #133

Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
747 commits
Select commit Hold shift + click to select a range
8082a9a
Remove padding above the button
VickyStash Nov 8, 2024
17cae11
Merge pull request #52009 from huult/51310-fix-emoji-picker-empty-cat…
lakchote Nov 8, 2024
8d0da00
fix: remove unused data in json
truph01 Nov 8, 2024
d42e264
fix: add 2nd test case
truph01 Nov 8, 2024
a9bdbe2
Remove extra padding above the button on ios
VickyStash Nov 8, 2024
ef77bb9
fix: lint
truph01 Nov 8, 2024
2afb133
only allow one status to be selected
lakchote Nov 8, 2024
5e69bfc
Merge pull request #52230 from Expensify/VictoriaExpensify-patch-1
cristipaval Nov 8, 2024
650268f
Merge remote-tracking branch 'upstream/main' into 49741-expense-previ…
huult Nov 8, 2024
37d9d90
add early return for isSearchTopmostCentralPane check
huult Nov 8, 2024
b474da3
update format function with parseISO
waterim Nov 8, 2024
b7acfbf
Merge pull request #52227 from Expensify/rafe-fix-bundle-install
cristipaval Nov 8, 2024
fed11de
fix types and build error
sumo-slonik Nov 8, 2024
81c17e8
Merge pull request #51955 from callstack-internal/VickyStash/feature/…
mountiny Nov 8, 2024
0cd2e04
Merge pull request #52175 from Expensify/vit-checkForEmptyObject
mountiny Nov 8, 2024
4bf05cc
conditionally render the add icon based on workspace existance
twilight2294 Nov 8, 2024
bd880d1
Merge pull request #52152 from callstack-internal/feat/51914
mountiny Nov 8, 2024
7a0cf24
Fix incorrect pending fields while editing requests
paultsimura Nov 8, 2024
e51ff8a
fix linters problems
sumo-slonik Nov 8, 2024
9d763e5
explicity adds omit to fetch
rlinoz Nov 8, 2024
fabbbd3
fixes after review
narefyev91 Nov 8, 2024
61d4bf3
fix typo in TransactionType
sumo-slonik Nov 8, 2024
e7b1bb5
fix permissions issue
sumo-slonik Nov 8, 2024
0474d28
Merge pull request #52182 from callstack-internal/chore/remove-unused…
puneetlath Nov 8, 2024
a7b1553
Merge pull request #50783 from thelullabyy/fix/49929-unify-distance-r…
puneetlath Nov 8, 2024
ba450cf
Update src/libs/ReportUtils.ts
nkdengineer Nov 8, 2024
04c530a
Update src/libs/actions/IOU.ts
nkdengineer Nov 8, 2024
15e308e
Update src/libs/actions/IOU.ts
nkdengineer Nov 8, 2024
50794ef
Merge pull request #52150 from callstack-internal/feat/51915
mountiny Nov 8, 2024
a569cbc
Merge pull request #52102 from software-mansion-labs/kicu/50564-hide-…
luacmartins Nov 8, 2024
c4de7f6
Merge branch 'main' of https://github.com/Expensify/App into patch-19
ShridharGoel Nov 8, 2024
ee89e3a
Merge pull request #52255 from Expensify/rodrigo-fix-csrf-token-native
rlinoz Nov 8, 2024
02d6c4f
Merge branch 'patch-19' of https://github.com/ShridharGoel/ExpensifyA…
ShridharGoel Nov 8, 2024
d0133d1
Merge pull request #52141 from Expensify/youssef_better_concierge_nav…
youssef-lr Nov 8, 2024
286be9c
Update Enable-Global-Reimbursements.md to remove beta wording
twisterdotcom Nov 8, 2024
2a5c14c
Merge pull request #52017 from nkdengineer/fix/51466-update-version
mountiny Nov 8, 2024
b11ed9e
fix: package.json & package-lock.json to reduce vulnerabilities
snyk-bot Nov 8, 2024
d9c55dd
Merge pull request #51960 from callstack-internal/perf/add-generic-wa…
mountiny Nov 8, 2024
346bb37
Merge pull request #52105 from callstack-internal/add-lhn-readme-file
mountiny Nov 8, 2024
bd9c7ac
fix: update comment
truph01 Nov 8, 2024
72a9927
Merge branch 'main' of github.com:mananjadhav/App into mj-qab-navigate
mananjadhav Nov 8, 2024
37f3263
refactor: simplify switch blocks
mananjadhav Nov 8, 2024
e858c24
[NO QA] Update Quickbooks-Online-Troubleshooting.md
maddylewis Nov 8, 2024
563f10d
Merge branch 'main' into georgia-ab-testing
grgia Nov 8, 2024
f053272
Merge pull request #52185 from Expensify/lucien/search-fix-multiple-s…
luacmartins Nov 8, 2024
6dc5f37
eslint
grgia Nov 8, 2024
d87db5f
eslint
grgia Nov 8, 2024
52f7761
Merge pull request #52270 from Expensify/maddylewis-patch-7
arosiclair Nov 8, 2024
f36e9f6
Update tests/unit/DebugUtilsTest.ts
iwiznia Nov 8, 2024
4af6e08
Updated Background Color Condition
MuaazArshad Nov 8, 2024
b26f96b
Merge pull request #52119 from huult/49741-expense-preview-temporary-…
francoisl Nov 8, 2024
4a1bd3e
prevent showing track expense option for submitted track expense
nkdengineer Nov 8, 2024
1fc5ae3
Merge pull request #50324 from ShridharGoel/patch-20
jasperhuangg Nov 8, 2024
9dc6a97
Merge pull request #52057 from FitseTLT/fix-weird-back-navigation-for…
jasperhuangg Nov 8, 2024
e4cdb42
Merge pull request #47232 from ShridharGoel/patch-19
marcaaron Nov 8, 2024
b4a5a52
prettier to fix style
NikkiWines Nov 8, 2024
49f5f2d
use currentRole and newRole where applicable
NikkiWines Nov 8, 2024
0e18a5d
Merge branch 'main' of github.com:Expensify/App into snyk-fix-b51ba10…
pecanoro Nov 8, 2024
257ea89
Update selfDMReportID when opening/closing FAB
fabioh8010 Nov 8, 2024
45a19bf
Merge pull request #52148 from jaydamani/search/remove-invoice-from-l…
luacmartins Nov 8, 2024
70d3dd3
fix-search-page-regression
FitseTLT Nov 8, 2024
848d8cf
Update en.ts
jamesdeanexpensify Nov 8, 2024
af0170f
Update ReportTypingIndicator.tsx
jamesdeanexpensify Nov 8, 2024
8d2222f
add loading indicator
luacmartins Nov 8, 2024
ba3f848
fix double graying out
FitseTLT Nov 8, 2024
c46c571
pass more props
luacmartins Nov 8, 2024
5a008be
Update es.ts
jamesdeanexpensify Nov 8, 2024
25b45b3
add the small screen condition
FitseTLT Nov 8, 2024
684234b
Added Comments
MuaazArshad Nov 8, 2024
e5b5ed2
update callback to handle single transaction reports
luacmartins Nov 8, 2024
1553b76
Update index.ts
MuaazArshad Nov 8, 2024
638f6bb
Added Comments
MuaazArshad Nov 8, 2024
533aed6
Merge pull request #52218 from Expensify/jamesdeanexpensify-patch-5
blimpich Nov 8, 2024
66acf61
add loading for pay action
luacmartins Nov 8, 2024
7c20342
add comment
luacmartins Nov 8, 2024
ea0ae14
delete empty file
luacmartins Nov 8, 2024
0104fc6
Update src/styles/utils/index.ts
MuaazArshad Nov 8, 2024
81b3cc9
hide 'Request early cancellation' option until after first billing
Shahidullah-Muffakir Nov 8, 2024
81a0bdc
fix sort on multiple statuses
luacmartins Nov 8, 2024
754a11c
simplify condition
luacmartins Nov 8, 2024
b2a10a0
resolve eslint error
Shahidullah-Muffakir Nov 8, 2024
e854f83
update mask function
waterim Nov 8, 2024
e0bfef3
Merge remote-tracking branch 'upstream/main' into feat/51333/company-…
waterim Nov 8, 2024
6ba20e3
fix eslint
waterim Nov 8, 2024
548b97e
Update en.ts
jamesdeanexpensify Nov 8, 2024
7b30ca2
Update es.ts
jamesdeanexpensify Nov 8, 2024
0a089bb
Update en.ts
jamesdeanexpensify Nov 8, 2024
fc5848b
Update es.ts
jamesdeanexpensify Nov 8, 2024
c75b1bc
Merge pull request #52284 from Expensify/jamesdeanexpensify-patch-2
AndrewGable Nov 9, 2024
522b183
Bump react-native-live-markdown to 0.1.183
QichenZhu Nov 9, 2024
6656f52
Merge branch 'Expensify:main' into feat/51804
ishpaul777 Nov 9, 2024
2436a60
review comments
ishpaul777 Nov 9, 2024
a48bd91
fix copy
ishpaul777 Nov 9, 2024
3e07767
fixes offline delete
ishpaul777 Nov 9, 2024
63f9e48
fix es lint
ishpaul777 Nov 9, 2024
1624693
fix type checks
allroundexperts Nov 9, 2024
f30c307
fix deprecations
allroundexperts Nov 9, 2024
6d5159c
fix deprecations
allroundexperts Nov 9, 2024
e9beef2
add comment for the deprecation warning ignore
allroundexperts Nov 9, 2024
ef8237f
revert electron-context-menu upgrade
allroundexperts Nov 9, 2024
0537291
chore: add minor readme updates
tscanlin Nov 9, 2024
aaa56a6
Merge pull request #52290 from tscanlin/ts--add-minor-readme-updates
quinthar Nov 9, 2024
e485359
fixes for scroll sync behavior
tscanlin Nov 9, 2024
db79826
use tocbot from cdn
tscanlin Nov 9, 2024
b821068
Merge pull request #52291 from tscanlin/ts--scroll-sync-fixes
quinthar Nov 9, 2024
1c668d8
Rename assign-a-task to assign-a-task.md
jliexpensify Nov 10, 2024
8320129
Merge branch 'main' into margin
rushatgabhane Nov 10, 2024
afd6277
add line height 1.2 for h1 h2 h3
rushatgabhane Nov 10, 2024
0ef4a53
line height 1.33 for page
rushatgabhane Nov 10, 2024
fc1c35a
Use getRateByCustomUnitRateID
paultsimura Nov 10, 2024
dc00990
Make getRateByCustomUnitRateID inline
paultsimura Nov 10, 2024
8cd6b23
Lint
paultsimura Nov 10, 2024
20cbbee
Update cardName
waterim Nov 10, 2024
479bca6
Merge pull request #52151 from callstack-internal/feat/51912
mountiny Nov 10, 2024
d688a59
Merge pull request #51599 from Expensify/arosiclair-gtm-events
mountiny Nov 10, 2024
23fab23
fix: View your subscription link opens Subscription page then back to…
truph01 Nov 11, 2024
dc514bf
Merge branch 'main' into fix/51750
nkdengineer Nov 11, 2024
d979c4a
add comment
nkdengineer Nov 11, 2024
b158eeb
fix hidden members is shown when creating workspace from iou payment
bernhardoj Nov 11, 2024
3994e63
Merge pull request #50066 from Expensify/georgia-ab-testing
techievivek Nov 11, 2024
faec954
Merge pull request #52278 from FitseTLT/fix-search-page-long-press-re…
carlosmiceli Nov 11, 2024
8180f5e
Merge branch 'Expensify:main' into fix-52186
ishpaul777 Nov 11, 2024
ba543d7
Merge pull request #52285 from Expensify/jamesdeanexpensify-patch-5
cristipaval Nov 11, 2024
82ebccf
fix display of undefined on card name after page refresh
huult Nov 11, 2024
487bc09
Add type parameter for company card setting feed name
huult Nov 11, 2024
ae40ea5
pass selected feed name when navigating to Settings Page
huult Nov 11, 2024
ed230ea
Merge pull request #52274 from nkdengineer/fix/52240
Julesssss Nov 11, 2024
005b618
Update version to 9.0.59-1
OSBotify Nov 11, 2024
191564c
Update version to 9.0.59-2
OSBotify Nov 11, 2024
da595d4
Merge pull request #52275 from callstack-internal/bugfix/51242
Julesssss Nov 11, 2024
0275692
Merge pull request #51196 from nkdengineer/fix/51001
Beamanator Nov 11, 2024
2e34a2e
Merge pull request #52273 from MuaazArshad/backgroundstyle
Julesssss Nov 11, 2024
1223311
Update version to 9.0.59-3
OSBotify Nov 11, 2024
dd2056d
fix bug with default exporter
ZhenjaHorbach Nov 11, 2024
4e0dc82
Merge pull request #52229 from Expensify/jliexpensify-patch-1
rlinoz Nov 11, 2024
52c6ce2
Merge pull request #52254 from twilight2294/dontShowAddbutton
MariaHCD Nov 11, 2024
62ae851
Merge pull request #51360 from callstack-internal/feat/51333/company-…
rlinoz Nov 11, 2024
b08ea70
Merge pull request #52295 from truph01/fix/52201
carlosmiceli Nov 11, 2024
139154c
Use coordinates to determine a pending route
paultsimura Nov 11, 2024
46e89b0
cleanup: moved report field options to their own file
hannojg Nov 11, 2024
7826228
Merge pull request #52265 from Expensify/twisterdotcom-patch-3
arosiclair Nov 11, 2024
26bae60
Merge pull request #52296 from bernhardoj/fix/51524-hidden-member-sho…
arosiclair Nov 11, 2024
f0aea5b
Merge branch 'main' into fix/49959
nkdengineer Nov 11, 2024
8142c68
fix: refactor function code
nkdengineer Nov 11, 2024
5b1ee3f
Merge pull request #52279 from FitseTLT/fix-double-graying-out-map-pe…
puneetlath Nov 11, 2024
2163bc9
Merge branch 'Expensify:main' into feat/51804
ishpaul777 Nov 11, 2024
1aae872
handles legacy isPolicyExpenseChatEnabled
ishpaul777 Nov 11, 2024
6103185
Merge pull request #47200 from rushatgabhane/margin
dangrous Nov 11, 2024
3a509db
Merge pull request #52153 from Expensify/jamesdeanexpensify-patch-3
dangrous Nov 11, 2024
124450f
Merge pull request #52177 from Expensify/garrettmknight-patch-3
dangrous Nov 11, 2024
286743d
Merge pull request #51445 from Expensify/cmartins-showButtons
luacmartins Nov 11, 2024
843ea3d
Merge pull request #52282 from Shahidullah-Muffakir/fix/51892
blimpich Nov 11, 2024
c91eec9
Merge pull request #51057 from mananjadhav/mj-qab-navigate
francoisl Nov 11, 2024
3a72690
Update version to 9.0.60-0
OSBotify Nov 11, 2024
89b545b
Merge branch 'main' into ionatan_moverbrworkspacechat
iwiznia Nov 11, 2024
cde8f33
Move code to variable
iwiznia Nov 11, 2024
539de6e
review comment changes
ishpaul777 Nov 11, 2024
9e85b9f
Merge pull request #51979 from ishpaul777/feat/51804
puneetlath Nov 11, 2024
9d8571b
Merge pull request #52289 from allroundexperts/synk-fix-electron-upgrade
pecanoro Nov 11, 2024
40d9f8d
Ensure notices are correctly shown on report preview too
iwiznia Nov 11, 2024
3967e86
Merge pull request #52197 from paultsimura/fix/49278-pending-refactor
francoisl Nov 11, 2024
b2d6a0e
Merge pull request #52286 from QichenZhu/fix/51287
francoisl Nov 11, 2024
64cb4ee
Merge pull request #52280 from Expensify/cmartins-sortByAction
luacmartins Nov 12, 2024
0763e4b
fix selecting non-existing user in offline mode
NJ-2020 Nov 12, 2024
e67364f
Merge remote-tracking branch 'upstream/main' into 52140-undefined-car…
huult Nov 12, 2024
09f31d5
Add loading to load Onyx value
huult Nov 12, 2024
ed86723
fix missing highlight bg color when pressing on menu item
bernhardoj Nov 12, 2024
1910bad
prettier
bernhardoj Nov 12, 2024
611d3fe
fix: use pattern B for unassigning cards
koko57 Nov 12, 2024
479d368
add comments for new changes
ZhenjaHorbach Nov 12, 2024
e3632a9
Merge pull request #52089 from nkdengineer/fix/49959
mjasikowski Nov 12, 2024
d737d7b
Merge branch 'refs/heads/main' into workspace-feed-fix-export-item
narefyev91 Nov 12, 2024
6e115b2
use correct onyx key to get data from
narefyev91 Nov 12, 2024
3ef15a0
fix: display a proper cardholder avatar
koko57 Nov 12, 2024
16b9d4e
fix: add detailed comments in test
truph01 Nov 12, 2024
f906450
Merge pull request #52180 from callstack-internal/workspace-feed-fix-…
mountiny Nov 12, 2024
cfb7a1c
fix: apply pattern B styles on a card item in member details page
koko57 Nov 12, 2024
cd3f30f
Merge pull request #52171 from nkdengineer/fix/51616
Julesssss Nov 12, 2024
adcc441
fix: apply requested changes
koko57 Nov 12, 2024
9c8cda7
fix: apply requested changes
koko57 Nov 12, 2024
7b79011
fix: minor change
koko57 Nov 12, 2024
b4a4e34
fix: disable navigating to card details page after unassigning
koko57 Nov 12, 2024
72861ec
fix: minor change
koko57 Nov 12, 2024
894537d
EXFY public room
trjExpensify Nov 12, 2024
b1b27d2
Adding a URL link to a test public room
trjExpensify Nov 12, 2024
2fb666e
Merge pull request #52301 from huult/52140-undefined-card-name-on-ref…
carlosmiceli Nov 12, 2024
9b62f29
Merge pull request #51839 from nkdengineer/fix/51750
carlosmiceli Nov 12, 2024
5e52372
Merge pull request #52400 from Expensify/trjExpensify-exfy-public-rooms
Julesssss Nov 12, 2024
8a1052a
Merge pull request #50800 from software-mansion-labs/war-in/enable-hy…
Julesssss Nov 12, 2024
ad61376
Merge pull request #52357 from callstack-internal/fix/51876-change-of…
mountiny Nov 12, 2024
058b3af
Merge pull request #52307 from ZhenjaHorbach/qbd-export-settings-defa…
lakchote Nov 12, 2024
f6e8eae
Revert "fix: unify distance rates display"
allgandalf Nov 12, 2024
2d43ab0
fix issue with to little height of container
sumo-slonik Nov 12, 2024
0af94cc
Merge pull request #51855 from huult/51161-image-display-on-search-tap
puneetlath Nov 12, 2024
967e8f2
Merge pull request #52406 from allgandalf/revert-50783-fix/49929-unif…
puneetlath Nov 12, 2024
963f92d
Merge pull request #50835 from Expensify/arosiclair-in-product-valida…
pecanoro Nov 12, 2024
be4d7f5
Update version to 9.0.60-1
OSBotify Nov 12, 2024
1c6d9ea
Merge pull request #51509 from QichenZhu/fix/48677
mjasikowski Nov 12, 2024
92b8567
Merge branch 'Expensify:main' into fix-52186
ishpaul777 Nov 12, 2024
58e0f20
clean up as per requests
ishpaul777 Nov 12, 2024
53aa646
remove undefined variable
ishpaul777 Nov 12, 2024
ece58f0
disable button offline
luacmartins Nov 12, 2024
94f9bd2
chore: remove the homepage_initial_render event
adhorodyski Oct 31, 2024
647c3f1
chore: remove the chat_render event
adhorodyski Oct 31, 2024
cb25dc4
chore: remove the report_initial_render event
adhorodyski Oct 31, 2024
67a7ec8
chore: remove the sidebar_loaded event
adhorodyski Oct 31, 2024
fbc01be
chore: remove the switch_report event
adhorodyski Oct 31, 2024
6f0eabb
feat: start remote tracking the message_sent event
adhorodyski Oct 31, 2024
e09796c
feat: start remote tracking the open_report event
adhorodyski Oct 31, 2024
5f27a44
feat: update docs & impl for the open_search event
adhorodyski Nov 4, 2024
c7a661a
docs: update descriptions for the search_filter_options and load_filt…
adhorodyski Nov 4, 2024
c1a0d42
Revert "chore: remove the sidebar_loaded event"
adhorodyski Nov 5, 2024
0d3cf61
fix: imports
adhorodyski Nov 5, 2024
2e7f51a
chore: clear imports linter checks
adhorodyski Nov 5, 2024
8c3da54
chore: rm redundant promise unwrap for removed chat_render
adhorodyski Nov 5, 2024
ee03b3d
fix: linking test for chats
adhorodyski Nov 5, 2024
903f2c4
chore: empty line
adhorodyski Nov 5, 2024
82d58be
feat: do not start the sidebar_loaded event
adhorodyski Nov 5, 2024
b0cc392
chore: rm redundant timing module import
adhorodyski Nov 6, 2024
eb7f2db
fix: linking test assertion scenario
adhorodyski Nov 8, 2024
291dc29
feat: add missing performance markers, rename message_sent to send_me…
adhorodyski Nov 8, 2024
669e3a0
chore: rm redundant timing module import
adhorodyski Nov 8, 2024
216db09
docs: rename message_sent to send_message
adhorodyski Nov 8, 2024
11ff391
fix: sidebar_loaded end event trigger & docs
adhorodyski Nov 12, 2024
41978b1
Merge branch 'Expensify:main' into feat/perf-analytics-markers
adhorodyski Nov 12, 2024
7b31a72
Merge pull request #52353 from bernhardoj/fix/52246-missing-pressed-b…
yuwenmemon Nov 12, 2024
b9e6208
Merge pull request #52311 from margelo/cleanup/optionlistutils-report…
dangrous Nov 12, 2024
72879a3
unit tests
ishpaul777 Nov 12, 2024
1fdc8a7
Merge pull request #51643 from truph01/fix/50927
tgolen Nov 12, 2024
84edcc1
remove console log
ishpaul777 Nov 12, 2024
0ba31d2
Merge pull request #52412 from Expensify/cmartins-disableActionButtons
NikkiWines Nov 12, 2024
f338d04
Merge pull request #51815 from callstack-internal/feat/perf-analytics…
mountiny Nov 12, 2024
6a0ca29
Merge branch 'main' into youssef_free_trial_action_button
youssef-lr Nov 12, 2024
bd98aa5
Update version to 9.0.60-2
OSBotify Nov 12, 2024
bb1d06b
Merge pull request #52288 from ishpaul777/fix-52186
mountiny Nov 12, 2024
2bf7870
Merge pull request #51594 from Expensify/youssef_free_trial_action_bu…
youssef-lr Nov 12, 2024
861d7e5
Merge pull request #51893 from Expensify/ionatan_moverbrworkspacechat
cead22 Nov 12, 2024
4611f36
Update Configure-Quickbooks-Online.md
michaelkwardrop Nov 12, 2024
dc1e79d
Merge pull request #52422 from Expensify/michaelkwardrop-patch-1
rlinoz Nov 12, 2024
0e07520
Revert "Move RBR to workspace chats instead of transaction threads"
cead22 Nov 12, 2024
b830e70
Merge pull request #52431 from Expensify/revert-51893-ionatan_moverbr…
flodnv Nov 12, 2024
3023d60
Merge pull request #52072 from ChavdaSachin/fix-51432/Close-Focus-pop…
cead22 Nov 12, 2024
f23a5f0
resolve conflicts
luacmartins Nov 12, 2024
b8a168d
resolve conflicts
luacmartins Nov 12, 2024
9be236c
Merge pull request #52434 from Expensify/revert-PR-51445
francoisl Nov 12, 2024
cd9cc38
Update version to 9.0.60-3
OSBotify Nov 12, 2024
7256ad6
Update version to 9.0.61-0
OSBotify Nov 13, 2024
c24d217
Merge pull request #52350 from NJ-2020/fix/51651
lakchote Nov 13, 2024
ed4e2e9
Merge branch 'main' into @BartoszGrajdek/react-native-modal-refactor-…
sumo-slonik Nov 14, 2024
3ad4eab
fix problem with no handling gestures
sumo-slonik Nov 14, 2024
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
7 changes: 6 additions & 1 deletion src/components/Modal/BaseModal.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {PortalHost} from '@gorhom/portal';
import React, {forwardRef, useCallback, useEffect, useMemo, useRef} from 'react';
import {View} from 'react-native';
import ReactNativeModal from 'react-native-modal';
// import ReactNativeModal from 'react-native-modal';
import ColorSchemeWrapper from '@components/ColorSchemeWrapper';
import FocusTrapForModal from '@components/FocusTrap/FocusTrapForModal';
import useKeyboardState from '@hooks/useKeyboardState';
Expand All @@ -20,6 +20,7 @@ import * as Modal from '@userActions/Modal';
import CONST from '@src/CONST';
import ModalContent from './ModalContent';
import ModalContext from './ModalContext';
import ReactNativeModal from './ReactNativeModal/Modal';
import type BaseModalProps from './types';

function BaseModal(
Expand Down Expand Up @@ -246,7 +247,11 @@ function BaseModal(
style={modalStyle}
deviceHeight={windowHeight}
deviceWidth={windowWidth}
/* eslint-disable @typescript-eslint/ban-ts-comment */
// @ts-ignore
animationIn={animationIn ?? modalStyleAnimationIn}
/* eslint-disable @typescript-eslint/ban-ts-comment */
// @ts-ignoreanimationOut={animationOut ?? modalStyleAnimationOut}
animationOut={animationOut ?? modalStyleAnimationOut}
// eslint-disable-next-line react-compiler/react-compiler
useNativeDriver={useNativeDriverProp && useNativeDriver}
Expand Down
43 changes: 20 additions & 23 deletions src/components/Modal/ReactNativeModal/Container.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React, {useEffect, useState} from 'react';
import type {LayoutChangeEvent} from 'react-native';
import Animated, {Easing, SlideInDown, useAnimatedRef, useAnimatedStyle, useSharedValue, withDelay, withTiming} from 'react-native-reanimated';
import useThemeStyles from '@hooks/useThemeStyles';
import type {ModalProps} from 'react-native-modal';
import Animated, {Easing, useAnimatedRef, useAnimatedStyle, useSharedValue, withDelay, withTiming} from 'react-native-reanimated';
import type {ThemeStyles} from '@src/styles';

type ContainerProps = Partial<ModalProps> & {
isVisible: boolean;
Expand All @@ -10,54 +11,50 @@
isHeightCalculated: boolean;
toggleCalculatedHeight: (value: boolean) => void;
deviceHeight?: number | undefined | null;
style?: any;
style?: ThemeStyles;
onLayout?: (event: LayoutChangeEvent) => void;
setMeasuredHeight: (value: number) => void;
testName: string;
};

function Container({isVisible, isContainerOpen, isTransitioning, isHeightCalculated, toggleCalculatedHeight, style, onLayout, setMeasuredHeight, testName, ...props}: ContainerProps) {
const styles = useThemeStyles();
function Container({isVisible, isContainerOpen, isTransitioning, isHeightCalculated, toggleCalculatedHeight, style, onLayout, testName, ...props}: ContainerProps) {
const animatedRef = useAnimatedRef();
const [measuredHeight, setMH] = useState<number>(0);

const translateY = useSharedValue(500);
const translateY = useSharedValue(1000);

useEffect(() => {
if (!isTransitioning) {
return;
}
// console.log(testName, ' Container: isVisible & translateY', isVisible, isVisible ? 0 : 500);
console.log(testName, ' Container: isVisible & translateY & opacity', isVisible, isVisible ? 0 : 500, !isHeightCalculated || (isVisible !== isContainerOpen && !isTransitioning));

Check failure on line 29 in src/components/Modal/ReactNativeModal/Container.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

Unexpected console statement

Check failure on line 29 in src/components/Modal/ReactNativeModal/Container.tsx

View workflow job for this annotation

GitHub Actions / ESLint check

Unexpected console statement

// eslint-disable-next-line react-compiler/react-compiler
translateY.value = withDelay(0, withTiming(isVisible ? 0 : 500, {duration: 300, easing: Easing.inOut(Easing.ease)}));
setMH(0);
}, [isVisible, isTransitioning]);
translateY.value = withDelay(0, withTiming(isVisible ? 0 : 450, {duration: 300, easing: Easing.inOut(Easing.ease)}));
setMH(500);
}, [isVisible, isTransitioning, translateY]);

Check warning on line 34 in src/components/Modal/ReactNativeModal/Container.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

React Hook useEffect has missing dependencies: 'isContainerOpen', 'isHeightCalculated', and 'testName'. Either include them or remove the dependency array

Check warning on line 34 in src/components/Modal/ReactNativeModal/Container.tsx

View workflow job for this annotation

GitHub Actions / ESLint check

React Hook useEffect has missing dependencies: 'isContainerOpen', 'isHeightCalculated', and 'testName'. Either include them or remove the dependency array

const animatedStyles = useAnimatedStyle(() => {
return {
transform: [{translateY: translateY.value}],
opacity: !isHeightCalculated || (isVisible !== isContainerOpen && !isTransitioning) ? 0 : 1,
};
});

console.log('props: ', Object.keys(props).join('-'));
return (
<Animated.View
ref={animatedRef}
style={[style, animatedStyles]}
style={[style, animatedStyles, {flex: 1, height: '100%', flexDirection: 'row'}]}
// eslint-disable-next-line react/jsx-props-no-spreading
{...props}
{...props.panHandlers}
>
<Animated.View
// TODO: check this 100%
style={{width: '100%'}}
style={{width: '100%', flex: 1, alignSelf: 'flex-end'}}
onLayout={(event) => {
if (!measuredHeight && event.nativeEvent.layout.height && measuredHeight !== event.nativeEvent.layout.height) {
// translateY.value = 500;
setMH(event.nativeEvent.layout.height);
setMeasuredHeight(event.nativeEvent.layout.height);
toggleCalculatedHeight(true);
const {height} = event.nativeEvent.layout;
if (measuredHeight || !height || measuredHeight === height) {
return;
}

setMH(height);
toggleCalculatedHeight(true);
}}
>
{props.children}
Expand Down
Loading
Loading