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.

Sign up for GitHub

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

Jump to bottom

Fix/28952: Add subtitle to category page #29266

Merged
merged 2 commits into from
Oct 20, 2023
Merged

Fix/28952: Add subtitle to category page #29266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9e3221
add subtitle to category page
DylanDylann Oct 11, 2023
5511846
remove redandunt
DylanDylann Oct 11, 2023
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
1 change: 1 addition & 0 deletions src/languages/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,7 @@ export default {
threadRequestReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `${formattedAmount} request${comment ? ` for ${comment}` : ''}`,
threadSentMoneyReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} sent${comment ? ` for ${comment}` : ''}`,
tagSelection: ({tagName}: TagSelectionParams) => `Select a ${tagName} to add additional organization to your money`,
categorySelection: 'Select a category to add additional organization to your money',
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think this copy was checked? It does not really read like a proper English sentence. We're going to create an issue to modify it.

Copy link
Contributor

Choose a reason for hiding this comment

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

Fixed here: #38242

error: {
invalidAmount: 'Please enter a valid amount before continuing.',
invalidSplit: 'Split amounts do not equal total amount',
Expand Down
1 change: 1 addition & 0 deletions src/languages/es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,6 +556,7 @@ export default {
threadRequestReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `Solicitud de ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
threadSentMoneyReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} enviado${comment ? ` para ${comment}` : ''}`,
tagSelection: ({tagName}: TagSelectionParams) => `Seleccione una ${tagName} para organizar mejor tu dinero`,
categorySelection: 'Seleccione una categoría para organizar mejor tu dinero',
error: {
invalidAmount: 'Por favor ingresa un monto válido antes de continuar.',
invalidSplit: 'La suma de las partes no equivale al monto total',
Expand Down
4 changes: 3 additions & 1 deletion src/pages/EditRequestCategoryPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import ScreenWrapper from '../components/ScreenWrapper';
import HeaderWithBackButton from '../components/HeaderWithBackButton';
import Navigation from '../libs/Navigation/Navigation';
import useLocalize from '../hooks/useLocalize';
import styles from '../styles/styles';
import Text from '../components/Text';
import CategoryPicker from '../components/CategoryPicker';

const propTypes = {
Expand Down Expand Up @@ -36,7 +38,7 @@ function EditRequestCategoryPage({defaultCategory, policyID, onSubmit}) {
title={translate('common.category')}
onBackButtonPress={Navigation.goBack}
/>

<Text style={[styles.ph5, styles.pv3]}>{translate('iou.categorySelection')}</Text>
<CategoryPicker
selectedCategory={defaultCategory}
policyID={policyID}
Expand Down
4 changes: 3 additions & 1 deletion src/pages/EditRequestTagPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ import PropTypes from 'prop-types';
import Navigation from '../libs/Navigation/Navigation';
import useLocalize from '../hooks/useLocalize';
import ScreenWrapper from '../components/ScreenWrapper';
import Text from '../components/Text';
import HeaderWithBackButton from '../components/HeaderWithBackButton';
import styles from '../styles/styles';
import TagPicker from '../components/TagPicker';

const propTypes = {
Expand Down Expand Up @@ -37,7 +39,7 @@ function EditRequestTagPage({defaultTag, policyID, tagName, onSubmit}) {
title={tagName || translate('common.tag')}
onBackButtonPress={Navigation.goBack}
/>

<Text style={[styles.ph5, styles.pv3]}>{translate('iou.tagSelection', {tagName: tagName || translate('common.tag')})}</Text>
<TagPicker
selectedTag={defaultTag}
tag={tagName}
Expand Down
4 changes: 3 additions & 1 deletion src/pages/iou/MoneyRequestCategoryPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ import CategoryPicker from '../../components/CategoryPicker';
import ONYXKEYS from '../../ONYXKEYS';
import reportPropTypes from '../reportPropTypes';
import * as IOU from '../../libs/actions/IOU';
import styles from '../../styles/styles';
import Text from '../../components/Text';
import {iouPropTypes, iouDefaultProps} from './propTypes';

const propTypes = {
Expand Down Expand Up @@ -70,7 +72,7 @@ function MoneyRequestCategoryPage({route, report, iou}) {
title={translate('common.category')}
onBackButtonPress={navigateBack}
/>

<Text style={[styles.ph5, styles.pv3]}>{translate('iou.categorySelection')}</Text>
<CategoryPicker
selectedCategory={iou.category}
policyID={report.policyID}
Expand Down
Loading