From a5431580460336c3a6a48593d13f895edeb20119 Mon Sep 17 00:00:00 2001
From: crazywoola <li.zheng@dentsplysirona.com>
Date: Fri, 19 May 2023 15:28:54 +0800
Subject: [PATCH] fix: emoji onSelect

---
 web/app/(commonLayout)/apps/NewAppDialog.tsx | 9 ++++-----
 web/app/components/base/app-icon/index.tsx   | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/web/app/(commonLayout)/apps/NewAppDialog.tsx b/web/app/(commonLayout)/apps/NewAppDialog.tsx
index 17bde9538d..10966ba4a4 100644
--- a/web/app/(commonLayout)/apps/NewAppDialog.tsx
+++ b/web/app/(commonLayout)/apps/NewAppDialog.tsx
@@ -18,7 +18,6 @@ import AppIcon from '@/app/components/base/app-icon'
 import AppsContext from '@/context/app-context'
 
 import EmojiPicker from '@/app/components/base/emoji-picker'
-import { set } from 'immer/dist/internal'
 
 type NewAppDialogProps = {
   show: boolean
@@ -37,7 +36,7 @@ const NewAppDialog = ({ show, onClose }: NewAppDialogProps) => {
 
   // Emoji Picker
   const [showEmojiPicker, setShowEmojiPicker] = useState(false)
-  const [emoji, setEmoji] = useState({icon: '', icon_background: ''})
+  const [emoji, setEmoji] = useState({ icon: '🍌', icon_background: '#FFEAD5' })
 
   const mutateApps = useContextSelector(AppsContext, state => state.mutateApps)
 
@@ -96,11 +95,11 @@ const NewAppDialog = ({ show, onClose }: NewAppDialogProps) => {
     {showEmojiPicker && <EmojiPicker
       onSelect={(icon, icon_background) => {
         console.log(icon, icon_background)
-        setEmoji({icon, icon_background})
+        setEmoji({ icon, icon_background })
         setShowEmojiPicker(false)
       }}
       onClose={() => {
-        setEmoji({icon: '', icon_background: ''})
+        setEmoji({ icon: '🍌', icon_background: '#FFEAD5' })
         setShowEmojiPicker(false)
       }}
     />}
@@ -117,7 +116,7 @@ const NewAppDialog = ({ show, onClose }: NewAppDialogProps) => {
       <h3 className={style.newItemCaption}>{t('app.newApp.captionName')}</h3>
 
       <div className='flex items-center justify-between gap-3 mb-8'>
-        <AppIcon size='large' onClick={() => { setShowEmojiPicker(true) }} className='cursor-pointer' />
+        <AppIcon size='large' onClick={() => { setShowEmojiPicker(true) }} className='cursor-pointer' icon={emoji.icon} background={emoji.icon_background} />
         <input ref={nameInputRef} className='h-10 px-3 text-sm font-normal bg-gray-100 rounded-lg grow' />
       </div>
 
diff --git a/web/app/components/base/app-icon/index.tsx b/web/app/components/base/app-icon/index.tsx
index 16a16c7f87..145c1c5f41 100644
--- a/web/app/components/base/app-icon/index.tsx
+++ b/web/app/components/base/app-icon/index.tsx
@@ -34,7 +34,7 @@ const AppIcon: FC<AppIconProps> = ({
       }}
       onClick={onClick}
     >
-      {innerIcon ? innerIcon : <em-emoji id={icon} />}
+      {innerIcon ? innerIcon : icon && <em-emoji id={icon} />}
     </span>
   )
 }