Release

.github/workflows/mobile.apps.android.yml

@@ -74,7 +74,7 @@ jobs:
           EXPO_PROJECT_IOS_BUNDLE_IDENTIFIER: ${{ secrets.EXPO_PROJECT_IOS_BUNDLE_IDENTIFIER }}
 
       - name: Build on EAS
-        run: cd apps/mobile && eas build --platform android --non-interactive
+        run: cd apps/mobile && eas build --profile production --platform android --non-interactive
 
       - name: Publish update
         run: cd apps/mobile && eas update --auto --platform android --non-interactive
@@ -91,4 +91,4 @@ jobs:
           project_id: 'ever-teams-399720'
 
       - name: Upload to Play Store Console
-        run: cd apps/mobile && eas submit --platform android --latest --non-interactive
+        run: cd apps/mobile && eas submit --profile production --platform android --latest --non-interactive

.github/workflows/mobile.apps.ios.yml

@@ -80,10 +80,10 @@ jobs:
           EXPO_PROJECT_IOS_BUNDLE_IDENTIFIER: ${{ secrets.EXPO_PROJECT_IOS_BUNDLE_IDENTIFIER }}
 
       - name: Build on EAS
-        run: cd apps/mobile && eas build --platform ios --non-interactive
+        run: cd apps/mobile && eas build --profile production --platform ios --non-interactive
 
       - name: Publish update
-        run: cd apps/mobile && eas update --auto --platform ios --non-interactive
+        run: cd apps/mobile && eas update --auto --profile production --platform ios --non-interactive
 
       - name: Upload App build to App store
-        run: cd apps/mobile && eas submit --platform ios --latest --non-interactive
+        run: cd apps/mobile && eas submit --profile production --platform ios --latest --non-interactive

.github/workflows/mobile.apps.stage.android.yml

@@ -0,0 +1,94 @@
+name: Mobile Build, Deploy and Publish Apps Android
+on:
+  push:
+    branches:
+      - apps-stage
+    paths:
+      - '.github/workflows/mobile.apps.stage.yml'
+      - 'apps/mobile/**'
+      - 'package.json'
+      - 'yarn.lock'
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    environment: prod
+
+    permissions:
+      contents: read
+
+    steps:
+      - name: Check for EXPO_TOKEN
+        run: |
+          if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then
+            echo "You must provide an EXPO_TOKEN secret linked to this project's Expo account in this repo's secrets. Learn more: https://docs.expo.dev/eas-update/github-actions"
+            exit 1
+          fi
+
+      - uses: actions/checkout@v4
+
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.11.1'
+          cache: 'yarn'
+
+      - name: Setup EAS
+        uses: expo/expo-github-action@v8
+        with:
+          eas-version: latest
+          token: ${{ secrets.EXPO_TOKEN }}
+
+      - name: Decode Google Credentials
+        run: |
+          DECODED_GOOGLE_CREDENTIALS=$(echo '${{ secrets.GOOGLE_CREDENTIALS }}' | base64 --decode)
+          echo "DECODED_GOOGLE_CREDENTIALS=$DECODED_GOOGLE_CREDENTIALS" >> $GITHUB_ENV
+          echo "::add-mask::$DECODED_GOOGLE_CREDENTIALS"
+          ESCAPED_GOOGLE_CREDENTIALS=$(echo "$DECODED_GOOGLE_CREDENTIALS" | sed ':a;N;$!ba;s/\n/\\n/g' | sed 's/"/\\"/g')
+          ESCAPED_GOOGLE_CREDENTIALS=$(echo $ESCAPED_GOOGLE_CREDENTIALS | sed 's/\\n/\\\\n/g')
+          echo "ESCAPED_GOOGLE_CREDENTIALS=$ESCAPED_GOOGLE_CREDENTIALS" >> $GITHUB_ENV
+          echo "::add-mask::$ESCAPED_GOOGLE_CREDENTIALS"
+
+      - name: Install Packages
+        run: |
+          yarn install --frozen-lockfile
+
+      - name: Build Mobile
+        run: |
+          yarn build:mobile
+
+      - name: Generate app.json and replace placeholders
+        run: |
+          cd apps/mobile && yarn config:mobile
+        env:
+          EXPO_PROJECT_SLUG: ${{ secrets.EXPO_PROJECT_SLUG }}
+          EXPO_PROJECT_NAME: ${{ secrets.EXPO_PROJECT_NAME }}
+          EXPO_PROJECT_OWNER: ${{ secrets.EXPO_PROJECT_OWNER }}
+          EXPO_PROJECT_ID: ${{ secrets.EXPO_PROJECT_ID }}
+          EXPO_PROJECT_PACKAGE_NAME: ${{ secrets.EXPO_PROJECT_PACKAGE_NAME }}
+          EXPO_PROJECT_IOS_BUNDLE_IDENTIFIER: ${{ secrets.EXPO_PROJECT_IOS_BUNDLE_IDENTIFIER }}
+
+      - name: Build on EAS
+        run: cd apps/mobile && eas build --profile internal --platform android --non-interactive
+
+      - name: Publish update
+        run: cd apps/mobile && eas update --auto --profile internal --platform android --non-interactive
+
+      - name: 'Authenticate to Google Cloud'
+        uses: 'google-github-actions/auth@v1'
+        with:
+          credentials_json: ${{ env.DECODED_GOOGLE_CREDENTIALS }}
+
+      # Install gcloud, `setup-gcloud` automatically picks up authentication from `auth`.
+      - name: 'Set up Cloud SDK'
+        uses: 'google-github-actions/setup-gcloud@v1'
+        with:
+          project_id: 'ever-teams-399720'
+
+      - name: Upload to Play Store Console
+        run: cd apps/mobile && eas submit --platform android --profile internal --latest --non-interactive

.github/workflows/mobile.apps.stage.ios.yml

@@ -0,0 +1,89 @@
+name: Mobile Build, Deploy and Publish Apps iOS
+on:
+  push:
+    branches:
+      - apps-stage
+    paths:
+      - '.github/workflows/mobile.apps.stage.yml'
+      - 'apps/mobile/**'
+      - 'package.json'
+      - 'yarn.lock'
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    environment: prod
+
+    permissions:
+      contents: read
+
+    steps:
+      - name: Check for EXPO_TOKEN
+        run: |
+          if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then
+            echo "You must provide an EXPO_TOKEN secret linked to this project's Expo account in this repo's secrets. Learn more: https://docs.expo.dev/eas-update/github-actions"
+            exit 1
+          fi
+
+      - uses: actions/checkout@v4
+
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.11.1'
+          cache: 'yarn'
+
+      - name: Setup EAS
+        uses: expo/expo-github-action@v8
+        with:
+          eas-version: latest
+          token: ${{ secrets.EXPO_TOKEN }}
+
+      - name: Set Apple Store Credentials
+        run: |
+          echo "APPLE_ID=${{ secrets.APPLE_ID }}" >> $GITHUB_ENV
+          echo "APPSTORE_ISSUER_ID=${{ secrets.APPSTORE_ISSUER_ID }}" >> $GITHUB_ENV
+          echo "APPSTORE_API_KEY_ID=${{ secrets.APPSTORE_API_KEY_ID }}" >> $GITHUB_ENV
+
+      - name: Replace Secrets in eas.json
+        run: |
+          sed -i 's/APPLE_ID_PLACEHOLDER/${{ secrets.APPLE_ID }}/' ./apps/mobile/eas.json
+          sed -i 's/APPSTORE_ISSUER_ID_PLACEHOLDER/${{ secrets.APPSTORE_ISSUER_ID }}/' ./apps/mobile/eas.json
+          sed -i 's/APPSTORE_API_KEY_ID_PLACEHOLDER/${{ secrets.APPSTORE_API_KEY_ID }}/' ./apps/mobile/eas.json
+
+      - name: Create Apple API Key File
+        run: |
+          echo "${{ secrets.APPSTORE_API_PRIVATE_KEY }}" > ./apps/mobile/AuthKey_R9QZ5LP8NK.p8
+
+      - name: Install Packages
+        run: |
+          yarn install --frozen-lockfile
+
+      - name: Build Mobile
+        run: |
+          yarn build:mobile
+
+      - name: Generate app.json and replace placeholders
+        run: |
+          cd apps/mobile && yarn config:mobile
+        env:
+          EXPO_PROJECT_SLUG: ${{ secrets.EXPO_PROJECT_SLUG }}
+          EXPO_PROJECT_NAME: ${{ secrets.EXPO_PROJECT_NAME }}
+          EXPO_PROJECT_OWNER: ${{ secrets.EXPO_PROJECT_OWNER }}
+          EXPO_PROJECT_ID: ${{ secrets.EXPO_PROJECT_ID }}
+          EXPO_PROJECT_PACKAGE_NAME: ${{ secrets.EXPO_PROJECT_PACKAGE_NAME }}
+          EXPO_PROJECT_IOS_BUNDLE_IDENTIFIER: ${{ secrets.EXPO_PROJECT_IOS_BUNDLE_IDENTIFIER }}
+
+      - name: Build on EAS
+        run: cd apps/mobile && eas build --profile internal --platform ios --non-interactive
+
+      - name: Publish update
+        run: cd apps/mobile && eas update --auto --profile internal --platform ios --non-interactive
+
+      - name: Upload App build to App store
+        run: cd apps/mobile && eas submit --profile internal --platform ios --latest --non-interactive

.github/workflows/release.stage.yml

@@ -21,7 +21,7 @@ jobs:
         id: tag_version
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          release_branches: apps,master,main,develop,stage
+          release_branches: apps,master,main,develop,stage,apps-stage
           pre_release_branches: something_to_possible_use_later
 
       - name: Create a GitHub release

apps/mobile/eas.json

@@ -1,27 +1,49 @@
 {
-  "cli": {
-    "version": ">= 12.5.3",
-    "appVersionSource": "remote"
-  },
-  "build": {
-    "development": {
-      "developmentClient": true,
-      "distribution": "internal"
-    },
-    "preview": {
-      "distribution": "internal"
-    },
-    "production": {
-      "autoIncrement": true
-    }
-  },
-  "submit": {
-    "production": {
+	"cli": {
+		"version": ">= 12.5.3",
+		"appVersionSource": "remote"
+	},
+	"build": {
+		"development": {
+			"developmentClient": true,
+			"distribution": "internal"
+		},
+		"preview": {
+			"distribution": "internal"
+		},
+		"production": {
+			"autoIncrement": true
+		},
+		"internal": {
+			"distribution": "internal"
+		}
+	},
+	"submit": {
+		"production": {
 			"android": {
 				"track": "internal",
 				"releaseStatus": "draft",
 				"changesNotSentForReview": false
+			},
+			"ios": {
+				"ascAppId": "APPLE_ID_PLACEHOLDER",
+				"ascApiKeyIssuerId": "APPSTORE_ISSUER_ID_PLACEHOLDER",
+				"ascApiKeyId": "APPSTORE_API_KEY_ID_PLACEHOLDER",
+				"ascApiKeyPath": "./AuthKey_8A3H79GTF8.p8"
 			}
-    }
-  }
+		},
+		"internal": {
+			"android": {
+				"track": "internal",
+				"releaseStatus": "draft",
+				"changesNotSentForReview": false
+			},
+			"ios": {
+				"ascAppId": "APPLE_ID_PLACEHOLDER",
+				"ascApiKeyIssuerId": "APPSTORE_ISSUER_ID_PLACEHOLDER",
+				"ascApiKeyId": "APPSTORE_API_KEY_ID_PLACEHOLDER",
+				"ascApiKeyPath": "./AuthKey_8A3H79GTF8.p8"
+			}
+		}
+	}
 }

apps/web/app/[locale]/calendar/component.tsx

@@ -11,7 +11,7 @@ import {
     SelectItem,
     SelectTrigger,
     SelectValue,
-} from "@components/ui/select"
+} from "@components/ui/select";
 import { cn } from "lib/utils";
 import { CalendarDays } from "lucide-react";
 import React from "react";

apps/web/app/[locale]/timesheet/components/FilterWithStatus.tsx

@@ -20,11 +20,15 @@ export function FilterWithStatus({
     ];
 
     return (
-        <div className={clsxm('grid grid-cols-4 h-[2.4rem] items-center justify-start bg-[#e2e8f0aa] rounded-xl w-full', className)}>
+        <div className={clsxm('flex flex-nowrap h-[2.2rem] items-center bg-[#e2e8f0aa] rounded-xl w-[520px]', className)}>
             {buttonData.map(({ label, count, icon }, index) => (
                 <Button
                     key={index}
-                    className={clsxm('group flex items-center justify-start h-[2.4rem] rounded-xl border dark:bg-dark--theme-light dark:border-gray-700 bg-[#e2e8f0aa] text[#71717A]', `${activeStatus === label ? "text-primary bg-white shadow-lg font-bold" : ""}`)}
+                    className={clsxm(
+                        'group flex items-center justify-start h-[2.2rem] rounded-xl border w-full',
+                        'dark:bg-dark--theme-light dark:border-gray-700 bg-[#e2e8f0aa] text[#71717A] w-[80px]',
+                        activeStatus === label && 'text-primary bg-white shadow-lg font-bold'
+                    )}
                     onClick={() => onToggle(label)}>
                     <span className={clsxm('font-medium ml-1 text-[#71717A]', `${activeStatus === label ? "text-primary" : ""}`)}>{label}</span>
                     <span className='font-medium ml-1 text-[#71717A]'>{count}</span>