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

[WAVE7] Hold Requests: Approving/Paying expense reports with held requests #33124

Merged
Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
3f4df08
Add reason interstatial
BartoszGrajdek Nov 22, 2023
faebe01
Merge remote-tracking branch 'origin/main' into hold-requests/money-r…
BartoszGrajdek Nov 22, 2023
f4297cd
Hold banner
BartoszGrajdek Nov 23, 2023
317f5fc
Add new translations
BartoszGrajdek Dec 5, 2023
da7e0a6
Change Header styles
BartoszGrajdek Dec 5, 2023
d38c0f6
Add full boolean to IOU requests
BartoszGrajdek Dec 5, 2023
818a841
Mock Report & Transaction Utils
BartoszGrajdek Dec 5, 2023
ed3fe5e
Add Offline Support
BartoszGrajdek Dec 14, 2023
275e17b
merge main
BartoszGrajdek Dec 14, 2023
7301183
Refactor utility functions
BartoszGrajdek Dec 14, 2023
f28bd09
fix: prettier
BartoszGrajdek Dec 14, 2023
e237009
Remove redundant import
BartoszGrajdek Dec 14, 2023
4e36be7
Merge remote-tracking branch 'origin/main' into hold-requests/money-r…
BartoszGrajdek Dec 14, 2023
38f28b5
fix: resolve merge conflicts
BartoszGrajdek Dec 18, 2023
7fefad2
fix: imports
BartoszGrajdek Dec 18, 2023
aa63896
fix: remove merge conflict
BartoszGrajdek Dec 18, 2023
cc5b1a0
Resolve merge conflict
BartoszGrajdek Dec 18, 2023
adea766
fix: prettier
BartoszGrajdek Dec 18, 2023
7067e21
fix: typecheck
BartoszGrajdek Dec 18, 2023
eb74222
Refactor Hold Feature
BartoszGrajdek Dec 18, 2023
19aa76d
Remove comment
BartoszGrajdek Dec 18, 2023
32e7c7e
imports fixes
BartoszGrajdek Dec 18, 2023
47c7c8d
feat: add offline support & system notifications
BartoszGrajdek Dec 29, 2023
c56681c
Resolve merge conflicts
BartoszGrajdek Dec 29, 2023
2fee6b7
fix: rename API call
BartoszGrajdek Jan 2, 2024
7033f38
refactor: migrate new files & new functions to TS
BartoszGrajdek Jan 2, 2024
04636a8
fix: change names
BartoszGrajdek Jan 2, 2024
b81c5df
fix: handle a case where every request is on HOLD
BartoszGrajdek Jan 2, 2024
20f568c
fix: order of system messages created date correction
BartoszGrajdek Jan 2, 2024
34e2d8c
fix: remove console logs
BartoszGrajdek Jan 2, 2024
d31c2a8
chore: resolve merge conflicts
BartoszGrajdek Jan 3, 2024
9eda512
chore: resolve merge conflicts
BartoszGrajdek Jan 10, 2024
beb1dc8
feat: add individual money request changes
BartoszGrajdek Jan 10, 2024
01e1bdb
feat: add offline support for partial payments/approvals
BartoszGrajdek Jan 18, 2024
7bd074d
chore: resolve merge conflicts
BartoszGrajdek Feb 4, 2024
3e90c40
fix: update PR with individual money request changes
BartoszGrajdek Feb 5, 2024
2574741
fix: lint
BartoszGrajdek Feb 5, 2024
75741ae
fix: merge problems
BartoszGrajdek Feb 5, 2024
3c1edf5
fix: lint
BartoszGrajdek Feb 5, 2024
14a7b65
chore: resolve merge conflicts
BartoszGrajdek Feb 5, 2024
c080092
chore: resolve merge conflicts
BartoszGrajdek Feb 19, 2024
9c4c695
fix: resolve merge conflicts
BartoszGrajdek Feb 19, 2024
914443e
fix: typecheck fixes
BartoszGrajdek Feb 19, 2024
d9a8fec
fix: remove JS file
BartoszGrajdek Feb 19, 2024
4734744
fix: lint
BartoszGrajdek Feb 19, 2024
7428752
fix: imports & double negation
BartoszGrajdek Feb 19, 2024
68aa153
fix: remove Form.ts
BartoszGrajdek Feb 19, 2024
46e626b
Merge remote-tracking branch 'origin/main' into hold-requests/money-r…
BartoszGrajdek Feb 20, 2024
5c44e41
Merge remote-tracking branch 'origin/main' into hold-requests/money-r…
BartoszGrajdek Feb 20, 2024
37311c3
feat: change how reports with held requests are paid/approved optimis…
BartoszGrajdek Feb 20, 2024
69839f1
fix: partial approvals modal not being shown
BartoszGrajdek Feb 21, 2024
5c535dd
chore: resolve merge conflicts
BartoszGrajdek Feb 21, 2024
a8a414f
feat: add handling for unheldTotal
BartoszGrajdek Mar 1, 2024
3cd3849
chore: lint
BartoszGrajdek Mar 1, 2024
7f691ff
chore: resolve merge conflicts
BartoszGrajdek Mar 1, 2024
071ca7b
fix: offline support for system messages
BartoszGrajdek Mar 6, 2024
d35f1cb
feat: hide checkmark for partially paid requests
BartoszGrajdek Mar 6, 2024
a86501a
chore: resolve merge conflicts
BartoszGrajdek Mar 21, 2024
54d293b
fix: amount displayed & pay/approve button
BartoszGrajdek Mar 21, 2024
9780889
chore: resolve merge conflicts
BartoszGrajdek Mar 27, 2024
cbb1a7b
fix: review suggestions & small bugs
BartoszGrajdek Mar 28, 2024
6f99630
fix: change comments
BartoszGrajdek Mar 28, 2024
e538272
chore: resolve merge conflicts
BartoszGrajdek Mar 28, 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
Prev Previous commit
Next Next commit
Change Header styles
  • Loading branch information
BartoszGrajdek committed Dec 5, 2023
commit da7e0a69921289525d8e5398f2c9265d40341cbb
9 changes: 6 additions & 3 deletions src/components/Header.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, {ReactElement} from 'react';
import {StyleProp, TextStyle, View} from 'react-native';
import {StyleProp, TextStyle, View, ViewStyle} from 'react-native';
import useThemeStyles from '@styles/useThemeStyles';
import EnvironmentBadge from './EnvironmentBadge';
import Text from './Text';
Expand All @@ -16,12 +16,15 @@ type HeaderProps = {

/** Additional text styles */
textStyles?: StyleProp<TextStyle>;

/** Additional text styles */
containerStyles?: StyleProp<ViewStyle>;
};

function Header({title = '', subtitle = '', textStyles = [], shouldShowEnvironmentBadge = false}: HeaderProps) {
function Header({title = '', subtitle = '', textStyles = [], containerStyles = [], shouldShowEnvironmentBadge = false}: HeaderProps) {
const styles = useThemeStyles();
return (
<View style={[styles.flex1, styles.flexRow]}>
<View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, containerStyles]}>
<View style={styles.mw100}>
{typeof title === 'string'
? Boolean(title) && (
Expand Down