deployed version - 1.10.0 after merge and a few fixes

components/Page.tsx

@@ -36,7 +36,7 @@ function Page(props: PageProps): JSX.Element {
                             <a href="https://github.com/billylo1/covidpass" className="underline">{t('common:gitHub')}</a>
                             <a href="https://vaccine-ontario.ca" className="underline">{t('common:returnToMainSite')}</a>
                         </nav>
-                        <div className="flex pt-4 flex-row space-x-4 justify-center text-md flex-wrap">Last updated: 2021-10-06 (v1.9.23)</div>
+                        <div className="flex pt-4 flex-row space-x-4 justify-center text-md flex-wrap">Last updated: 2021-10-14 (v1.10.0)</div>
                     </footer>
                 </main>
             </div>

next-env.d.ts

@@ -1,6 +1,3 @@
 /// <reference types="next" />
 /// <reference types="next/types/global" />
 /// <reference types="next/image-types/global" />
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "grassroots_covidpass",
-  "version": "1.9.7",
+  "version": "1.10.0",
   "author": "Billy Lo <billy@vaccine-ontario.ca>",
   "license": "MIT",
   "private": false,

pages/index.tsx

@@ -74,12 +74,11 @@ function Index(): JSX.Element {
                     <Card content={
                         <div><p>{t('common:subtitle')}</p><br /><p>{t('common:subtitle2')}</p><br />
                             <b>{displayPassCount}</b><br/><br/>
-                            Oct 3 evening update: 
+                            Oct 14 evening update: 
                             <br />
                             <br />
                             <ul className="list-decimal list-outside" style={{ marginLeft: '20px' }}>
-                                <li>Added expiration date to Apple Wallet pass so it aligns with the province's schedule.</li>
+                                <li>You can now import the new enhanced receipt from Ontario into your Apple Wallet.</li>
-                                <li>On Oct 22, we will update this tool as well so you can import the official QR code into your mobile wallet too.</li>
                             </ul><br />
                             <p>{t('common:continueSpirit')}</p>
                             <br />

public/locales/en/common.yml

@@ -1,6 +1,6 @@
 title: Vaccination Receipt to Wallet
-subtitle: This utility (created by volunteers) converts your vaccination receipt from Ontario Ministry of Health to an Apple Wallet pass for easy access in the interim. Android users can create a photo pass while we await Google Pay COVID Card API Access from Google.
+subtitle: This utility (created by volunteers) imports your vaccination receipt from Ontario Ministry of Health into Apple Wallet for easy access. 
-subtitle2: Once Ontario's official QR code is available on Oct 22, you will be able to update your Apple Wallet pass or Android photo pass by visiting this site again.
+subtitle2: Android users can create a photo pass while we await Google Pay COVID Card API Access from Google.
 update1Date: Sep 23 Updates
 update1: Thanks so much for all the encouragements and suggestions to make this better. We plan to keep enhancing this to help more Canadians. Stay tuned!
 continueSpirit: Continuing the spirit of ❤️ @VaxHuntersCanada ❤️.

src/process.ts

@@ -35,26 +35,6 @@ export async function getPayloadBodyFromFile(file: File): Promise<PayloadBody> {
                 imageData = await getImageDataFromPdf(fileBuffer);
             }
             break;
-=======
-import {PayloadBody} from "./payload";
-import * as PdfJS from 'pdfjs-dist'
-import jsQR, {QRCode} from "jsqr";
-import {decodeData} from "./decode";
-import {Result} from "@zxing/library";
-import {COLORS} from "./colors";
-
-PdfJS.GlobalWorkerOptions.workerSrc = `https://cdnjs.cloudflare.com/ajax/libs/pdf.js/${PdfJS.version}/pdf.worker.js`
-
-export async function getPayloadBodyFromFile(file: File, color: COLORS): Promise<PayloadBody> {
-    let imageData: ImageData;
-
-    switch (file.type) {
-        case 'application/pdf':
-            console.log('pdf')
-            // Read file
-            const fileBuffer = await file.arrayBuffer();
-            imageData = await getImageDataFromPdf(fileBuffer)
-            break
         case 'image/png':
         case 'image/jpeg':
         case 'image/webp':
@@ -327,7 +307,6 @@ async function getImageDataFromPdf(fileBuffer: ArrayBuffer): Promise<ImageData[]
     return Promise.resolve(retArray);
 }
 
-
 async function processSHC(allImageData : ImageData[]) : Promise<PayloadBody> {
 
     console.log('processSHC');

src/sentry.ts

@@ -3,7 +3,7 @@ import { Integrations } from '@sentry/tracing';
 
 export const initSentry = () => {
     SentryModule.init({
-        release: 'grassroots_covidpass@1.9.23', // App version. Needs to be manually updated as we go unless we make the build smarter
+        release: 'grassroots_covidpass@1.10.0', // App version. Needs to be manually updated as we go unless we make the build smarter
         dsn: 'https://7120dcf8548c4c5cb148cdde2ed6a778@o1015766.ingest.sentry.io/5981424',
         integrations: [
             new Integrations.BrowserTracing(),