Merge branch 'main' of github.com:hainatravel/global-sales

dev/timezone
Jimmy Liow 1 year ago
commit e2f2fa44ed

@ -288,8 +288,8 @@ const InputComposer = ({ mobile }) => {
<Button type='text' className='' icon={<FilePdfOutlined />} size={'middle'} /> */}
</Flex>
<Flex gap={4} align={'center'}>
<div className='text-neutral-400 text-xs'>
<ExpireTimeClock expireTime={currentConversation.conversation_expiretime} />
<div className='text-neutral-400 text-sm'>
{/* <ExpireTimeClock expireTime={currentConversation.conversation_expiretime} /> */}
<div>{textPlaceHolder}</div>
</div>
<Button key={'send-btn'} onClick={handleSendText} type='primary' size='middle' icon={<SendOutlined />} disabled={!textabled || pastedUploading}>

Loading…
Cancel
Save