Skip to content

develop #706

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

Merged
merged 12 commits into from
Dec 5, 2023
Merged

develop #706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ee784c4
New translations translation.json (Italian)
cannarocks Nov 23, 2023
4f59006
🐛 fix(CampaignPage.tsx): move error handling logic before rendering t…
marcbon Dec 1, 2023
c12369f
Merge pull request #704 from AppQuality/fix-campaign-logout
iDome89 Dec 1, 2023
a66e147
🔥 refactor(who.tsx): remove unused StyledHint component in WhoStep co…
marcbon Dec 1, 2023
7a95138
🔀 chore(translation.json): remove unused language option hint in mult…
marcbon Dec 1, 2023
dab94b9
Merge pull request #705 from AppQuality/remove-english-delay-express-who
marcbon Dec 1, 2023
b4c84cd
New translations translation.json (Italian)
cannarocks Dec 1, 2023
6ad7d80
Merge branch 'develop' into i18n-translations
cannarocks Dec 5, 2023
ca21623
🔥 refactor(who.tsx): remove unused StyledHint component in ExpressWiz…
marcbon Dec 5, 2023
e122b22
🔥 refactor(who.tsx): remove unused import 'Hint' from 'express-1/who.…
marcbon Dec 5, 2023
79eff23
Merge pull request #707 from AppQuality/fix-unused-hint
cannarocks Dec 5, 2023
f024215
Merge pull request #703 from AppQuality/i18n-translations
cannarocks Dec 5, 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: 0 additions & 1 deletion src/locales/ach/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,6 @@
"__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_LABEL": "crwdns5087:0crwdne5087:0",
"__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_OPTION_1": "crwdns5089:0crwdne5089:0",
"__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_OPTION_2": "crwdns5091:0crwdne5091:0",
"__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_OPTION_2_HINT": "crwdns5093:0crwdne5093:0",
"__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_TITLE": "crwdns5095:0crwdne5095:0",
"__EXPRESS_WIZARD_STEP_WHO_LABEL": "crwdns5097:0crwdne5097:0",
"__EXPRESS_WIZARD_STEP_WHO_LABEL_EXTRA": "crwdns5099:0crwdne5099:0",
Expand Down
1 change: 0 additions & 1 deletion src/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,6 @@
"__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_LABEL": "Select the testers' spoken language",
"__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_OPTION_1": "Italian",
"__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_OPTION_2": "English",
"__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_OPTION_2_HINT": "+24h delivery time",
"__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_TITLE": "Language",
"__EXPRESS_WIZARD_STEP_WHO_LABEL": "Who",
"__EXPRESS_WIZARD_STEP_WHO_LABEL_EXTRA": "is the target of the campaign?",
Expand Down
5 changes: 1 addition & 4 deletions src/locales/it/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
"__BUGS_PAGE_CUSTOM_STATUS_DRAWER_EDIT_COLOR_BUTTON": "Modifica colore",
"__BUGS_PAGE_CUSTOM_STATUS_DRAWER_ERROR_TOAST": "Modifiche non salvate. Controlla i campi con errore.",
"__BUGS_PAGE_CUSTOM_STATUS_DRAWER_ERROR_TOAST_API": "Qualcosa è andato storto, per favore riprova.",
"__BUGS_PAGE_CUSTOM_STATUS_DRAWER_HEADER_TITLE": "Crea o modifica stati",
"__BUGS_PAGE_CUSTOM_STATUS_DRAWER_HEADER_TITLE": "Add or edit statuses",
"__BUGS_PAGE_CUSTOM_STATUS_DRAWER_NEW_CUSTOM_STATUS_SUCCESS": "Nuovo stato aggiunto! Salvalo per vederlo nella campagna.",
"__BUGS_PAGE_CUSTOM_STATUS_DRAWER_PHASE_1_NAME": "In lavorazione",
"__BUGS_PAGE_CUSTOM_STATUS_DRAWER_PHASE_2_NAME": "Completato",
Expand Down Expand Up @@ -728,7 +728,6 @@
"__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_LABEL": "Seleziona la lingua parlata dai tester",
"__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_OPTION_1": "Italiano",
"__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_OPTION_2": "Inglese",
"__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_OPTION_2_HINT": "+24h sul tempo di consegna",
"__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_TITLE": "Lingua",
"__EXPRESS_WIZARD_STEP_WHO_LABEL": "Chi",
"__EXPRESS_WIZARD_STEP_WHO_LABEL_EXTRA": "è il target della campagna?",
Expand Down Expand Up @@ -872,9 +871,7 @@
"Typology ({{count}})_many": "",
"Typology ({{count}})_other": "Tipologie ({{count}})",
"Use Cases ({{count}})_one": "Use Case ({{count}})",
"Use Cases ({{count}})_many": "",
"Use Cases ({{count}})_other": "Use Case ({{count}})",
"UseCase ({{count}})_one": "Use Case ({{count}})",
"UseCase ({{count}})_many": "",
"UseCase ({{count}})_other": "Use Case ({{count}})"
}
12 changes: 5 additions & 7 deletions src/pages/Campaign/CampaignPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@ const CampaignPage = ({ children }: { children: React.ReactNode }) => {
cid: campaignId?.toString() ?? '0',
});

if (isErrorCampaign) {
navigate(notFoundRoute, {
state: { from: location.pathname },
});
}

useEffect(() => {
if (workspace) {
dispatch(setWorkspace(workspace));
Expand All @@ -64,7 +58,11 @@ const CampaignPage = ({ children }: { children: React.ReactNode }) => {
};
}, [campaign]);

if (!campaign) return null;
if (isErrorCampaign) {
navigate(notFoundRoute, {
state: { from: location.pathname },
});
}

return (
<Page
Expand Down
8 changes: 0 additions & 8 deletions src/pages/ExpressWizard/steps/express-1/who.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {
ContainerCard,
Hint,
Label,
Message,
Paragraph,
Expand Down Expand Up @@ -43,10 +42,6 @@ const StyledRadioField = styled(Field)`
margin-top: ${({ theme }) => theme.space.base * 4}px;
`;

const StyledHint = styled(Hint)`
color: ${({ theme }) => theme.palette.yellow[800]};
`;

export const WhoStep = ({
errors,
values,
Expand Down Expand Up @@ -124,9 +119,6 @@ export const WhoStep = ({
<Label isRegular>
{t('__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_OPTION_2')}
</Label>
<StyledHint>
{t('__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_OPTION_2_HINT')}
</StyledHint>
</Radio>
</StyledRadioField>
</WizardCol>
Expand Down
8 changes: 0 additions & 8 deletions src/pages/ExpressWizard/steps/express-2/who.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {
ContainerCard,
Hint,
Label,
Message,
Paragraph,
Expand Down Expand Up @@ -42,10 +41,6 @@ const StyledRadioField = styled(Field)`
margin-top: ${({ theme }) => theme.space.base * 4}px;
`;

const StyledHint = styled(Hint)`
color: ${({ theme }) => theme.palette.yellow[800]};
`;

export const WhoStep = ({
errors,
values,
Expand Down Expand Up @@ -123,9 +118,6 @@ export const WhoStep = ({
<Label isRegular>
{t('__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_OPTION_2')}
</Label>
<StyledHint>
{t('__EXPRESS_WIZARD_STEP_WHO_FIELD_LANGUAGE_OPTION_2_HINT')}
</StyledHint>
</Radio>
</StyledRadioField>
</WizardCol>
Expand Down