Enhance UI, wallet creation, and trial credit features

.dockerignore

@@ -10,4 +10,4 @@ coverage
 bun.lock
 docs/
 md/
-playwright.config.ts
+playwright.config.ts

.github/workflows/ci.yml

@@ -31,8 +31,10 @@ jobs:
         echo "BILLING_CURRENCY=USD" >> $GITHUB_ENV
         echo "BYOB_ENCRYPTION_SECRET=test_secret_32_characters_long_123" >> $GITHUB_ENV
         echo "NEXT_PUBLIC_APPWRITE_BYOB_TENANTS_ID=byob_tenants" >> $GITHUB_ENV
-        echo "NEXT_PUBLIC_TRIAL_CREDIT_USD=30" >> $GITHUB_ENV
-        echo "TRIAL_CREDIT_DAYS=60" >> $GITHUB_ENV
+        echo "NEXT_PUBLIC_ORG_TRIAL_CREDIT_USD=30" >> $GITHUB_ENV
+        echo "ORG_TRIAL_CREDIT_DAYS=60" >> $GITHUB_ENV
+        echo "NEXT_PUBLIC_PERSONAL_TRIAL_CREDIT_USD=10" >> $GITHUB_ENV
+        echo "PERSONAL_TRIAL_CREDIT_DAYS=30" >> $GITHUB_ENV
 
     - name: Type check
       run: npx tsc --noEmit

.github/workflows/deploy.yml

@@ -155,9 +155,13 @@ jobs:
           # Redis (server-side caching layer)
           REDIS_URL: ${{ secrets.REDIS_URL }}
           REDIS_PASSWORD: ${{ secrets.REDIS_PASSWORD }}
-          # Trial Credits
-          NEXT_PUBLIC_TRIAL_CREDIT_USD: ${{ vars.NEXT_PUBLIC_TRIAL_CREDIT_USD }}
-          TRIAL_CREDIT_DAYS: ${{ vars.TRIAL_CREDIT_DAYS }}
+          # Trial Credits (Granular Config)
+          NEXT_PUBLIC_ORG_TRIAL_CREDIT_USD: ${{ vars.NEXT_PUBLIC_ORG_TRIAL_CREDIT_USD }}
+          ORG_TRIAL_CREDIT_USD: ${{ vars.ORG_TRIAL_CREDIT_USD }}
+          ORG_TRIAL_CREDIT_DAYS: ${{ vars.ORG_TRIAL_CREDIT_DAYS }}
+          NEXT_PUBLIC_PERSONAL_TRIAL_CREDIT_USD: ${{ vars.NEXT_PUBLIC_PERSONAL_TRIAL_CREDIT_USD }}
+          PERSONAL_TRIAL_CREDIT_USD: ${{ vars.PERSONAL_TRIAL_CREDIT_USD }}
+          PERSONAL_TRIAL_CREDIT_DAYS: ${{ vars.PERSONAL_TRIAL_CREDIT_DAYS }}
         run: npm run build
 
       - name: Clean up before transfer
@@ -298,8 +302,12 @@ jobs:
             R2_PUBLIC_URL=${{ vars.R2_PUBLIC_URL }}
             REDIS_URL=${{ secrets.REDIS_URL }}
             REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}
-            NEXT_PUBLIC_TRIAL_CREDIT_USD=${{ vars.NEXT_PUBLIC_TRIAL_CREDIT_USD }}
-            TRIAL_CREDIT_DAYS=${{ vars.TRIAL_CREDIT_DAYS }}
+            NEXT_PUBLIC_ORG_TRIAL_CREDIT_USD=${{ vars.NEXT_PUBLIC_ORG_TRIAL_CREDIT_USD }}
+            ORG_TRIAL_CREDIT_USD=${{ vars.ORG_TRIAL_CREDIT_USD }}
+            ORG_TRIAL_CREDIT_DAYS=${{ vars.ORG_TRIAL_CREDIT_DAYS }}
+            NEXT_PUBLIC_PERSONAL_TRIAL_CREDIT_USD=${{ vars.NEXT_PUBLIC_PERSONAL_TRIAL_CREDIT_USD }}
+            PERSONAL_TRIAL_CREDIT_USD=${{ vars.PERSONAL_TRIAL_CREDIT_USD }}
+            PERSONAL_TRIAL_CREDIT_DAYS=${{ vars.PERSONAL_TRIAL_CREDIT_DAYS }}
             EOF
             chmod 600 .env.local
 

src/app/(dashboard)/layout.tsx

@@ -59,7 +59,8 @@ const DashboardContent = ({ children }: DashboardLayoutProps) => {
   const isProfilePage = pathname === "/profile" || pathname.startsWith("/profile/");
   const workspaceId = useWorkspaceId();
   const isTaskDetailPage = /^\/workspaces\/[^\/]+\/tasks\/[^\/]+$/.test(pathname || "");
-  const isMainDashboard = /^\/workspaces\/[^\/]+$/.test(pathname || "");
+const isWorkflowPage = /^\/workspaces\/[^\/]+\/spaces\/[^\/]+\/workflows\/[^\/]+$/.test(pathname || "");
+    const isMainDashboard = /^\/workspaces\/[^\/]+$/.test(pathname || "");
 
   return (
     <div className={`min-h-screen ${isMainDashboard ? 'bg-background' : ''}`}>
@@ -93,14 +94,12 @@ const DashboardContent = ({ children }: DashboardLayoutProps) => {
         <div className="lg:pl-[264px] w-full flex flex-col min-h-screen">
           <Navbar />
           <div className="flex-1 overflow-y-auto bg-background">
-            <div className="mx-auto max-w-screen-2xl">
-              <main className={cn(
-                "flex flex-col",
-                isTaskDetailPage ? "py-0 px-0" : "py-8 px-6"
-              )}>
-                {children}
-              </main>
-            </div>
+            <main className={cn(
+              "flex flex-col",
+              isTaskDetailPage || isWorkflowPage ? "py-0 px-0" : "py-8 px-6"
+            )}>
+              {children}
+            </main>
           </div>
         </div>
       </div>

src/app/(dashboard)/workspaces/[workspaceId]/admin/usage/client.tsx

@@ -33,6 +33,7 @@ import {
     useGetUsageDashboard,
     useExportUsage,
 } from "@/features/usage/api";
+import { useGetBillingAccount } from "@/features/billing/api";
 import {
     UsageKPICards,
     UsageCharts,
@@ -131,6 +132,13 @@ export function UsageDashboardClient() {
         eventsOffset: fetchOffset,
     });
 
+    // Fetch billing account for wallet balance
+    const { data: billingAccountData } = useGetBillingAccount({
+        organizationId: isOrg ? primaryOrganizationId : undefined,
+        userId: !isOrg ? user?.$id : undefined,
+        enabled: !!(isOrg ? primaryOrganizationId : user?.$id)
+    });
+
     const isEventsLoading = isDashboardLoading;
     const isSummaryLoading = isDashboardLoading;
     const isAlertsLoading = isDashboardLoading;
@@ -367,6 +375,8 @@ export function UsageDashboardClient() {
                             isLoading={isSummaryLoading}
                             currency={currency}
                             exchangeRate={rate}
+                            walletBalance={billingAccountData?.walletBalance}
+                            walletCurrency={billingAccountData?.walletCurrency}
                         />
 
                         {/* Charts */}