Merge branch 'develop' into JUP-58-countdown

.github/workflows/generateCheck.sh

@@ -1,4 +1,6 @@
-if [ $status == 'success' ]; then
+files=$(npx prettier . -l)
+status=$?
+if [ $status == 0 ]; then
   echo "## Formatting Check passed 🥳" >>$GITHUB_STEP_SUMMARY
   echo "All files are formatted correctly" >>$GITHUB_STEP_SUMMARY
   exit 0

.github/workflows/prettierCheck.yml

@@ -12,13 +12,5 @@ jobs:
           cache: 'npm'
       - name: Run npm install
         run: npm ci
-      - name: Run prettier
-        id: prettier
-        continue-on-error: true
-        run: |
-          files=`npx prettier . -l` 
-          echo files=$files >> "$GITHUB_ENV"
-      - name: generate errors/summary
+      - name: Run prettier & generate problems
         run: .github/workflows/generateCheck.sh
-        env:
-          status: ${{ steps.prettier.outcome }}

package.json

@@ -15,6 +15,7 @@
   "dependencies": {
     "@auth/drizzle-adapter": "^0.3.2",
     "@hookform/resolvers": "^3.3.2",
+    "@next/third-parties": "^14.2.15",
     "@radix-ui/react-alert-dialog": "^1.0.5",
     "@radix-ui/react-dialog": "^1.0.5",
     "@radix-ui/react-dropdown-menu": "^2.0.6",
@@ -27,7 +28,6 @@
     "@trpc/client": "^11.0.0-rc.340",
     "@trpc/react-query": "^11.0.0-rc.340",
     "@trpc/server": "^11.0.0-rc.340",
-    "@vercel/analytics": "^1.3.1",
     "date-fns": "^2.30.0",
     "dotenv": "^16.0.3",
     "drizzle-orm": "^0.28.5",

src/app/layout.tsx

@@ -7,7 +7,7 @@ import { TRPCReactProvider } from '@src/trpc/react';
 import Sidebar from '@src/components/nav/Sidebar';
 import { type Metadata } from 'next';
 
-import { Analytics } from '@vercel/analytics/react';
+import { GoogleAnalytics } from '@next/third-parties/google';
 
 const inter = Inter({
   subsets: ['latin'],
@@ -48,7 +48,7 @@ export default function RootLayout({
           <Sidebar />
           <div className="max-h-screen overflow-y-scroll">{children}</div>
         </TRPCReactProvider>
-        <Analytics />
+        <GoogleAnalytics gaId="G-FYTBHVKNG6" />
       </body>
     </html>
   );