Merge remote-tracking branch 'origin/main' into develop

WestpacGEL · Mar 14, 2024 · fce23ec · fce23ec
2 parents 40600d0 + 9523e85
commit fce23ec
Show file tree

Hide file tree

Showing 39 changed files with 2,546 additions and 138 deletions.
diff --git a/apps/protoform/src/app/credit-cards/address/page.tsx b/apps/protoform/src/app/credit-cards/address/page.tsx
@@ -46,7 +46,10 @@ export default function Address() {
   return (
     <div>
       <BackButton onClick={() => router.push('/credit-cards/name-and-contact')}>Back to Name & contact</BackButton>
-      <CustomHeading groupHeading="Your details" leadText="[Dummy lead text to be replaced later]">
+      <CustomHeading
+        groupHeading="Your details"
+        leadText="Tell us more about where you live and how long you've been there."
+      >
         Address
       </CustomHeading>
       {validationErrors.length >= 1 && <ErrorValidationAlert errors={validationErrors} />}
@@ -56,9 +59,8 @@ export default function Address() {
             <InputGroup size="large" errorMessage={addressError} instanceId="address">
               <Autocomplete
                 noOptionsMessage="No options found"
-                label="Search for you residential address"
-                hintMessage="Can’t be a PO Box. Start typing your address and select from the list or enter your address manually"
-                footer="Can't see your address? Enter it manually."
+                label="Search for you home address"
+                hintMessage="Not a PO Box <>"
                 defaultInputValue={data.address}
                 invalid={!!addressError}
                 name="address"
@@ -70,14 +72,18 @@ export default function Address() {
 
           <FormGroup>
             <InputGroup
-              label="What is your current housing situation?"
+              label="How long have you lived there?"
               instanceId="housingLength"
               errorMessage={housingLengthError}
               size="large"
             >
               <Select name="housingLength" defaultValue={data.housingLength} invalid={!!housingLengthError}>
                 <option value="">Select</option>
                 <option value="1">1 Year</option>
+                <option value="2">2 Years</option>
+                <option value="3">3 Years</option>
+                <option value="4">4 Years</option>
+                <option value="5">5 Years</option>
               </Select>
             </InputGroup>
           </FormGroup>

diff --git a/apps/protoform/src/app/credit-cards/credit-limit/page.tsx b/apps/protoform/src/app/credit-cards/credit-limit/page.tsx
@@ -51,7 +51,11 @@ export default function CreditLimit() {
   return (
     <div>
       <BackButton onClick={() => router.push('/credit-cards/home-life')}>Back to Home life</BackButton>
-      <CustomHeading groupHeading="Your card" leadText="[Dummy lead text to be replaced later]">
+      <CustomHeading
+        groupHeading="Your card"
+        leadText="
+Choose your credit card limit or have one allocated for you."
+      >
         Credit limit
       </CustomHeading>
       {validationErrors.length >= 1 && <ErrorValidationAlert errors={validationErrors} />}

diff --git a/apps/protoform/src/app/credit-cards/home-life/page.tsx b/apps/protoform/src/app/credit-cards/home-life/page.tsx
@@ -63,7 +63,10 @@ export default function HomeLife() {
   return (
     <div>
       <BackButton onClick={() => router.push('/credit-cards/loans-and-cards')}>Back to Loans and cards</BackButton>
-      <CustomHeading groupHeading="Your finances" leadText="[Dummy lead text to be replaced later]">
+      <CustomHeading
+        groupHeading="Your finances"
+        leadText="Tell us more about your general expenses and living situation."
+      >
         Home life
       </CustomHeading>
       {validationErrors.length >= 1 && <ErrorValidationAlert errors={validationErrors} />}

diff --git a/apps/protoform/src/app/credit-cards/income-and-savings/page.tsx b/apps/protoform/src/app/credit-cards/income-and-savings/page.tsx
@@ -34,8 +34,8 @@ export default function IncomeAndSavings() {
       setBalanceError(!totalBal ? defaultError : '');
       setFreqError(!incomeFreq ? defaultError : '');
       setValidationErrors([
-        ...(!totalBal ? [{ id: 'totalBal', label: 'Total balances in savings / investment accounts' }] : []),
-        ...(!income ? [{ id: 'income', label: 'Income / salary / pension' }] : []),
+        ...(!totalBal ? [{ id: 'totalBal', label: 'Total balances in savings & investment accounts' }] : []),
+        ...(!income ? [{ id: 'income', label: 'Income, salary, pension' }] : []),
         ...(!incomeFreq ? [{ id: 'incomeFreq', label: 'Income frequency' }] : []),
       ]);
     } else {
@@ -53,7 +53,7 @@ export default function IncomeAndSavings() {
   return (
     <div>
       <BackButton onClick={() => router.push('/credit-cards')}>Back to Quick contact</BackButton>
-      <CustomHeading groupHeading="Your finances" leadText="[Dummy lead text to be replaced later]">
+      <CustomHeading groupHeading="Your finances" leadText="Tell us about your income and any savings you have.">
         Income & savings
       </CustomHeading>
       {validationErrors.length >= 1 && <ErrorValidationAlert errors={validationErrors} />}
@@ -62,7 +62,7 @@ export default function IncomeAndSavings() {
           <FormGroup>
             <Repeater className="mb-5">
               <InputGroup
-                label="Income / salary / pension (after tax)"
+                label="Income, salary, pension (after tax)"
                 hint="Enter a dollar value and choose a frequency"
                 errorMessage={incomeError || freqError}
                 instanceId="income"
@@ -85,7 +85,7 @@ export default function IncomeAndSavings() {
           <FormGroup>
             <InputGroup
               size="large"
-              label="Total balances in savings / investment accounts (if any)"
+              label="Total balances in savings & investment accounts (if any)"
               hint="Enter a dollar value"
               instanceId="totalBal"
               errorMessage={balanceError}

diff --git a/apps/protoform/src/app/credit-cards/loans-and-cards/page.tsx b/apps/protoform/src/app/credit-cards/loans-and-cards/page.tsx
@@ -62,7 +62,10 @@ export default function IncomeAndSavings() {
       <BackButton onClick={() => router.push('/credit-cards/income-and-savings')}>
         Back to Income and savings
       </BackButton>
-      <CustomHeading groupHeading="Your finances" leadText="[Dummy lead text to be replaced later]">
+      <CustomHeading
+        groupHeading="Your finances"
+        leadText="Provide the total balances of any non-Westpac loans and credit cards you have."
+      >
         Loans & cards
       </CustomHeading>
       {validationErrors.length >= 1 && <ErrorValidationAlert errors={validationErrors} />}

diff --git a/apps/protoform/src/app/credit-cards/page.tsx b/apps/protoform/src/app/credit-cards/page.tsx
@@ -1,6 +1,7 @@
 'use client';
 
 import { Alert, Form, FormGroup, FormSection, Input, InputGroup } from '@westpac/ui';
+import { BookIcon } from '@westpac/ui/icon';
 import { useRouter } from 'next/navigation';
 import { FormEvent, useEffect, useState } from 'react';
 
@@ -47,10 +48,10 @@ export default function CreditCards() {
   return (
     <div>
       <BackButton onClick={() => router.push('/')}>Back to dashboard</BackButton>
-      <CustomHeading groupHeading="Get Started" leadText="[Dummy lead text to be replaced later]">
-        Quick Contact
+      <CustomHeading groupHeading="Get started" leadText="To begin, we just need a few details.">
+        Quick contact
       </CustomHeading>
-      <Alert look="info">
+      <Alert look="info" icon={BookIcon}>
         <strong>We will save your application</strong> for 14 days in case you want to retrieve and complete it later.
       </Alert>
       {validationErrors.length >= 1 && <ErrorValidationAlert errors={validationErrors} />}
@@ -61,7 +62,7 @@ export default function CreditCards() {
               size="large"
               instanceId="name"
               label="Given name"
-              hint="As shown on your ID"
+              hint="To help us verify your identity online, please enter your name exactly as it appears on your ID."
               errorMessage={nameError}
             >
               <Input name="name" defaultValue={data.name} invalid={!!nameError} />

diff --git a/apps/protoform/src/app/credit-cards/review-and-submit/page.tsx b/apps/protoform/src/app/credit-cards/review-and-submit/page.tsx
@@ -82,7 +82,9 @@ export default function Address() {
   return (
     <div>
       <BackButton onClick={() => router.push('/credit-cards/address')}>Back to Address</BackButton>
-      <CustomHeading leadText="[Dummy lead text to be replaced later]">Review and submit</CustomHeading>
+      <CustomHeading leadText="Make suure all your details are correct before you submit your application.">
+        Review and submit
+      </CustomHeading>
       <ReviewSection baseEditRoute="/credit-cards" sections={SECTION_ITEMS} />
       <div className="border-t-[1px] border-t-border pt-5">
         <PhoneIcon color="primary" size="large" className="mb-5" />

diff --git a/apps/site/public/robots.txt b/apps/site/public/robots.txt
@@ -0,0 +1,7 @@
+User-agent: Googlebot
+Disallow: /keystatic/
+
+User-agent: *
+Allow: /
+
+Sitemap: https://gel.westpacgroup.com.au/sitemap/sitemap.xml