feat(neuron-ui): fill the address field automatically on QR Code reco…

…gnized as a valid address
nervosnetwork · Aug 16, 2019 · c8a6689 · c8a6689
1 parent a8c9543
commit c8a6689
Showing 1 changed file with 27 additions and 23 deletions.
diff --git a/packages/neuron-ui/src/widgets/QRScanner/index.tsx b/packages/neuron-ui/src/widgets/QRScanner/index.tsx
@@ -13,6 +13,7 @@ import jsQR from 'jsqr'
 
 import { showErrorMessage } from 'services/remote'
 import { drawPolygon } from 'utils/canvasActions'
+import { verifyAddress } from 'utils/validators'
 
 interface QRScannerProps {
   title: string
@@ -37,6 +38,21 @@ const QRScanner = ({ title, label, onConfirm, styles }: QRScannerProps) => {
   const [t] = useTranslation()
   const canvasRef = useRef<HTMLCanvasElement>(null)
   const video = useMemo(() => document.createElement('video'), [])
+
+  const onOpen = useCallback(() => {
+    setData('')
+    setOpen(true)
+  }, [setOpen])
+
+  const onDismiss = useCallback(() => {
+    setOpen(false)
+  }, [setOpen])
+
+  const onSubmit = useCallback(() => {
+    onConfirm(data)
+    onDismiss()
+  }, [data, onConfirm, onDismiss])
+
   const scan = useCallback(() => {
     navigator.mediaDevices
       .getUserMedia({
@@ -70,7 +86,12 @@ const QRScanner = ({ title, label, onConfirm, styles }: QRScannerProps) => {
                 drawPolygon(canvas, [topLeftCorner, topRightCorner, bottomRightCorner, bottomLeftCorner], {
                   color,
                 })
-                setData(code.data)
+                if (verifyAddress(code.data)) {
+                  onConfirm(code.data)
+                  onDismiss()
+                } else {
+                  setData(code.data)
+                }
               }
             }
           }
@@ -82,7 +103,7 @@ const QRScanner = ({ title, label, onConfirm, styles }: QRScannerProps) => {
         showErrorMessage(t('messages.camera-not-available-or-disabled'), err.message)
         setOpen(false)
       })
-  }, [video, t])
+  }, [video, t, onConfirm, onDismiss])
 
   useEffect(() => {
     if (open) {
@@ -104,10 +125,7 @@ const QRScanner = ({ title, label, onConfirm, styles }: QRScannerProps) => {
             outline: 'none',
           }
         }
-        onClick={() => {
-          setOpen(true)
-        }}
-        onKeyPress={() => {}}
+        onClick={onOpen}
         type="button"
       >
         <IconButton
@@ -118,30 +136,16 @@ const QRScanner = ({ title, label, onConfirm, styles }: QRScannerProps) => {
           }}
         />
       </button>
-      <Dialog
-        hidden={!open}
-        onDismiss={() => {
-          setOpen(false)
-        }}
-        maxWidth="900px"
-        minWidth="500xp"
-      >
+      <Dialog hidden={!open} onDismiss={onDismiss} maxWidth="900px" minWidth="500xp">
         <h1>{title}</h1>
         <div>
           <canvas ref={canvasRef} />
         </div>
         <DialogFooter>
           <TextField readOnly value={data} label={label} underlined />
           <Stack horizontal horizontalAlign="end" tokens={{ childrenGap: 10 }}>
-            <DefaultButton onClick={() => setOpen(false)}>{t('common.cancel')}</DefaultButton>
-            <PrimaryButton
-              onClick={() => {
-                onConfirm(data)
-                setOpen(false)
-              }}
-            >
-              {t('common.confirm')}
-            </PrimaryButton>
+            <DefaultButton onClick={onDismiss}>{t('common.cancel')}</DefaultButton>
+            <PrimaryButton onClick={onSubmit}>{t('common.confirm')}</PrimaryButton>
           </Stack>
         </DialogFooter>
       </Dialog>