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

[Simplified Collect][Taxes] Create WorkspaceTaxesPage #37870

Merged
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
049c487
Create WorkspaceTaxesPage
filip-solecki Mar 7, 2024
a491463
Remove unnecessary check
filip-solecki Mar 7, 2024
bc18001
Remove unnecessary import
filip-solecki Mar 7, 2024
0ff7067
Fix icon fill color
filip-solecki Mar 7, 2024
2d43808
CR fixes
filip-solecki Mar 7, 2024
b63bcbb
use ListItem type
filip-solecki Mar 7, 2024
a97c874
Fix tax icon
filip-solecki Mar 7, 2024
60aa7d3
Fix icon tax fill
filip-solecki Mar 7, 2024
e933a60
Header buttons
filip-solecki Mar 7, 2024
be9c328
Merge branch 'main' into wave8/WorkspaceTaxesPage
filip-solecki Mar 8, 2024
f06d07b
Merge branch 'main' into wave8/WorkspaceTaxesPage
filip-solecki Mar 11, 2024
c160d40
Add translations and adjust SelectionList
filip-solecki Mar 11, 2024
6838836
Merge branch 'main' into wave8/WorkspaceTaxesPage
filip-solecki Mar 11, 2024
940370c
Merge branch 'main' into wave8/WorkspaceTaxesPage
filip-solecki Mar 12, 2024
fd6716b
Fix failing TS
filip-solecki Mar 12, 2024
8bfd4ef
Fix Lint
filip-solecki Mar 12, 2024
e0ca61f
CR fixes
filip-solecki Mar 12, 2024
4ba47a8
Add possibility to remove foreign currency default tax
filip-solecki Mar 12, 2024
606c12d
Rename prop
filip-solecki Mar 12, 2024
2687bfb
handle isOffline mode and fetching taxes data
filip-solecki Mar 12, 2024
f3ab59c
Merge branch 'main' into wave8/WorkspaceTaxesPage
filip-solecki Mar 12, 2024
9fd30e5
Merge branch 'main' into wave8/WorkspaceTaxesPage
filip-solecki Mar 13, 2024
d772221
Fix type for WorkspaceTaxesPage
filip-solecki Mar 13, 2024
d696446
Refactor isDisabledCheckbox
filip-solecki Mar 13, 2024
14072ae
Merge branch 'main' into wave8/WorkspaceTaxesPage
kosmydel Mar 13, 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
28 changes: 27 additions & 1 deletion src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type {StackScreenProps} from '@react-navigation/stack';
import React, {useMemo, useState} from 'react';
import {View} from 'react-native';
import Button from '@components/Button';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
Expand Down Expand Up @@ -77,6 +78,26 @@ function WorkspaceTaxesPage({policy}: WorkspaceTaxesPageProps) {
</View>
);

const headerButtons = (
<View style={[styles.w100, styles.flexRow, isSmallScreenWidth && styles.mb3]}>
<Button
medium
success
onPress={() => {}}
icon={Expensicons.Plus}
text="Add rate"
style={[styles.mr3, isSmallScreenWidth && styles.w50]}
Copy link
Contributor

@suneox suneox Oct 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In other places, we’re using mr2 or gap2 between buttons on headers, which is causing this issue.

/>
<Button
medium
onPress={() => {}}
icon={Expensicons.Gear}
text={translate('common.settings')}
style={[isSmallScreenWidth && styles.w50]}
/>
</View>
);

return (
<AdminPolicyAccessOrNotFoundWrapper policyID={policy?.id ?? ''}>
<PaidPolicyAccessOrNotFoundWrapper policyID={policy?.id ?? ''}>
Expand All @@ -90,7 +111,12 @@ function WorkspaceTaxesPage({policy}: WorkspaceTaxesPageProps) {
icon={Illustrations.Coins}
title={translate('workspace.common.taxes')}
shouldShowBackButton={isSmallScreenWidth}
/>
>
{!isSmallScreenWidth && headerButtons}
</HeaderWithBackButton>

{isSmallScreenWidth && <View style={[styles.pl5, styles.pr5]}>{headerButtons}</View>}

<View style={[styles.ph5, styles.pb5]}>
<Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.taxes.subtitle')}</Text>
</View>
Expand Down
Loading