Merge pull request #1077 from Tria-plc/fixes

Fixes

apps/edr-freight-web/portal/src/pages/contracts/ContractViewPage.tsx

@@ -33,8 +33,7 @@ import { contractsService } from "@/services/contracts.service";
 import { api } from "@/services/api";
 import { extractApiError } from "@/utils/result";
 
-const CONSENT_TEXT =
+const CONSENT_TEXT = "I have read the entire contract and agree to its terms.";
-  "I have read the entire contract and agree to its terms.";
 
 /**
  * Customer contract preview + sign. Customers must scroll through the full
@@ -224,7 +223,10 @@ export default function ContractViewPage() {
   }
 
   return (
-    <Box p={{ base: "md", md: "xl" }} pb={data.canSignCustomer ? 120 : undefined}>
+    <Box
+      p={{ base: "md", md: "xl" }}
+      pb={data.canSignCustomer ? 120 : undefined}
+    >
       <Box maw={920} mx="auto">
         <Group justify="space-between" wrap="wrap" gap="sm" mb="md">
           <Button
@@ -297,6 +299,7 @@ export default function ContractViewPage() {
             zIndex: 100,
             borderTop: "1px solid var(--mantine-color-gray-3)",
             background: "var(--mantine-color-body)",
+            paddingBottom: 32,
           }}
         >
           <Box maw={920} mx="auto">
@@ -423,10 +426,7 @@ export default function ContractViewPage() {
                 flexShrink: 0,
               }}
             >
-              <ShieldCheck
+              <ShieldCheck size={20} color="var(--mantine-color-edr-green-6)" />
-                size={20}
-                color="var(--mantine-color-edr-green-6)"
-              />
             </Box>
             <Text size="sm" c="dimmed">
               For security, enter the 6-digit code we sent to your registered

apps/edr-payment-api/src/config/cbe-bill.config.ts

@@ -21,6 +21,7 @@ export default registerAs("cbeBill", () => ({
     process.env.PASSENGER_API_BASE_URL || "http://localhost:3002"
   ).replace(/\/$/, ""),
   freightApiBaseUrl: (
-    process.env.FREIGHT_API_BASE_URL || "http://localhost:3001"
+    process.env.FREIGHT_API_BASE_URL ||
+    "https://edrfreightapi-staging.edrsc.com"
   ).replace(/\/$/, ""),
 }));