filippodb
/
covidpass-greenpass-su-iphone-ios-android-wallet
mirror of https://github.com/covidpass-org/covidpass.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

moved warning messages to top of page

This commit is contained in:
Jason Liu 2021-09-28 03:02:16 -04:00
parent e659c5ab30
commit cdd09af07e
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
components/Form.tsx
View File

@ -43,7 +43,7 @@ function Form(): JSX.Element {
const [isDisabledAppleWallet, setIsDisabledAppleWallet] = useState<boolean>(false);
const [errorMessages, _setErrorMessages] = useState<Array<string>>([]);
const [warningMessages, _setWarningMessages] = useState<Array<string>>([]);
// const [warningMessages, _setWarningMessages] = useState<Array<string>>([]);
const hitcountHost = 'https://stats.vaccine-ontario.ca';
@ -57,14 +57,14 @@ function Form(): JSX.Element {
_setErrorMessages(Array.from(new Set([...errorMessages, translation !== message ? translation : message])));
};
const setWarningMessage = (message: string) => {
if (!message) {
return;
}
// const setWarningMessage = (message: string) => {
// if (!message) {
// return;
// }
const translation = t('errors:'.concat(message));
_setWarningMessages(Array.from(new Set([...warningMessages, translation !== message ? translation : message])));
}
// const translation = t('errors:'.concat(message));
// _setWarningMessages(Array.from(new Set([...warningMessages, translation !== message ? translation : message])));
// }
const deleteErrorMessage = (message: string) =>{
console.log(errorMessages)
@ -98,7 +98,7 @@ function Form(): JSX.Element {
async function gotoOntarioHealth(e) {
e.preventDefault();
window.location.href = 'https://covid19.ontariohealth.ca';
window.open('https://covid19.ontariohealth.ca','_blank');
}
async function goToFAQ(e) {
e.preventDefault();
@ -311,11 +311,12 @@ function Form(): JSX.Element {
setErrorMessage('Sorry, only Safari can be used to add a Wallet Pass on iOS');
setIsDisabledAppleWallet(true);
console.log('not safari')
} else if (!isIOS) {
setWarningMessage('Only Safari on iOS is officially supported for Wallet import at the moment - ' +
'for other platforms, please ensure you have an application which can open Apple Wallet .pkpass files');
setIsDisabledAppleWallet(false);
}
// } else if (!isIOS) {
// setWarningMessage('Only Safari on iOS is officially supported for Wallet import at the moment - ' +
// 'for other platforms, please ensure you have an application which can open Apple Wallet .pkpass files');
// setIsDisabledAppleWallet(false);
// }
}
return (
@ -422,9 +423,9 @@ function Form(): JSX.Element {
{errorMessages.map((message, i) =>
<Alert message={message} key={'error-' + i} type="error" />
)}
{warningMessages.map((message, i) =>
{/* {warningMessages.map((message, i) =>
<Alert message={message} key={'warning-' + i} type="warning" />
)}
)} */}
</div>
}/>

12
pages/index.tsx
View File

@ -24,9 +24,13 @@ function Index(): JSX.Element {
const deleteWarningMessage = (message: string) => _setWarningMessages(warningMessages.filter(item => item !== message));
// useEffect(() => {
// if (!isSafari) setWarningMessage("iPhone users, only Safari is supported at the moment. Please switch to Safari to prevent any unexpected errors.")
// })
useEffect(() => {
if (isIOS && !isSafari) setWarningMessage("iPhone users, only Safari is supported at the moment. Please switch to Safari to prevent any unexpected errors.")
else if (!isIOS) {
setWarningMessage('Only Safari on iOS is officially supported for Apple Wallet import at the moment - ' +
'for other platforms, please ensure you have an application which can open Apple Wallet .pkpass files');
}
})
// If you previously created a vaccination receipt before Sept. 23rd and need to add your date of birth on your vaccination receipt, please reimport your Ministry of Health official vaccination receipt again below and the date of birth will now be visible on the created receipt
@ -62,7 +66,7 @@ function Index(): JSX.Element {
<Page content={
<div className="space-y-5">
{warningMessages.map((message, i) =>
<Alert message={message} key={'error-' + i} type="error" onClose={() => deleteWarningMessage(message)} />
<Alert message={message} key={'error-' + i} type="warning" onClose={() => deleteWarningMessage(message)} />
)}
<Card content={
<div><p>{t('common:subtitle')}</p><br /><p>{t('common:subtitle2')}</p><br />