fix: merge order of calendar freebusy (#4438) (#4475)

Co-authored-by: chengcheng.frontend <chengcheng.frontend@bytedance.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

Co-authored-by: Cheng CHENG <c.cheng@live.cn>
Co-authored-by: chengcheng.frontend <chengcheng.frontend@bytedance.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
This commit is contained in:
Joe Au-Yeung 2022-09-14 14:38:18 -04:00 committed by GitHub
parent 6c4a372121
commit ba4bd83abe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -169,7 +169,7 @@ const SlotPicker = ({
timeZone,
});
const slots = useMemo(() => ({ ..._1, ..._2 }), [_1, _2]);
const slots = useMemo(() => ({ ..._2, ..._1 }), [_1, _2]);
return (
<>
@ -425,7 +425,7 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
</div>
)}
{eventType?.requiresConfirmation && (
<p className="dark:text-darkgray-600 dark:text-darkgray-600 text-gray-600">
<p className="dark:text-darkgray-600 text-gray-600">
<Icon.FiCheckSquare className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4" />
{t("requires_confirmation")}
</p>