Merge pull request #327 from Nexters/develop

[운영배포] 선물하기 버그수정, 공연 시간 버그 수정

Author: alstn2468

apps/admin/src/pages/GiftRegisterPage/components/GiftInformation/index.tsx

@@ -7,8 +7,8 @@ import { format } from 'date-fns/format';
 import { GiftStatus } from '@boolti/api/src/types/gift';
 import { useDeviceWidth } from '~/hooks/useDeviceWidth';
 import { useTheme } from '@emotion/react';
-import { openStoreLink } from '~/utils/link';
 import { LINK } from '~/constants/link';
+import { navigateToAppScheme } from '~/utils/app';
 
 const GiftInformation = () => {
   const { giftId = '' } = useParams<{ giftId: string }>();
@@ -53,7 +53,7 @@ const GiftInformation = () => {
       return;
     }
 
-    openStoreLink();
+    navigateToAppScheme(`boolti://gift/${giftId}`);
   };
 
   return (

apps/admin/src/pages/ShowInfoPage/index.tsx

@@ -46,14 +46,15 @@ const ShowInfoPage = () => {
   const isImageFilesDirty = imageFiles.some((file) => file.preview.startsWith('blob:'));
   const isCastTeamListDraftDirty =
     initialCastTeamListRef.current !== JSON.stringify(castTeamListDraft);
-  const showBasicInfoForm = useForm<ShowBasicInfoFormInputs>();
-  const showDetailInfoForm = useForm<ShowDetailInfoFormInputs>();
 
   const showId = Number(params!.showId);
   const { data: show, refetch: refetchShowDetail } = useShowDetail(showId);
   const { data: showSalesInfo, refetch: refetchShowSalesInfo } = useShowSalesInfo(showId);
   const { data: castTeamList, refetch: refetchCastTeamList } = useCastTeamList(showId);
 
+  const showBasicInfoForm = useForm<ShowBasicInfoFormInputs>();
+  const showDetailInfoForm = useForm<ShowDetailInfoFormInputs>();
+
   const editShowInfoMutation = useEditShowInfo();
   const uploadShowImageMutation = useUploadShowImage();
   const isNonTicketingShow = !showSalesInfo?.salesEndTime && !showSalesInfo?.salesStartTime;

apps/admin/src/utils/app.ts

@@ -0,0 +1,44 @@
+import { openStoreLink } from './link';
+
+export const navigateToAppScheme = async (appScheme: string) => {
+  let timerId: ReturnType<typeof setTimeout>;
+
+  return new Promise((resolve) => {
+    const startTime = Date.now();
+
+    const handleVisibilityChange = () => {
+      if (document.hidden) {
+        clearTimeout(timerId);
+        document.removeEventListener('visibilitychange', handleVisibilityChange);
+
+        resolve(true);
+      }
+    };
+
+    window.addEventListener(
+      'blur',
+      () => {
+        clearTimeout(timerId);
+        document.removeEventListener('visibilitychange', handleVisibilityChange);
+        resolve(true);
+      },
+      { once: true },
+    );
+
+    window.location.href = appScheme;
+
+    timerId = setTimeout(() => {
+      document.removeEventListener('visibilitychange', handleVisibilityChange);
+
+      const elapsedTime = Date.now() - startTime;
+
+      if (elapsedTime < 1_500) {
+        resolve(false);
+
+        openStoreLink();
+      } else {
+        resolve(false);
+      }
+    }, 2_000);
+  });
+};

packages/ui/src/components/TimePicker/index.tsx

@@ -24,6 +24,7 @@ function TimePicker({ disabled, errorMessage, value, onChange, onBlur }: Props)
   const ref = useRef<HTMLDivElement>(null);
   const hourRef = useRef<HTMLDivElement>(null);
   const minuteRef = useRef<HTMLDivElement>(null);
+
   const [hour, minute] = value ? value.split(':').map(Number) : [];
   const [isAM, setIsAM] = useState(value ? hour < 12 : true);
   const [open, setIsOpen] = useState(false);
@@ -59,6 +60,15 @@ function TimePicker({ disabled, errorMessage, value, onChange, onBlur }: Props)
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [open]);
 
+  useEffect(() => {
+    if (value) {
+      const [hour, minute] = value.split(':').map(Number);
+      setCurrentHour(hour);
+      setCurrentMinute(minute);
+      setIsAM(hour < 12);
+    }
+  }, [value]);
+
   useEffect(() => {
     if (nextValue) {
       onChange?.(nextValue);