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

[pull] main from Expensify:main #36

Merged
merged 457 commits into from
Oct 13, 2023
Merged

Conversation

pull[bot]
Copy link

@pull pull bot commented Oct 13, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

ayazalavi and others added 30 commits October 9, 2023 18:46
Signed-off-by: Ayaz Alavi <ayaz.alavi@gmail.com>
Signed-off-by: Ayaz Alavi <ayaz.alavi@gmail.com>
Signed-off-by: Ayaz Alavi <ayaz.alavi@gmail.com>
Uploading 2x images for the new Helpdot Auto-Reconciliation article.
pac-guerreiro and others added 27 commits October 13, 2023 16:11
# Conflicts:
#	src/ROUTES.ts
#	src/languages/en.ts
#	src/libs/Navigation/AppNavigator/ModalStackNavigators.js
#	src/libs/Navigation/linkingConfig.js
#	src/pages/settings/Wallet/PaymentMethodList.js
#	src/pages/settings/Wallet/WalletPage/BaseWalletPage.js
#	src/pages/settings/Wallet/assignedCardPropTypes.js

add missing translations

# Conflicts:
#	src/languages/es.ts

translate title, remove unnecessary useCallback

modify comment

# Conflicts:
#	src/pages/settings/Wallet/WalletEmptyState.js

add missing type to ROUTES

remove unnecessary dependency

# Conflicts:
#	src/pages/settings/Wallet/PaymentMethodList.js

remove unused prop

chore(wallet): resolve merge conflicts

# Conflicts:
#	src/libs/Navigation/linkingConfig.js
#	src/pages/settings/Wallet/PaymentMethodList.js
#	src/pages/settings/Wallet/WalletPage/BaseWalletPage.js
#	src/pages/settings/Wallet/WalletPage/WalletPage.js

fix(wallet): clicking on an expensify card causing app to crash

refactor(expensify card): rename card active states constant and import it where needed

fix(expensify card): domain cards not getting properly setup because of different name cases

fix(wallet): assigned cards section spacing
…tePolicy

[CP Staging] [NoQA] Switch to the production teachers unite policy
fix blinking loader in connect bank account page
[No QA] [TS migration] Migrate 'Pusher' lib to TypeScript
…ates-check

fix check of available dates of next month
…eyRequestView

[Wave 8 - ECard Transactions] Update Money Request View Fields to support Ecard transactions
Fix wrong onyx config in ReportFooter
Upgrade `react-native-sdk` to v8.3.0
Create Additional-Travel-Integrations.md
fix: close not-found page when dismissing modal
fix: 25779 Accessing an attachment via link that is not found shows the error page twice
…validation

Improve `new form` validation
…d-tile-and-display-expensify-cards

Feature/add assigned card tile and display expensify cards
[No QA]Comment out bot messages since e2e are too flaky
[No QA]Add a check for the new OS Botify App in the deploy process
@allroundexperts allroundexperts merged commit d14e998 into allroundexperts:main Oct 13, 2023
1 check failed
allroundexperts pushed a commit that referenced this pull request Feb 2, 2024
…-merge-fixes-v6

ideal-nav-merge fixes v6
allroundexperts pushed a commit that referenced this pull request Oct 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.