From 97692b56d4981ec4a5f6d6494db1daa1a9fe490d Mon Sep 17 00:00:00 2001
From: Danh <nguyenhoaidanh2096@gmail.com>
Date: Fri, 2 Jun 2023 11:03:25 +0700
Subject: [PATCH 1/7] try fix ios

---
 src/pages/Verify/VerifyCodeModal/OtpInput.tsx | 10 ++++++++--
 src/pages/Verify/VerifyCodeModal/index.tsx    | 19 ++++++++++---------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/pages/Verify/VerifyCodeModal/OtpInput.tsx b/src/pages/Verify/VerifyCodeModal/OtpInput.tsx
index 342b920ced..944460671e 100644
--- a/src/pages/Verify/VerifyCodeModal/OtpInput.tsx
+++ b/src/pages/Verify/VerifyCodeModal/OtpInput.tsx
@@ -39,6 +39,8 @@ interface OTPInputProps {
   inputStyle?: React.CSSProperties
   /** The type that will be passed to the input being rendered */
   inputType?: AllowedInputTypes
+  onFocus?: () => void
+  onBlur?: () => void
 }
 
 const OTPInput = ({
@@ -50,6 +52,8 @@ const OTPInput = ({
   inputType = 'text',
   containerStyle,
   inputStyle,
+  onFocus,
+  onBlur,
 }: OTPInputProps) => {
   const [activeInput, setActiveInput] = React.useState(0)
   const inputRefs = React.useRef<Array<HTMLInputElement | null>>([])
@@ -95,10 +99,12 @@ const OTPInput = ({
   }
 
   const handleFocus = () => (index: number) => {
+    onFocus?.()
     setActiveInput(index)
   }
 
-  const onBlur = () => {
+  const handleBlur = () => {
+    onBlur?.()
     setActiveInput(activeInput - 1)
   }
 
@@ -194,7 +200,7 @@ const OTPInput = ({
               ref: element => (inputRefs.current[index] = element),
               onChange: handleChange,
               onFocus: () => handleFocus()(index),
-              onBlur,
+              onBlur: handleBlur,
               onKeyDown,
               onPaste,
               autoComplete: 'off',
diff --git a/src/pages/Verify/VerifyCodeModal/index.tsx b/src/pages/Verify/VerifyCodeModal/index.tsx
index 8193a9fdfa..0e0c940e2c 100644
--- a/src/pages/Verify/VerifyCodeModal/index.tsx
+++ b/src/pages/Verify/VerifyCodeModal/index.tsx
@@ -89,14 +89,6 @@ export default function VerifyCodeModal({
   const notify = useNotify()
   const [isTyping, setIsTyping] = useState(false)
 
-  useEffect(() => {
-    const onResize = () => {
-      setIsTyping(window.innerHeight < 450)
-    }
-    window.addEventListener('resize', onResize)
-    return () => window.removeEventListener('resize', onResize)
-  }, [])
-
   const [expiredDuration, setExpireDuration] = useState(defaultTime)
   const canShowResend = expiredDuration < (timeExpire - 1) * TIMES_IN_SECS.ONE_MIN
 
@@ -213,7 +205,16 @@ export default function VerifyCodeModal({
               value={otp}
               onChange={onChange}
               numInputs={6}
-              renderInput={props => <Input {...props} hasError={error} placeholder="-" type="number" />}
+              renderInput={props => (
+                <Input
+                  {...props}
+                  hasError={error}
+                  placeholder="-"
+                  type="number"
+                  onFocus={() => setIsTyping(true)}
+                  onBlur={() => setIsTyping(false)}
+                />
+              )}
             />
 
             <Label style={{ width: '100%', textAlign: 'center' }}>

From ae3bc119ff7bab6b74b6478fde4278f8b7bb8c22 Mon Sep 17 00:00:00 2001
From: Danh <nguyenhoaidanh2096@gmail.com>
Date: Fri, 2 Jun 2023 11:16:02 +0700
Subject: [PATCH 2/7] try fix ios

---
 src/pages/Verify/VerifyCodeModal/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Verify/VerifyCodeModal/index.tsx b/src/pages/Verify/VerifyCodeModal/index.tsx
index 0e0c940e2c..4a897eb431 100644
--- a/src/pages/Verify/VerifyCodeModal/index.tsx
+++ b/src/pages/Verify/VerifyCodeModal/index.tsx
@@ -179,7 +179,7 @@ export default function VerifyCodeModal({
       onDismiss={onDismiss}
       minHeight={false}
       maxWidth={450}
-      height={isTyping && isMobile ? '100%' : undefined}
+      height={isTyping && isMobile ? window.innerHeight + 'px' : undefined}
     >
       <Wrapper>
         {verifySuccess ? (

From 57ac62e65689ae9d1801ad38d435acc7c0f282f6 Mon Sep 17 00:00:00 2001
From: Danh <nguyenhoaidanh2096@gmail.com>
Date: Fri, 2 Jun 2023 11:44:09 +0700
Subject: [PATCH 3/7] try fix ios

---
 src/pages/Verify/VerifyCodeModal/index.tsx | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/pages/Verify/VerifyCodeModal/index.tsx b/src/pages/Verify/VerifyCodeModal/index.tsx
index 4a897eb431..eea1e403d1 100644
--- a/src/pages/Verify/VerifyCodeModal/index.tsx
+++ b/src/pages/Verify/VerifyCodeModal/index.tsx
@@ -1,7 +1,8 @@
 import { Trans, t } from '@lingui/macro'
 import { ReactNode, useCallback, useEffect, useRef, useState } from 'react'
-import { isMobile } from 'react-device-detect'
+import { isAndroid, isIOS, isMobile } from 'react-device-detect'
 import { X } from 'react-feather'
+import { useMedia } from 'react-use'
 import { Text } from 'rebass'
 import { useSendOtpMutation, useVerifyOtpMutation } from 'services/identity'
 import styled from 'styled-components'
@@ -87,7 +88,8 @@ export default function VerifyCodeModal({
   const [verifySuccess, setVerifySuccess] = useState(false)
   const [error, setError] = useState(false)
   const notify = useNotify()
-  const [isTyping, setIsTyping] = useState(false)
+  const [isTypingIos, setIsTypingIos] = useState(false)
+  const isTypingAndroid = useMedia(`(max-height: 450px)`)
 
   const [expiredDuration, setExpireDuration] = useState(defaultTime)
   const canShowResend = expiredDuration < (timeExpire - 1) * TIMES_IN_SECS.ONE_MIN
@@ -179,7 +181,15 @@ export default function VerifyCodeModal({
       onDismiss={onDismiss}
       minHeight={false}
       maxWidth={450}
-      height={isTyping && isMobile ? window.innerHeight + 'px' : undefined}
+      height={
+        !isMobile
+          ? undefined
+          : isAndroid && isTypingAndroid
+          ? '100%'
+          : isTypingIos && isIOS
+          ? window.innerHeight + 'px'
+          : undefined
+      }
     >
       <Wrapper>
         {verifySuccess ? (
@@ -211,8 +221,8 @@ export default function VerifyCodeModal({
                   hasError={error}
                   placeholder="-"
                   type="number"
-                  onFocus={() => setIsTyping(true)}
-                  onBlur={() => setIsTyping(false)}
+                  onFocus={() => setIsTypingIos(true)}
+                  onBlur={() => setIsTypingIos(false)}
                 />
               )}
             />

From 28782badf90090110fdacda984f87caa36507491 Mon Sep 17 00:00:00 2001
From: Danh <nguyenhoaidanh2096@gmail.com>
Date: Fri, 2 Jun 2023 11:50:46 +0700
Subject: [PATCH 4/7] try fix ios

---
 src/pages/Verify/VerifyCodeModal/index.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/Verify/VerifyCodeModal/index.tsx b/src/pages/Verify/VerifyCodeModal/index.tsx
index eea1e403d1..b32b4e4287 100644
--- a/src/pages/Verify/VerifyCodeModal/index.tsx
+++ b/src/pages/Verify/VerifyCodeModal/index.tsx
@@ -181,6 +181,7 @@ export default function VerifyCodeModal({
       onDismiss={onDismiss}
       minHeight={false}
       maxWidth={450}
+      maxHeight={isTypingIos && isIOS ? window.innerHeight + 'px' : undefined}
       height={
         !isMobile
           ? undefined
@@ -221,8 +222,8 @@ export default function VerifyCodeModal({
                   hasError={error}
                   placeholder="-"
                   type="number"
-                  onFocus={() => setIsTypingIos(true)}
-                  onBlur={() => setIsTypingIos(false)}
+                  onFocus={() => isIOS && setIsTypingIos(true)}
+                  onBlur={() => isIOS && setIsTypingIos(false)}
                 />
               )}
             />

From 11015913c9d25915331012b26d8d2bd2db36ccf9 Mon Sep 17 00:00:00 2001
From: Danh <nguyenhoaidanh2096@gmail.com>
Date: Fri, 2 Jun 2023 13:37:58 +0700
Subject: [PATCH 5/7] try fix ios

---
 src/pages/Verify/VerifyCodeModal/index.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/Verify/VerifyCodeModal/index.tsx b/src/pages/Verify/VerifyCodeModal/index.tsx
index b32b4e4287..856631d0c2 100644
--- a/src/pages/Verify/VerifyCodeModal/index.tsx
+++ b/src/pages/Verify/VerifyCodeModal/index.tsx
@@ -222,7 +222,12 @@ export default function VerifyCodeModal({
                   hasError={error}
                   placeholder="-"
                   type="number"
-                  onFocus={() => isIOS && setIsTypingIos(true)}
+                  onFocus={() => {
+                    isIOS && setIsTypingIos(true)
+                    setTimeout(() => {
+                      window.scrollTo({ top: 0 })
+                    }, 100)
+                  }}
                   onBlur={() => isIOS && setIsTypingIos(false)}
                 />
               )}

From af6a2e074f7215dfd521d69c39ca64e2f462f537 Mon Sep 17 00:00:00 2001
From: Danh <nguyenhoaidanh2096@gmail.com>
Date: Fri, 2 Jun 2023 13:44:29 +0700
Subject: [PATCH 6/7] template prod

---
 src/constants/env.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/constants/env.ts b/src/constants/env.ts
index 59917bb8bb..cc50beccfe 100644
--- a/src/constants/env.ts
+++ b/src/constants/env.ts
@@ -130,9 +130,9 @@ const ANNOUNCEMENT_TEMPLATE_IDS: { [key: string]: { [type: string]: string } } =
     [PrivateAnnouncementType.PRICE_ALERT]: '21,22',
     [PrivateAnnouncementType.LIMIT_ORDER]: '12,13,14,15',
     [PrivateAnnouncementType.BRIDGE_ASSET]: '10,11',
-    [PrivateAnnouncementType.KYBER_AI]: '9', // todo
+    [PrivateAnnouncementType.KYBER_AI]: '26',
     [PrivateAnnouncementType.ELASTIC_POOLS]: '17,18',
-    EXCLUDE: '2,16,19', // todo
+    EXCLUDE: '2,16,19,9,25,24',
   },
 }
 

From 65d9a7bfb80cc49c9ff284f7295ae6281eed6bcb Mon Sep 17 00:00:00 2001
From: Danh <nguyenhoaidanh2096@gmail.com>
Date: Fri, 2 Jun 2023 14:43:43 +0700
Subject: [PATCH 7/7] try fix ios ux

---
 src/pages/Verify/VerifyCodeModal/index.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/Verify/VerifyCodeModal/index.tsx b/src/pages/Verify/VerifyCodeModal/index.tsx
index 856631d0c2..d0b1d6720b 100644
--- a/src/pages/Verify/VerifyCodeModal/index.tsx
+++ b/src/pages/Verify/VerifyCodeModal/index.tsx
@@ -228,7 +228,12 @@ export default function VerifyCodeModal({
                       window.scrollTo({ top: 0 })
                     }, 100)
                   }}
-                  onBlur={() => isIOS && setIsTypingIos(false)}
+                  onBlur={() =>
+                    isIOS &&
+                    setTimeout(() => {
+                      setIsTypingIos(false)
+                    }, 100)
+                  }
                 />
               )}
             />