Merge branch 'dev' into production

CMI-OSS · Aug 22, 2023 · 76a1c5c · 76a1c5c
2 parents 07cb64b + 55ec398
commit 76a1c5c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -8,10 +8,10 @@
 <p align="center" style="font-size:1.5rem"><strong>충</strong>북대학교 공지사항 알<strong>림이</strong></p>
 
 <p align="center">
-<a href="https://play.google.com/store/apps/details?id=com.jaryapp.cmi&hl=ko&gl=US">
+<a href="https://play.google.com/store/apps/details?id=com.cbnu_alrami.app">
 <img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png?hl=ko" width="150px">
 </a>
-<a href="https://apps.apple.com/kr/app/%EC%B6%A9%EB%A6%BC%EC%9D%B4/id1542030436">
+<a href="https://apps.apple.com/kr/app/%EC%B6%A9%EB%A6%BC%EC%9D%B4/id6447121993">
 <img src="https://user-images.githubusercontent.com/49256790/143902573-6da748ac-40fa-4613-89cd-b582e31686f3.png" width="150px">
 </a>
 </p>

diff --git a/packages/mobile/package.json b/packages/mobile/package.json
@@ -22,6 +22,7 @@
     "react-device-detect": "^2.2.2",
     "react-dom": "^18.0.0",
     "react-ga": "^3.3.1",
+    "react-ga4": "^2.1.0",
     "react-helmet": "^6.1.0",
     "react-helmet-async": "^1.3.0",
     "react-hot-toast": "^2.3.0",

diff --git a/packages/mobile/src/components/molecules/DeepLink/index.tsx b/packages/mobile/src/components/molecules/DeepLink/index.tsx
@@ -1,5 +1,5 @@
 import { useState } from "react";
-import { isIOS, isSafari } from "react-device-detect";
+import { isIOS, isMacOs, isSafari } from "react-device-detect";
 
 import { Close, LongArrow } from "@components/atoms/icon";
 import classNames from "classnames";
@@ -18,7 +18,7 @@ function DeepLink() {
         type="button"
         className={$.left}
         onClick={() => {
-          if (isIOS || isSafari) {
+          if (isIOS || isSafari || isMacOs) {
             window.open(
               "https://apps.apple.com/kr/app/%EC%B6%A9%EB%A6%BC%EC%9D%B4/id6447121993",
             );

diff --git a/packages/mobile/src/hooks/useGA.ts b/packages/mobile/src/hooks/useGA.ts
@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react";
-import ReactGA from "react-ga";
+import ReactGA from "react-ga4";
 import { useLocation } from "react-router-dom";
 
 const useGA = () => {
@@ -14,7 +14,10 @@ const useGA = () => {
 
   useEffect(() => {
     if (initialized) {
-      ReactGA.pageview(location.pathname + location.search);
+      ReactGA.send({
+        hitType: "pageview",
+        page: location.pathname + location.search,
+      });
     }
   }, [ initialized, location ]);
 };

diff --git a/packages/mobile/src/page/Home/Restaurant/hooks.ts b/packages/mobile/src/page/Home/Restaurant/hooks.ts
@@ -65,7 +65,11 @@ export const useRestaurant = () => {
 
   useEffect(() => {
     const isShowCafeteriaGuide = getShowCafeteriaSelectGuide();
-    if (isShowCafeteriaGuide === null) setShowCafeteriaSelectGuide();
+    if (isShowCafeteriaGuide === null) {
+      setShowCafeteriaSelectGuide();
+      setCardType("greeting");
+      return;
+    }
     if (getShowCafeteriaSelectFinalGuide() === null)
       setShowCafeteriaSelectFinalGuide();
     if (isShowCafeteriaGuide === "true") {

diff --git a/yarn.lock b/yarn.lock
@@ -14234,6 +14234,11 @@ react-fast-compare@^3.1.1, react-fast-compare@^3.2.0:
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
   integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==
 
+react-ga4@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/react-ga4/-/react-ga4-2.1.0.tgz#56601f59d95c08466ebd6edfbf8dede55c4678f9"
+  integrity sha512-ZKS7PGNFqqMd3PJ6+C2Jtz/o1iU9ggiy8Y8nUeksgVuvNISbmrQtJiZNvC/TjDsqD0QlU5Wkgs7i+w9+OjHhhQ==
+
 react-ga@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/react-ga/-/react-ga-3.3.1.tgz#d8e1f4e05ec55ed6ff944dcb14b99011dfaf9504"