From ab2513fd2174b8e936bf3a3dc69aef4b491c08ae Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Wed, 16 Aug 2023 22:02:50 +0000
Subject: [PATCH 01/43] refactor(base): remove Call To Action Text + CSS

---
 benefits/core/templates/core/base.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/benefits/core/templates/core/base.html b/benefits/core/templates/core/base.html
index f42cc04eb..5de0488d0 100644
--- a/benefits/core/templates/core/base.html
+++ b/benefits/core/templates/core/base.html
@@ -87,11 +87,7 @@
             {% endblock inner-content %}
           </div>
           {% block call-to-action %}
-            <div class="row d-flex flex-column-reverse justify-content-lg-end flex-lg-row">
-              <div class="col-lg-9 d-flex align-items-end flex-row-reverse col-sm-8 offset-sm-2 offset-lg-0 offset-2 col-8">
-                {% block call-to-action-text %}
-                {% endblock call-to-action-text %}
-              </div>
+            <div class="row d-flex justify-content-lg-end">
               <div class="col-lg-3 offset-2 offset-sm-2 offset-lg-0 col-sm-8 col-8">
                 {% block call-to-action-button %}
                 {% endblock call-to-action-button %}

From 8d3a0f8cdb09f738886b6d6b89e203f17789d8f3 Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Wed, 16 Aug 2023 22:08:22 +0000
Subject: [PATCH 02/43] refactor(form): remove unused Help Text and CSS

---
 benefits/core/templates/core/includes/form.html | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/benefits/core/templates/core/includes/form.html b/benefits/core/templates/core/includes/form.html
index ea861a1dc..ae7c89057 100644
--- a/benefits/core/templates/core/includes/form.html
+++ b/benefits/core/templates/core/includes/form.html
@@ -28,12 +28,7 @@
     </div>
 
     {% if form.submit_value %}
-      <div class="row d-flex flex-column-reverse justify-content-lg-end flex-lg-row pt-8">
-        {% if help_text %}
-          <div class="col-lg-9 d-flex align-items-end flex-row-reverse col-sm-8 offset-sm-2 offset-lg-0 offset-2 col-8">
-            <p class="pt-4 pt-lg-0">{{ help_text }}</p>
-          </div>
-        {% endif %}
+      <div class="row d-flex justify-content-lg-end pt-8">
         <div class="col-lg-3 offset-2 offset-sm-2 offset-lg-0 col-sm-8 col-8">
           <button class="btn btn-lg btn-primary spinner-hidden d-flex justify-content-center align-items-center"
                   data-action="submit"

From 9de6f5ecea32238fbde721ed50ce5a3ff4bf0a1c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 21:12:26 +0000
Subject: [PATCH 03/43] chore(deps): bump cypress-io/github-action from 5 to 6

Bumps [cypress-io/github-action](https://github.com/cypress-io/github-action) from 5 to 6.
- [Release notes](https://github.com/cypress-io/github-action/releases)
- [Changelog](https://github.com/cypress-io/github-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/github-action/compare/v5...v6)

---
updated-dependencies:
- dependency-name: cypress-io/github-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/tests-cypress.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests-cypress.yml b/.github/workflows/tests-cypress.yml
index 1b12a9ad2..bc532e94d 100644
--- a/.github/workflows/tests-cypress.yml
+++ b/.github/workflows/tests-cypress.yml
@@ -19,7 +19,7 @@ jobs:
           docker compose up --detach client server
 
       - name: Run Cypress tests
-        uses: cypress-io/github-action@v5
+        uses: cypress-io/github-action@v6
         env:
           CYPRESS_baseUrl: http://localhost:8000
         with:

From 32634faf93a79f1282536317a99560c29c8c3a85 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 21 Aug 2023 21:59:10 +0000
Subject: [PATCH 04/43] chore(pre-commit): autoupdate hooks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/compilerla/conventional-pre-commit: v2.3.0 → v2.4.0](https://github.com/compilerla/conventional-pre-commit/compare/v2.3.0...v2.4.0)
- [github.com/pre-commit/mirrors-prettier: v3.0.1 → v3.0.2](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.1...v3.0.2)
---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ac70fafc8..2960b6ea4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,7 +15,7 @@ default_stages:
 
 repos:
   - repo: https://github.com/compilerla/conventional-pre-commit
-    rev: v2.3.0
+    rev: v2.4.0
     hooks:
       - id: conventional-pre-commit
         stages: [commit-msg]
@@ -55,7 +55,7 @@ repos:
         files: .py$
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.1
+    rev: v3.0.2
     hooks:
       - id: prettier
         types_or: [javascript, css]

From 996ce6ba19916efdc311f46b6a66aca265cf9f28 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Aug 2023 21:58:57 +0000
Subject: [PATCH 05/43] chore(deps-dev): bump sentry-sdk from 1.29.2 to 1.30.0

Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.29.2 to 1.30.0.
- [Release notes](https://github.com/getsentry/sentry-python/releases)
- [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-python/compare/1.29.2...1.30.0)

---
updated-dependencies:
- dependency-name: sentry-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 6160afeb9..adc3bc0f2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ dependencies = [
     "django-csp==3.7",
     "eligibility-api==2023.6.1",
     "requests==2.31.0",
-    "sentry-sdk==1.29.2",
+    "sentry-sdk==1.30.0",
     "six==1.16.0",
 ]
 dynamic = ["version"]

From b21915a7b1efb6ec53452a238c7969cddca57f66 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Aug 2023 22:01:25 +0000
Subject: [PATCH 06/43] chore(deps-dev): bump cypress from 12.17.4 to 13.1.0 in
 /tests/cypress

Bumps [cypress](https://github.com/cypress-io/cypress) from 12.17.4 to 13.1.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/compare/v12.17.4...v13.1.0)

---
updated-dependencies:
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/cypress/package-lock.json | 32 ++++++++++++++++----------------
 tests/cypress/package.json      |  2 +-
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/tests/cypress/package-lock.json b/tests/cypress/package-lock.json
index 5c30b4977..32ebffd4a 100644
--- a/tests/cypress/package-lock.json
+++ b/tests/cypress/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "AGPL-3.0-or-later",
       "devDependencies": {
-        "cypress": "^12.17.4"
+        "cypress": "^13.1.0"
       }
     },
     "node_modules/@colors/colors": {
@@ -23,9 +23,9 @@
       }
     },
     "node_modules/@cypress/request": {
-      "version": "2.88.12",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz",
-      "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.0.tgz",
+      "integrity": "sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==",
       "dev": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
@@ -536,13 +536,13 @@
       }
     },
     "node_modules/cypress": {
-      "version": "12.17.4",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz",
-      "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==",
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz",
+      "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@cypress/request": "2.88.12",
+        "@cypress/request": "^3.0.0",
         "@cypress/xvfb": "^1.2.4",
         "@types/node": "^16.18.39",
         "@types/sinonjs__fake-timers": "8.1.1",
@@ -590,7 +590,7 @@
         "cypress": "bin/cypress"
       },
       "engines": {
-        "node": "^14.0.0 || ^16.0.0 || >=18.0.0"
+        "node": "^16.0.0 || ^18.0.0 || >=20.0.0"
       }
     },
     "node_modules/dashdash": {
@@ -1971,9 +1971,9 @@
       "optional": true
     },
     "@cypress/request": {
-      "version": "2.88.12",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz",
-      "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.0.tgz",
+      "integrity": "sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==",
       "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
@@ -2357,12 +2357,12 @@
       }
     },
     "cypress": {
-      "version": "12.17.4",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz",
-      "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==",
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz",
+      "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==",
       "dev": true,
       "requires": {
-        "@cypress/request": "2.88.12",
+        "@cypress/request": "^3.0.0",
         "@cypress/xvfb": "^1.2.4",
         "@types/node": "^16.18.39",
         "@types/sinonjs__fake-timers": "8.1.1",
diff --git a/tests/cypress/package.json b/tests/cypress/package.json
index 85fcbffc2..be183eb9a 100644
--- a/tests/cypress/package.json
+++ b/tests/cypress/package.json
@@ -12,6 +12,6 @@
   "license": "AGPL-3.0-or-later",
   "private": true,
   "devDependencies": {
-    "cypress": "^12.17.4"
+    "cypress": "^13.1.0"
   }
 }

From 5d3f71840c4512ff45f4c0be761c7cb07925620c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 21:13:04 +0000
Subject: [PATCH 07/43] chore(deps): bump actions/checkout from 3 to 4

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql.yml        | 2 +-
 .github/workflows/deploy.yml        | 2 +-
 .github/workflows/mkdocs.yml        | 2 +-
 .github/workflows/tests-cypress.yml | 2 +-
 .github/workflows/tests-pytest.yml  | 2 +-
 .github/workflows/tests-ui.yml      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index af8660add..747a33f70 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -30,7 +30,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index d092cc308..b8cbb5128 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Write commit SHA to file
         run: echo "${{ github.sha }}" >> benefits/static/sha.txt
diff --git a/.github/workflows/mkdocs.yml b/.github/workflows/mkdocs.yml
index c6c525d0b..0da72978b 100644
--- a/.github/workflows/mkdocs.yml
+++ b/.github/workflows/mkdocs.yml
@@ -23,7 +23,7 @@ jobs:
     if: github.event.workflow_run == null || github.event.workflow_run.conclusion == 'success'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download coverage report
         uses: dawidd6/action-download-artifact@v2
diff --git a/.github/workflows/tests-cypress.yml b/.github/workflows/tests-cypress.yml
index bc532e94d..d412423a2 100644
--- a/.github/workflows/tests-cypress.yml
+++ b/.github/workflows/tests-cypress.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Start app
         run: |
diff --git a/.github/workflows/tests-pytest.yml b/.github/workflows/tests-pytest.yml
index 84b4a9f58..0817edf99 100644
--- a/.github/workflows/tests-pytest.yml
+++ b/.github/workflows/tests-pytest.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install system packages
         run: |
diff --git a/.github/workflows/tests-ui.yml b/.github/workflows/tests-ui.yml
index d4a5de97f..98bcf58c5 100644
--- a/.github/workflows/tests-ui.yml
+++ b/.github/workflows/tests-ui.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Start app
         run: |

From 051b17c8348ae2c317a6d71d819b470ccbaaef0d Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 22:08:27 +0000
Subject: [PATCH 08/43] chore(pre-commit): autoupdate hooks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/pre-commit/mirrors-prettier: v3.0.2 → v3.0.3](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.2...v3.0.3)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2960b6ea4..8397c743a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -55,7 +55,7 @@ repos:
         files: .py$
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.2
+    rev: v3.0.3
     hooks:
       - id: prettier
         types_or: [javascript, css]

From ef04a193a6327a21336c4d98612a2a0c06842485 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 15:51:15 +0000
Subject: [PATCH 09/43] chore(deps-dev): bump django from 4.2.4 to 4.2.5

Bumps [django](https://github.com/django/django) from 4.2.4 to 4.2.5.
- [Commits](https://github.com/django/django/compare/4.2.4...4.2.5)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index adc3bc0f2..6a113b41f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ classifiers = ["Programming Language :: Python :: 3 :: Only"]
 description = "Cal-ITP Benefits is an application that enables automated eligibility verification and enrollment for transit benefits onto customers’ existing contactless bank (credit/debit) cards."
 dependencies = [
     "Authlib==1.2.1",
-    "Django==4.2.4",
+    "Django==4.2.5",
     "django-csp==3.7",
     "eligibility-api==2023.6.1",
     "requests==2.31.0",

From 7f1bbda0bf51ac0201ca2f19bfa31b60abb8bd84 Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Tue, 5 Sep 2023 23:46:33 +0000
Subject: [PATCH 10/43] feat(elig-start): Veterans - Use same copy as Older
 Adult

---
 ...dia-item--idcardcheck--start--veteran.html | 33 +++++++--------
 benefits/locale/en/LC_MESSAGES/django.po      | 28 ++-----------
 benefits/locale/es/LC_MESSAGES/django.po      | 40 ++++---------------
 3 files changed, 27 insertions(+), 74 deletions(-)

diff --git a/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--veteran.html b/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--veteran.html
index 0f9a311b2..684a08003 100644
--- a/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--veteran.html
+++ b/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--veteran.html
@@ -3,24 +3,25 @@
 {% load i18n %}
 
 {% block heading %}
-  {% translate "Access to your preferred VA related account" %}
+    {% translate "Access to your preferred VA related account" %}
 {% endblock heading %}
 
 {% block body %}
-  <div class="media-body--details">
-    <p>
-      {% translate "You will need to sign into VA.gov in order to verify your identity and your veteran status. VA.gov uses the following services:" %}
-    </p>
-    <div class="media-body--items">
-      <ul>
-        <li>{% translate "Login.gov" %}</li>
-        <li>{% translate "ID.me" %}</li>
-        <li>{% translate "DS Logon" %}</li>
-        <li>{% translate "My HealtheVet" %}</li>
-      </ul>
-      <p class="pt-1">
-        {% translate "If you do not have an account with any of these services, you will need to create one. We recommend using Login.gov." %}
-      </p>
+    <div class="media-body--details">
+        <p>
+            {% translate "You will be able to create an account using your email address if you do not already have one. We use your Login.gov account to verify your identity." %}
+            {% translate "Learn more about identity verification" as text %}
+            {% include "core/includes/modal-trigger.html" with modal="modal--identity-verification" text=text period=True %}
+        </p>
+        <div class="media-body--items">
+            <p>{% translate "For this process you will need:" %}</p>
+            <ul>
+                <li>{% translate "Your state-issued ID card" %}</li>
+                <li>{% translate "Your Social Security number" %}</li>
+                <li>{% translate "A phone number with a phone plan associated with your name" %}</li>
+            </ul>
+        </div>
     </div>
-  </div>
+
+    {% include "eligibility/includes/modal--senior-start-help.html" with size="modal-lg" id="modal--identity-verification" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
 {% endblock body %}
diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po
index c0ae26d4a..d51848a13 100644
--- a/benefits/locale/en/LC_MESSAGES/django.po
+++ b/benefits/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2023-08-15 22:45+0000\n"
+"POT-Creation-Date: 2023-09-05 23:44+0000\n"
 "Language: English\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -335,28 +335,6 @@ msgstr ""
 msgid "Access to your preferred VA related account"
 msgstr ""
 
-msgid ""
-"You will need to sign into VA.gov in order to verify your identity and your "
-"veteran status. VA.gov uses the following services:"
-msgstr ""
-
-msgid "Login.gov"
-msgstr ""
-
-msgid "ID.me"
-msgstr ""
-
-msgid "DS Logon"
-msgstr ""
-
-msgid "My HealtheVet"
-msgstr ""
-
-msgid ""
-"If you do not have an account with any of these services, you will need to "
-"create one. We recommend using Login.gov."
-msgstr ""
-
 msgid "Go back"
 msgstr ""
 
@@ -397,8 +375,8 @@ msgid ""
 "This option is for people who have served in the active military, naval, or "
 "air service, and who were discharged or released therefrom under conditions "
 "other than dishonorable. You will need to <a href=\"https://www.va.gov/"
-"resources/verifying-your-identity-on-vagov/\" target=\"_blank\" "
-"rel=\"noopener noreferrer\">verify your identity through VA.gov</a>."
+"resources/verifying-your-identity-on-vagov/\" target=\"_blank\" rel="
+"\"noopener noreferrer\">verify your identity through VA.gov</a>."
 msgstr ""
 
 #, python-format
diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po
index 115ec10ab..5143a832c 100644
--- a/benefits/locale/es/LC_MESSAGES/django.po
+++ b/benefits/locale/es/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2023-08-15 22:45+0000\n"
+"POT-Creation-Date: 2023-09-05 23:44+0000\n"
 "Language: Español\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -259,8 +259,8 @@ msgstr ""
 "califican para una serie de programas de tarifas reducidas. Este beneficio "
 "de tránsito debe renovarse en el futuro en función de la fecha de "
 "vencimiento de la tarjeta de cortesía. Obtenga más información en el <a "
-"href='https://mst.org/riders-guide/how-to-ride/courtesy-card/' "
-"target=\"_blank\" rel=\"noopener noreferrer\">MST Riders Guide</a>."
+"href='https://mst.org/riders-guide/how-to-ride/courtesy-card/' target="
+"\"_blank\" rel=\"noopener noreferrer\">MST Riders Guide</a>."
 
 msgid "Sign out of Login.gov"
 msgstr "Cierre sesión de Login.gov"
@@ -426,32 +426,6 @@ msgstr ""
 msgid "Access to your preferred VA related account"
 msgstr "Acceso a su cuenta preferida relacionada con VA"
 
-msgid ""
-"You will need to sign into VA.gov in order to verify your identity and your "
-"veteran status. VA.gov uses the following services:"
-msgstr ""
-"Deberá iniciar sesión en VA.gov para verificar su identidad y su estado de "
-"veterano. VA.gov utiliza los siguientes servicios:"
-
-msgid "Login.gov"
-msgstr "Login.gov"
-
-msgid "ID.me"
-msgstr "ID.me"
-
-msgid "DS Logon"
-msgstr "DS Logon"
-
-msgid "My HealtheVet"
-msgstr "My HealtheVet"
-
-msgid ""
-"If you do not have an account with any of these services, you will need to "
-"create one. We recommend using Login.gov."
-msgstr ""
-"Si no tiene una cuenta con ninguno de estos servicios, deberá crear una. "
-"Recomendamos utilizar Login.gov. "
-
 msgid "Go back"
 msgstr "Volver"
 
@@ -496,14 +470,14 @@ msgid ""
 "This option is for people who have served in the active military, naval, or "
 "air service, and who were discharged or released therefrom under conditions "
 "other than dishonorable. You will need to <a href=\"https://www.va.gov/"
-"resources/verifying-your-identity-on-vagov/\" target=\"_blank\" "
-"rel=\"noopener noreferrer\">verify your identity through VA.gov</a>."
+"resources/verifying-your-identity-on-vagov/\" target=\"_blank\" rel="
+"\"noopener noreferrer\">verify your identity through VA.gov</a>."
 msgstr ""
 "Esta opción es para personas que hayan prestado servicio militar, naval o "
 "aéreo de manera activa, y quienes fueron dados de baja o liberados en "
 "condiciones que no hayan sido deshonrosas. Necesitará <a href='https://www."
-"va.gov/resources/verifying-your-identity-on-vagov/' target=\"_blank\" "
-"rel=\"noopener noreferrer\">verificar su identidad a través de VA.gov</a>."
+"va.gov/resources/verifying-your-identity-on-vagov/' target=\"_blank\" rel="
+"\"noopener noreferrer\">verificar su identidad a través de VA.gov</a>."
 
 #, python-format
 msgid ""

From 1473974a0ebc02011d68f08d221acb64e0980269 Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Tue, 5 Sep 2023 23:50:42 +0000
Subject: [PATCH 11/43] feat(elig-start): Veterans - Use Login.gov button for
 CTA

---
 .../eligibility/templates/eligibility/start--veteran.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/benefits/eligibility/templates/eligibility/start--veteran.html b/benefits/eligibility/templates/eligibility/start--veteran.html
index 1172d8107..328f9bfa8 100644
--- a/benefits/eligibility/templates/eligibility/start--veteran.html
+++ b/benefits/eligibility/templates/eligibility/start--veteran.html
@@ -17,10 +17,12 @@ <h1>{% translate "You selected a Veteran transit benefit." %}</h1>
 
 {% block call-to-action %}
   <div class="row d-flex justify-content-lg-end">
-    <div class="col-lg-3 offset-2 offset-sm-2 offset-lg-0 col-sm-8 col-8">
+    <div class="col-lg-4 offset-2 offset-lg-0 col-sm-8 col-8 d-flex justify-content-lg-end justify-content-center">
       {% url "oauth:login" as button_url %}
-      {% translate "Continue to VA.gov" as button_text %}
-      <a href="{{ button_url }}" class="btn btn-lg btn-primary" role="button">{{ button_text }}</a>
+      {% translate "Get started with" as button_text %}
+      <a href="{{ button_url }}" class="btn btn-lg btn-primary" id="login">
+        {{ button_text }} <span class="fallback-text white-logo">Login.gov</span>
+      </a>
     </div>
   </div>
 {% endblock call-to-action %}

From 829e4d7259d1601322d56fde5b65baeb32f2c4f6 Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Tue, 5 Sep 2023 23:55:11 +0000
Subject: [PATCH 12/43] chore: update django.po

---
 benefits/locale/en/LC_MESSAGES/django.po | 5 +----
 benefits/locale/es/LC_MESSAGES/django.po | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po
index d51848a13..d82751068 100644
--- a/benefits/locale/en/LC_MESSAGES/django.po
+++ b/benefits/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2023-09-05 23:44+0000\n"
+"POT-Creation-Date: 2023-09-05 23:51+0000\n"
 "Language: English\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -426,9 +426,6 @@ msgstr ""
 msgid "You selected a Veteran transit benefit."
 msgstr ""
 
-msgid "Continue to VA.gov"
-msgstr ""
-
 msgid "You will need a few items to continue:"
 msgstr ""
 
diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po
index 5143a832c..f32e0bf84 100644
--- a/benefits/locale/es/LC_MESSAGES/django.po
+++ b/benefits/locale/es/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2023-09-05 23:44+0000\n"
+"POT-Creation-Date: 2023-09-05 23:51+0000\n"
 "Language: Español\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -532,9 +532,6 @@ msgstr "Descripción de beneficios para veteranos"
 msgid "You selected a Veteran transit benefit."
 msgstr "Ha seleccionado un beneficio de tránsito para veteranos."
 
-msgid "Continue to VA.gov"
-msgstr "Continuar con VA.gov"
-
 msgid "You will need a few items to continue:"
 msgstr "Necesitará algunos artículos para continuar:"
 

From edb1d109ab00ff1e815ff5cbb85c20ef3f5b454c Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Wed, 6 Sep 2023 21:14:53 +0000
Subject: [PATCH 13/43] fix(elig-start): change heading, change to Spaces: 2

---
 ...edia-item--idcardcheck--start--senior.html | 32 +++++++++----------
 ...dia-item--idcardcheck--start--veteran.html | 32 +++++++++----------
 2 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--senior.html b/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--senior.html
index 74c24d496..7bd1f51e5 100644
--- a/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--senior.html
+++ b/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--senior.html
@@ -3,25 +3,25 @@
 {% load i18n %}
 
 {% block heading %}
-    {% translate "A Login.gov account with identity verification" %}
+  {% translate "A Login.gov account with identity verification" %}
 {% endblock heading %}
 
 {% block body %}
-    <div class="media-body--details">
-        <p>
-            {% translate "You will be able to create an account using your email address if you do not already have one. We use your Login.gov account to verify your identity." %}
-            {% translate "Learn more about identity verification" as text %}
-            {% include "core/includes/modal-trigger.html" with modal="modal--identity-verification" text=text period=True %}
-        </p>
-        <div class="media-body--items">
-            <p>{% translate "For this process you will need:" %}</p>
-            <ul>
-                <li>{% translate "Your state-issued ID card" %}</li>
-                <li>{% translate "Your Social Security number" %}</li>
-                <li>{% translate "A phone number with a phone plan associated with your name" %}</li>
-            </ul>
-        </div>
+  <div class="media-body--details">
+    <p>
+      {% translate "You will be able to create an account using your email address if you do not already have one. We use your Login.gov account to verify your identity." %}
+      {% translate "Learn more about identity verification" as text %}
+      {% include "core/includes/modal-trigger.html" with modal="modal--identity-verification" text=text period=True %}
+    </p>
+    <div class="media-body--items">
+      <p>{% translate "For this process you will need:" %}</p>
+      <ul>
+        <li>{% translate "Your state-issued ID card" %}</li>
+        <li>{% translate "Your Social Security number" %}</li>
+        <li>{% translate "A phone number with a phone plan associated with your name" %}</li>
+      </ul>
     </div>
+  </div>
 
-    {% include "eligibility/includes/modal--senior-start-help.html" with size="modal-lg" id="modal--identity-verification" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
+  {% include "eligibility/includes/modal--senior-start-help.html" with size="modal-lg" id="modal--identity-verification" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
 {% endblock body %}
diff --git a/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--veteran.html b/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--veteran.html
index 684a08003..7bd1f51e5 100644
--- a/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--veteran.html
+++ b/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--veteran.html
@@ -3,25 +3,25 @@
 {% load i18n %}
 
 {% block heading %}
-    {% translate "Access to your preferred VA related account" %}
+  {% translate "A Login.gov account with identity verification" %}
 {% endblock heading %}
 
 {% block body %}
-    <div class="media-body--details">
-        <p>
-            {% translate "You will be able to create an account using your email address if you do not already have one. We use your Login.gov account to verify your identity." %}
-            {% translate "Learn more about identity verification" as text %}
-            {% include "core/includes/modal-trigger.html" with modal="modal--identity-verification" text=text period=True %}
-        </p>
-        <div class="media-body--items">
-            <p>{% translate "For this process you will need:" %}</p>
-            <ul>
-                <li>{% translate "Your state-issued ID card" %}</li>
-                <li>{% translate "Your Social Security number" %}</li>
-                <li>{% translate "A phone number with a phone plan associated with your name" %}</li>
-            </ul>
-        </div>
+  <div class="media-body--details">
+    <p>
+      {% translate "You will be able to create an account using your email address if you do not already have one. We use your Login.gov account to verify your identity." %}
+      {% translate "Learn more about identity verification" as text %}
+      {% include "core/includes/modal-trigger.html" with modal="modal--identity-verification" text=text period=True %}
+    </p>
+    <div class="media-body--items">
+      <p>{% translate "For this process you will need:" %}</p>
+      <ul>
+        <li>{% translate "Your state-issued ID card" %}</li>
+        <li>{% translate "Your Social Security number" %}</li>
+        <li>{% translate "A phone number with a phone plan associated with your name" %}</li>
+      </ul>
     </div>
+  </div>
 
-    {% include "eligibility/includes/modal--senior-start-help.html" with size="modal-lg" id="modal--identity-verification" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
+  {% include "eligibility/includes/modal--senior-start-help.html" with size="modal-lg" id="modal--identity-verification" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
 {% endblock body %}

From f9dffcb0bc655f6028e006d3408407861d1829a7 Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Wed, 6 Sep 2023 21:24:23 +0000
Subject: [PATCH 14/43] fix(modal): rename modal from Senior to Login

---
 .../includes/media-item--idcardcheck--start--senior.html        | 2 +-
 .../includes/media-item--idcardcheck--start--veteran.html       | 2 +-
 ...-senior-start-help.html => modal--login-gov-start-help.html} | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename benefits/eligibility/templates/eligibility/includes/{modal--senior-start-help.html => modal--login-gov-start-help.html} (100%)

diff --git a/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--senior.html b/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--senior.html
index 7bd1f51e5..635c397de 100644
--- a/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--senior.html
+++ b/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--senior.html
@@ -23,5 +23,5 @@
     </div>
   </div>
 
-  {% include "eligibility/includes/modal--senior-start-help.html" with size="modal-lg" id="modal--identity-verification" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
+  {% include "eligibility/includes/modal--login-gov-start-help.html" with size="modal-lg" id="modal--identity-verification" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
 {% endblock body %}
diff --git a/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--veteran.html b/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--veteran.html
index 7bd1f51e5..635c397de 100644
--- a/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--veteran.html
+++ b/benefits/eligibility/templates/eligibility/includes/media-item--idcardcheck--start--veteran.html
@@ -23,5 +23,5 @@
     </div>
   </div>
 
-  {% include "eligibility/includes/modal--senior-start-help.html" with size="modal-lg" id="modal--identity-verification" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
+  {% include "eligibility/includes/modal--login-gov-start-help.html" with size="modal-lg" id="modal--identity-verification" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
 {% endblock body %}
diff --git a/benefits/eligibility/templates/eligibility/includes/modal--senior-start-help.html b/benefits/eligibility/templates/eligibility/includes/modal--login-gov-start-help.html
similarity index 100%
rename from benefits/eligibility/templates/eligibility/includes/modal--senior-start-help.html
rename to benefits/eligibility/templates/eligibility/includes/modal--login-gov-start-help.html

From 4cb2853be7326c8efb39eb2ddbcaaf085e4273f4 Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Wed, 6 Sep 2023 21:26:05 +0000
Subject: [PATCH 15/43] chore: run makemessages

---
 benefits/locale/en/LC_MESSAGES/django.po | 13 +++++--------
 benefits/locale/es/LC_MESSAGES/django.po | 15 ++++++---------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po
index d82751068..959a33431 100644
--- a/benefits/locale/en/LC_MESSAGES/django.po
+++ b/benefits/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2023-09-05 23:51+0000\n"
+"POT-Creation-Date: 2023-09-06 21:22+0000\n"
 "Language: English\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -332,27 +332,24 @@ msgstr ""
 msgid "A phone number with a phone plan associated with your name"
 msgstr ""
 
-msgid "Access to your preferred VA related account"
-msgstr ""
-
 msgid "Go back"
 msgstr ""
 
-msgid "Learn more about"
+msgid "Verify your identity with "
 msgstr ""
 
 msgctxt "image alt text"
 msgid "Login.gov"
 msgstr ""
 
-msgid "Verify your identity with "
-msgstr ""
-
 msgid ""
 "We use Login.gov to verify your identity to make sure you are eligible for "
 "the transit benefit you selected."
 msgstr ""
 
+msgid "Learn more about"
+msgstr ""
+
 msgid "MST Courtesy Card"
 msgstr ""
 
diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po
index f32e0bf84..e354a9cb3 100644
--- a/benefits/locale/es/LC_MESSAGES/django.po
+++ b/benefits/locale/es/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2023-09-05 23:51+0000\n"
+"POT-Creation-Date: 2023-09-06 21:22+0000\n"
 "Language: Español\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -423,22 +423,16 @@ msgid "A phone number with a phone plan associated with your name"
 msgstr ""
 "Un número de teléfono en el cual pueda recibir llamadas o mensajes de texto"
 
-msgid "Access to your preferred VA related account"
-msgstr "Acceso a su cuenta preferida relacionada con VA"
-
 msgid "Go back"
 msgstr "Volver"
 
-msgid "Learn more about"
-msgstr "Más información sobre"
+msgid "Verify your identity with "
+msgstr "Verifique su identidad con "
 
 msgctxt "image alt text"
 msgid "Login.gov"
 msgstr "Login.gov"
 
-msgid "Verify your identity with "
-msgstr "Verifique su identidad con "
-
 msgid ""
 "We use Login.gov to verify your identity to make sure you are eligible for "
 "the transit benefit you selected."
@@ -446,6 +440,9 @@ msgstr ""
 "Utilizamos Login.gov para verificar tu identidad para asegurarnos de que "
 "seas elegible para el beneficio de tránsito que seleccionaste."
 
+msgid "Learn more about"
+msgstr "Más información sobre"
+
 msgid "MST Courtesy Card"
 msgstr "Tarjeta de cortesía de MST"
 

From 170136b803db32e63f3cef8349872455659aeda3 Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Wed, 6 Sep 2023 22:10:16 +0000
Subject: [PATCH 16/43] feat(elig-index): Veterans - Use Older Adult language
 for Veterans. Change #login to .login

---
 .../includes/selection-label--senior.html      |  2 +-
 .../includes/selection-label--veteran.html     |  8 +++++---
 benefits/locale/en/LC_MESSAGES/django.po       |  4 +---
 benefits/locale/es/LC_MESSAGES/django.po       |  8 ++------
 benefits/static/css/styles.css                 | 18 ++++++++++--------
 5 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html b/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html
index ccac3b39a..f33ba8874 100644
--- a/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html
+++ b/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html
@@ -8,7 +8,7 @@
 {% block description %}
     {% translate "You must be 65 years or older. You will need to verify your identity with" %}
 
-    {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0" id="login" modal="modal--login-gov" login=True period=True %}
+    {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov" login=True period=True %}
 
     {% include "eligibility/includes/modal--senior-help.html" with id="modal--login-gov" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
 {% endblock description %}
diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html
index 2504333b5..a4bdc7014 100644
--- a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html
+++ b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html
@@ -7,8 +7,10 @@
 
 {% block description %}
   {% blocktranslate trimmed %}
-    This option is for people who have served in the active military, naval, or air service, and who were discharged or
-    released therefrom under conditions other than dishonorable. You will need to
-    <a href="https://www.va.gov/resources/verifying-your-identity-on-vagov/" target="_blank" rel="noopener noreferrer">verify your identity through VA.gov</a>.
+    This option is for people who have served in the active military, naval, or air service, and who were discharged or released therefrom under conditions other than dishonorable. You will need to verify your identity with
   {% endblocktranslate %}
+
+  {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov" login=True period=True %}
+
+  {% include "eligibility/includes/modal--senior-help.html" with id="modal--login-gov-veterans" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
 {% endblock description %}
diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po
index 959a33431..22f02955c 100644
--- a/benefits/locale/en/LC_MESSAGES/django.po
+++ b/benefits/locale/en/LC_MESSAGES/django.po
@@ -371,9 +371,7 @@ msgstr ""
 msgid ""
 "This option is for people who have served in the active military, naval, or "
 "air service, and who were discharged or released therefrom under conditions "
-"other than dishonorable. You will need to <a href=\"https://www.va.gov/"
-"resources/verifying-your-identity-on-vagov/\" target=\"_blank\" rel="
-"\"noopener noreferrer\">verify your identity through VA.gov</a>."
+"other than dishonorable. You will need to verify your identity with"
 msgstr ""
 
 #, python-format
diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po
index e354a9cb3..f7562c454 100644
--- a/benefits/locale/es/LC_MESSAGES/django.po
+++ b/benefits/locale/es/LC_MESSAGES/django.po
@@ -466,15 +466,11 @@ msgstr "Veterano de EE. UU."
 msgid ""
 "This option is for people who have served in the active military, naval, or "
 "air service, and who were discharged or released therefrom under conditions "
-"other than dishonorable. You will need to <a href=\"https://www.va.gov/"
-"resources/verifying-your-identity-on-vagov/\" target=\"_blank\" rel="
-"\"noopener noreferrer\">verify your identity through VA.gov</a>."
+"other than dishonorable. You will need to verify your identity with"
 msgstr ""
 "Esta opción es para personas que hayan prestado servicio militar, naval o "
 "aéreo de manera activa, y quienes fueron dados de baja o liberados en "
-"condiciones que no hayan sido deshonrosas. Necesitará <a href='https://www."
-"va.gov/resources/verifying-your-identity-on-vagov/' target=\"_blank\" rel="
-"\"noopener noreferrer\">verificar su identidad a través de VA.gov</a>."
+"condiciones que no hayan sido deshonrosas. Deberá verificar su identidad con"
 
 #, python-format
 msgid ""
diff --git a/benefits/static/css/styles.css b/benefits/static/css/styles.css
index 71e6461d7..a889df384 100644
--- a/benefits/static/css/styles.css
+++ b/benefits/static/css/styles.css
@@ -375,6 +375,8 @@ footer .footer-links li a.footer-link:visited {
 
 .btn.btn-lg.btn-primary:focus,
 .btn.btn-lg.btn-primary:focus-visible,
+.btn.btn-lg:focus,
+.btn.btn-lg:focus-visible,
 .btn-outline-dark:focus,
 .btn-outline-dark:focus-visible,
 .btn-outline-light:focus,
@@ -422,12 +424,12 @@ footer .footer-links li a.footer-link:visited {
   }
 }
 
-#login {
+.login {
   cursor: pointer;
   line-height: 1;
   text-transform: none;
   letter-spacing: 0;
-  font-size: var(--login-gov-button-font-size);
+  font-size: var(--login-gov-button-font-size) !important;
   font-family: "Public Sans", Roboto, system-ui;
   max-width: var(--login-gov-button-max-width);
   text-decoration: none;
@@ -436,7 +438,7 @@ footer .footer-links li a.footer-link:visited {
 /* Sets the text `Login.gov` as transparent */
 /* With an Login.gov logo image over it */
 /* So screenreaders can read out `Login.gov` */
-#login .fallback-text {
+.login .fallback-text {
   background-size: contain;
   background-repeat: no-repeat;
   display: block;
@@ -450,7 +452,7 @@ footer .footer-links li a.footer-link:visited {
 }
 
 @media (min-width: 992px) {
-  #login .fallback-text {
+  .login .fallback-text {
     margin: 0 0 0 5px;
     display: inline-block;
     vertical-align: baseline;
@@ -459,11 +461,11 @@ footer .footer-links li a.footer-link:visited {
 
 /* Sign in with Login.gov (white logo) on Eligibility Start */
 
-.eligibility-start #login {
+.eligibility-start .btn.btn-lg.btn-primary.login {
   padding: 10px 0;
 }
 
-#login .fallback-text.white-logo {
+.login .fallback-text.white-logo {
   background-image: url("/static/img/login-gov-logo-rev.svg");
   width: 130.9887px;
   height: 17px;
@@ -471,13 +473,13 @@ footer .footer-links li a.footer-link:visited {
 
 /* Login.gov modal button (color logo) on Eligibility Index */
 
-#login .fallback-text.color-logo {
+.login .fallback-text.color-logo {
   background-image: url("/static/img/login-gov-logo.svg");
   width: 120px;
   height: 16px;
 }
 
-.eligibility-index #login .fallback-text {
+.eligibility-index .login .fallback-text {
   display: inline-block;
 }
 

From 46f40cae1ce1601e0f00a2c86702e606a0e95555 Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Wed, 6 Sep 2023 00:10:27 +0000
Subject: [PATCH 17/43] fix(login): use .login, not #login for Elig Start, Sign
 Out

---
 .../core/templates/core/includes/button--sign-out--senior.html  | 2 +-
 benefits/eligibility/templates/eligibility/start--senior.html   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/benefits/core/templates/core/includes/button--sign-out--senior.html b/benefits/core/templates/core/includes/button--sign-out--senior.html
index 93d7e8afa..e3bb56340 100644
--- a/benefits/core/templates/core/includes/button--sign-out--senior.html
+++ b/benefits/core/templates/core/includes/button--sign-out--senior.html
@@ -2,7 +2,7 @@
 
 {% if authentication.logged_in %}
   {% url "oauth:logout" as sign_out_url %}
-  <a id="login" href="{{ sign_out_url }}" class="p-0 btn btn-lg" role="button">
+  <a href="{{ sign_out_url }}" class="login p-0 btn btn-lg" role="button">
     <span class="fallback-text color-logo">Login.gov</span>
   </a>
 {% endif %}
diff --git a/benefits/eligibility/templates/eligibility/start--senior.html b/benefits/eligibility/templates/eligibility/start--senior.html
index db762a2a2..485ec8905 100644
--- a/benefits/eligibility/templates/eligibility/start--senior.html
+++ b/benefits/eligibility/templates/eligibility/start--senior.html
@@ -20,7 +20,7 @@ <h1>{% translate "You selected an Older Adult transit benefit." %}</h1>
     <div class="col-lg-4 offset-2 offset-lg-0 col-sm-8 col-8 d-flex justify-content-lg-end justify-content-center">
       {% url "oauth:login" as button_url %}
       {% translate "Get started with" as button_text %}
-      <a href="{{ button_url }}" class="btn btn-lg btn-primary" id="login">
+      <a href="{{ button_url }}" class="btn btn-lg btn-primary login">
         {{ button_text }} <span class="fallback-text white-logo">Login.gov</span>
       </a>
     </div>

From fc6a4326702b8a29b6410ce7c40ee5df84b89afd Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Wed, 6 Sep 2023 00:25:25 +0000
Subject: [PATCH 18/43] fix(elig-index): actually don't create 2nd modal

---
 .../templates/eligibility/includes/selection-label--veteran.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html
index a4bdc7014..121f5bf85 100644
--- a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html
+++ b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html
@@ -12,5 +12,4 @@
 
   {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov" login=True period=True %}
 
-  {% include "eligibility/includes/modal--senior-help.html" with id="modal--login-gov-veterans" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
 {% endblock description %}

From 32f125f06db2a655289070782f1abb899332bb1d Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Wed, 6 Sep 2023 00:28:42 +0000
Subject: [PATCH 19/43] fix(modal-trigger): prevent duplicate ID issue

---
 benefits/core/templates/core/includes/modal-trigger.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benefits/core/templates/core/includes/modal-trigger.html b/benefits/core/templates/core/includes/modal-trigger.html
index 44cbc7c5c..352edf0c7 100644
--- a/benefits/core/templates/core/includes/modal-trigger.html
+++ b/benefits/core/templates/core/includes/modal-trigger.html
@@ -1,4 +1,4 @@
 <!-- Inline link to trigger modal -->
 {# djlint:off #}
-<a href="#{{ modal }}" class="{{ classes }}" id="{{ id }}" data-bs-toggle="modal" data-bs-target="#{{ modal }}">{{ text }}{% if login %}<span class="fallback-text color-logo">Login.gov</span>{% endif %}</a>{% if period %}.{% endif %}
+<a href="#{{ modal }}" class="{{ classes }}" id="{{ triggerId }}" data-bs-toggle="modal" data-bs-target="#{{ modal }}">{{ text }}{% if login %}<span class="fallback-text color-logo">Login.gov</span>{% endif %}</a>{% if period %}.{% endif %}
 {# djlint:on #}

From 2413e16c65901e74fa011eb34580bbcf5a2e07fc Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Wed, 6 Sep 2023 21:31:51 +0000
Subject: [PATCH 20/43] feat(modal-trigger): remove ID field, unused

---
 benefits/core/templates/core/includes/modal-trigger.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benefits/core/templates/core/includes/modal-trigger.html b/benefits/core/templates/core/includes/modal-trigger.html
index 352edf0c7..cfee83a23 100644
--- a/benefits/core/templates/core/includes/modal-trigger.html
+++ b/benefits/core/templates/core/includes/modal-trigger.html
@@ -1,4 +1,4 @@
 <!-- Inline link to trigger modal -->
 {# djlint:off #}
-<a href="#{{ modal }}" class="{{ classes }}" id="{{ triggerId }}" data-bs-toggle="modal" data-bs-target="#{{ modal }}">{{ text }}{% if login %}<span class="fallback-text color-logo">Login.gov</span>{% endif %}</a>{% if period %}.{% endif %}
+<a href="#{{ modal }}" class="{{ classes }}" data-bs-toggle="modal" data-bs-target="#{{ modal }}">{{ text }}{% if login %}<span class="fallback-text color-logo">Login.gov</span>{% endif %}</a>{% if period %}.{% endif %}
 {# djlint:on #}

From 8d2c3e1541a69d835eaf5c4426eae17f65da1212 Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Wed, 6 Sep 2023 21:37:48 +0000
Subject: [PATCH 21/43] feat(modal): rename from Senior to Login.gov modal

---
 .../{modal--senior-help.html => modal--login-gov-help.html}     | 0
 .../templates/eligibility/includes/selection-label--senior.html | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename benefits/eligibility/templates/eligibility/includes/{modal--senior-help.html => modal--login-gov-help.html} (100%)

diff --git a/benefits/eligibility/templates/eligibility/includes/modal--senior-help.html b/benefits/eligibility/templates/eligibility/includes/modal--login-gov-help.html
similarity index 100%
rename from benefits/eligibility/templates/eligibility/includes/modal--senior-help.html
rename to benefits/eligibility/templates/eligibility/includes/modal--login-gov-help.html
diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html b/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html
index f33ba8874..8ee91480c 100644
--- a/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html
+++ b/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html
@@ -10,5 +10,5 @@
 
     {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov" login=True period=True %}
 
-    {% include "eligibility/includes/modal--senior-help.html" with id="modal--login-gov" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
+    {% include "eligibility/includes/modal--login-gov-help.html" with id="modal--login-gov" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
 {% endblock description %}

From 93e2e1c115f9e643fe08bd864c290ec60c49f3ee Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Wed, 6 Sep 2023 21:49:06 +0000
Subject: [PATCH 22/43] chore: indent by spaces 2

---
 .../eligibility/includes/selection-label--senior.html     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html b/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html
index 8ee91480c..d6d1bf28e 100644
--- a/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html
+++ b/benefits/eligibility/templates/eligibility/includes/selection-label--senior.html
@@ -2,13 +2,13 @@
 {% load i18n %}
 
 {% block label %}
-    {% translate "Older Adult" %}
+  {% translate "Older Adult" %}
 {% endblock label %}
 
 {% block description %}
-    {% translate "You must be 65 years or older. You will need to verify your identity with" %}
+  {% translate "You must be 65 years or older. You will need to verify your identity with" %}
 
-    {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov" login=True period=True %}
+  {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov" login=True period=True %}
 
-    {% include "eligibility/includes/modal--login-gov-help.html" with id="modal--login-gov" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
+  {% include "eligibility/includes/modal--login-gov-help.html" with id="modal--login-gov" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
 {% endblock description %}

From 2766a297a6f010c7a0b07607032fe0410f6e80e6 Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Wed, 6 Sep 2023 22:25:32 +0000
Subject: [PATCH 23/43] fix(elig-start): use Login class, not ID

---
 benefits/eligibility/templates/eligibility/start--veteran.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benefits/eligibility/templates/eligibility/start--veteran.html b/benefits/eligibility/templates/eligibility/start--veteran.html
index 328f9bfa8..0ad69d6b4 100644
--- a/benefits/eligibility/templates/eligibility/start--veteran.html
+++ b/benefits/eligibility/templates/eligibility/start--veteran.html
@@ -20,7 +20,7 @@ <h1>{% translate "You selected a Veteran transit benefit." %}</h1>
     <div class="col-lg-4 offset-2 offset-lg-0 col-sm-8 col-8 d-flex justify-content-lg-end justify-content-center">
       {% url "oauth:login" as button_url %}
       {% translate "Get started with" as button_text %}
-      <a href="{{ button_url }}" class="btn btn-lg btn-primary" id="login">
+      <a href="{{ button_url }}" class="btn btn-lg btn-primary login">
         {{ button_text }} <span class="fallback-text white-logo">Login.gov</span>
       </a>
     </div>

From 6ae341593a0fd2d302374718963d97b391a0f5e0 Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Wed, 6 Sep 2023 23:23:02 +0000
Subject: [PATCH 24/43] fix(copy): Seguro Social, not seguro social

---
 benefits/locale/en/LC_MESSAGES/django.po | 2 +-
 benefits/locale/es/LC_MESSAGES/django.po | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po
index 959a33431..309ede834 100644
--- a/benefits/locale/en/LC_MESSAGES/django.po
+++ b/benefits/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2023-09-06 21:22+0000\n"
+"POT-Creation-Date: 2023-09-06 23:20+0000\n"
 "Language: English\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po
index e354a9cb3..1618e3ed7 100644
--- a/benefits/locale/es/LC_MESSAGES/django.po
+++ b/benefits/locale/es/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2023-09-06 21:22+0000\n"
+"POT-Creation-Date: 2023-09-06 23:20+0000\n"
 "Language: Español\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -417,7 +417,7 @@ msgid "Your state-issued ID card"
 msgstr "Su tarjeta de identificación emitida por el estado"
 
 msgid "Your Social Security number"
-msgstr "Su número de seguro social"
+msgstr "Su número de Seguro Social"
 
 msgid "A phone number with a phone plan associated with your name"
 msgstr ""

From ff4ee183ace750a19cbdab363386748be66758b1 Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Thu, 7 Sep 2023 20:01:07 +0000
Subject: [PATCH 25/43] fix(veteran-selector): add --veteran modal

---
 .../eligibility/includes/selection-label--veteran.html        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html
index 121f5bf85..7905e8485 100644
--- a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html
+++ b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html
@@ -10,6 +10,8 @@
     This option is for people who have served in the active military, naval, or air service, and who were discharged or released therefrom under conditions other than dishonorable. You will need to verify your identity with
   {% endblocktranslate %}
 
-  {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov" login=True period=True %}
+  {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov-veterans" login=True period=True %}
+
+  {% include "eligibility/includes/modal--login-gov-help.html" with id="modal--login-gov-veterans" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
 
 {% endblock description %}

From a282b4ef9d179a57bff5db94abb68621e756f864 Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Thu, 7 Sep 2023 20:34:51 +0000
Subject: [PATCH 26/43] fix(copy): socio de pagos, not pago

---
 benefits/locale/en/LC_MESSAGES/django.po | 2 +-
 benefits/locale/es/LC_MESSAGES/django.po | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po
index 309ede834..14770b017 100644
--- a/benefits/locale/en/LC_MESSAGES/django.po
+++ b/benefits/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2023-09-06 23:20+0000\n"
+"POT-Creation-Date: 2023-09-07 20:33+0000\n"
 "Language: English\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po
index 1618e3ed7..b216349cf 100644
--- a/benefits/locale/es/LC_MESSAGES/django.po
+++ b/benefits/locale/es/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2023-09-06 23:20+0000\n"
+"POT-Creation-Date: 2023-09-07 20:33+0000\n"
 "Language: Español\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -552,7 +552,7 @@ msgstr ""
 "tránsito"
 
 msgid "You will be directed to our payment partner, "
-msgstr "Será dirigido a nuestro socio de pago, "
+msgstr "Será dirigido a nuestro socio de pagos, "
 
 msgid "We don’t store your information, and you won’t be charged."
 msgstr "No almacenamos su información y no se le cobrará."

From f17ea78438c67f1ce3e086222db91b599b656427 Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Thu, 7 Sep 2023 20:39:37 +0000
Subject: [PATCH 27/43] fix(copy): update spanish tense for Login.gov modal

---
 benefits/locale/en/LC_MESSAGES/django.po |  2 +-
 benefits/locale/es/LC_MESSAGES/django.po | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po
index 309ede834..4b6f3d223 100644
--- a/benefits/locale/en/LC_MESSAGES/django.po
+++ b/benefits/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2023-09-06 23:20+0000\n"
+"POT-Creation-Date: 2023-09-07 20:37+0000\n"
 "Language: English\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po
index 1618e3ed7..278893a78 100644
--- a/benefits/locale/es/LC_MESSAGES/django.po
+++ b/benefits/locale/es/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2023-09-06 23:20+0000\n"
+"POT-Creation-Date: 2023-09-07 20:37+0000\n"
 "Language: Español\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -173,7 +173,7 @@ msgid ""
 "which can be either a driver’s license or non-driver’s license state-issued "
 "ID card."
 msgstr ""
-"Necesitarás una identificación emitida por el estado para verificar tu "
+"Necesitará una identificación emitida por el estado para verificar su "
 "identidad con Login.gov, la cual puede ser una licencia para conducir o una "
 "tarjeta de identificación emitida por el estado que no sea una licencia de "
 "conducir."
@@ -183,8 +183,8 @@ msgid ""
 "address, phone number and other personal information which is then verified "
 "against authoritative sources."
 msgstr ""
-"Deberás cargar una fotografía de su identificación emitida por el estado y "
-"compartir tu dirección, número de teléfono y otra información personal, la "
+"Deberá cargar una fotografía de su identificación emitida por el estado y "
+"compartir su dirección, número de teléfono y otra información personal, la "
 "cual será verificada con fuentes autorizadas."
 
 msgid ""
@@ -192,16 +192,16 @@ msgid ""
 "phone. If Login.gov can’t verify your phone number, you can verify by mail "
 "instead."
 msgstr ""
-"Login.gov también necesitará verificar tu identidad llamando o enviando un "
-"mensaje de texto a tu teléfono. Si Login.gov no puede verificar tu número de "
-"teléfono, puedes verificarlo por correo."
+"Login.gov también necesitará verificar su identidad llamando o enviando un "
+"mensaje de texto a su teléfono. Si Login.gov no puede verificar su número de "
+"teléfono, usted puede verificarlo por correo."
 
 msgid ""
 "Please visit the Login.gov help center for <a href=\"https://login.gov/help/"
 "\" target=\"_blank\" rel=\"noopener noreferrer\">more information on "
 "identity verification</a>."
 msgstr ""
-"Visita el centro de ayuda de Login.gov para <a href='https://login.gov/"
+"Visite el centro de ayuda de Login.gov para <a href='https://login.gov/"
 "help/' target=\"_blank\" rel=\"noopener noreferrer\">más información sobre "
 "la verificación de identidad</a>."
 
@@ -437,7 +437,7 @@ msgid ""
 "We use Login.gov to verify your identity to make sure you are eligible for "
 "the transit benefit you selected."
 msgstr ""
-"Utilizamos Login.gov para verificar tu identidad para asegurarnos de que "
+"Utilizamos Login.gov para verificar su identidad para asegurarnos de que "
 "seas elegible para el beneficio de tránsito que seleccionaste."
 
 msgid "Learn more about"

From 57553fd19fa0bb7a6925dbc82e7d4d8f7bed444e Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Mon, 11 Sep 2023 17:02:03 +0000
Subject: [PATCH 28/43] fix(naming): remove S

---
 .../eligibility/includes/selection-label--veteran.html        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html
index 7905e8485..14fcbd700 100644
--- a/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html
+++ b/benefits/eligibility/templates/eligibility/includes/selection-label--veteran.html
@@ -10,8 +10,8 @@
     This option is for people who have served in the active military, naval, or air service, and who were discharged or released therefrom under conditions other than dishonorable. You will need to verify your identity with
   {% endblocktranslate %}
 
-  {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov-veterans" login=True period=True %}
+  {% include "core/includes/modal-trigger.html" with classes="border-0 bg-transparent p-0 login" modal="modal--login-gov-veteran" login=True period=True %}
 
-  {% include "eligibility/includes/modal--login-gov-help.html" with id="modal--login-gov-veterans" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
+  {% include "eligibility/includes/modal--login-gov-help.html" with id="modal--login-gov-veteran" size="modal-lg" header="p-md-2 p-3" body="pb-md-3 mb-md-3 mx-md-3 py-0 pt-0 absolute-top" %}
 
 {% endblock description %}

From 989096b6f8bb86545f1ae3e06b9060e98ecddfed Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Mon, 11 Sep 2023 17:16:52 +0000
Subject: [PATCH 29/43] fix(copy): su not tu

---
 benefits/locale/es/LC_MESSAGES/django.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po
index 278893a78..de7a5d27c 100644
--- a/benefits/locale/es/LC_MESSAGES/django.po
+++ b/benefits/locale/es/LC_MESSAGES/django.po
@@ -573,7 +573,7 @@ msgid "Please wait..."
 msgstr "Espere por favor..."
 
 msgid "Connect your Card"
-msgstr "Conecta tu tarjeta"
+msgstr "Conecta su tarjeta"
 
 msgid "Unable to register card"
 msgstr "No se pudo registrar la tarjeta"

From e85122f067042c48d96a57c787d5d7968d796b3b Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Mon, 11 Sep 2023 17:26:50 +0000
Subject: [PATCH 30/43] chore: run makemessages

---
 benefits/locale/en/LC_MESSAGES/django.po | 2 +-
 benefits/locale/es/LC_MESSAGES/django.po | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/benefits/locale/en/LC_MESSAGES/django.po b/benefits/locale/en/LC_MESSAGES/django.po
index 4b6f3d223..9c3534d9c 100644
--- a/benefits/locale/en/LC_MESSAGES/django.po
+++ b/benefits/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2023-09-07 20:37+0000\n"
+"POT-Creation-Date: 2023-09-11 17:23+0000\n"
 "Language: English\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/benefits/locale/es/LC_MESSAGES/django.po b/benefits/locale/es/LC_MESSAGES/django.po
index de7a5d27c..b614d5080 100644
--- a/benefits/locale/es/LC_MESSAGES/django.po
+++ b/benefits/locale/es/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: https://github.com/cal-itp/benefits/issues \n"
-"POT-Creation-Date: 2023-09-07 20:37+0000\n"
+"POT-Creation-Date: 2023-09-11 17:23+0000\n"
 "Language: Español\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

From 711b3a8fd3e06db3e0715c949e669dac196204b2 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 11 Sep 2023 22:33:30 +0000
Subject: [PATCH 31/43] chore(pre-commit): autoupdate hooks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/psf/black: 23.7.0 → 23.9.1](https://github.com/psf/black/compare/23.7.0...23.9.1)
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8397c743a..e73768a6b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -34,7 +34,7 @@ repos:
         args: ["--maxkb=1500"]
 
   - repo: https://github.com/psf/black
-    rev: 23.7.0
+    rev: 23.9.1
     hooks:
       - id: black
         types:

From 58091f2201c14aa570dfda8fcbc856b51ea148df Mon Sep 17 00:00:00 2001
From: Machiko Yasuda <machiko@compiler.la>
Date: Thu, 7 Sep 2023 21:02:08 +0000
Subject: [PATCH 32/43] feat(veterans): add Sign Out link for
 Veterans/Login.gov flow

---
 benefits/core/migrations/0002_data.py                       | 6 ++++--
 ...gn-out--senior.html => button--sign-out--login-gov.html} | 0
 ...sign-out--senior.html => link--sign-out--login-gov.html} | 0
 3 files changed, 4 insertions(+), 2 deletions(-)
 rename benefits/core/templates/core/includes/{button--sign-out--senior.html => button--sign-out--login-gov.html} (100%)
 rename benefits/core/templates/core/includes/{link--sign-out--senior.html => link--sign-out--login-gov.html} (100%)

diff --git a/benefits/core/migrations/0002_data.py b/benefits/core/migrations/0002_data.py
index af8a8b4e8..e95b5c781 100644
--- a/benefits/core/migrations/0002_data.py
+++ b/benefits/core/migrations/0002_data.py
@@ -144,8 +144,8 @@ def load_data(app, *args, **kwargs):
     AuthProvider = app.get_model("core", "AuthProvider")
 
     senior_auth_provider = AuthProvider.objects.create(
-        sign_out_button_template="core/includes/button--sign-out--senior.html",
-        sign_out_link_template="core/includes/link--sign-out--senior.html",
+        sign_out_button_template="core/includes/button--sign-out--login-gov.html",
+        sign_out_link_template="core/includes/link--sign-out--login-gov.html",
         client_name=os.environ.get("SENIOR_AUTH_PROVIDER_CLIENT_NAME", "senior-benefits-oauth-client-name"),
         client_id=os.environ.get("AUTH_PROVIDER_CLIENT_ID", "benefits-oauth-client-id"),
         authority=os.environ.get("AUTH_PROVIDER_AUTHORITY", "https://example.com"),
@@ -155,6 +155,8 @@ def load_data(app, *args, **kwargs):
     )
 
     veteran_auth_provider = AuthProvider.objects.create(
+        sign_out_button_template="core/includes/button--sign-out--login-gov.html",
+        sign_out_link_template="core/includes/link--sign-out--login-gov.html",
         client_name=os.environ.get("VETERAN_AUTH_PROVIDER_CLIENT_NAME", "veteran-benefits-oauth-client-name"),
         client_id=os.environ.get("AUTH_PROVIDER_CLIENT_ID", "benefits-oauth-client-id"),
         authority=os.environ.get("AUTH_PROVIDER_AUTHORITY", "https://example.com"),
diff --git a/benefits/core/templates/core/includes/button--sign-out--senior.html b/benefits/core/templates/core/includes/button--sign-out--login-gov.html
similarity index 100%
rename from benefits/core/templates/core/includes/button--sign-out--senior.html
rename to benefits/core/templates/core/includes/button--sign-out--login-gov.html
diff --git a/benefits/core/templates/core/includes/link--sign-out--senior.html b/benefits/core/templates/core/includes/link--sign-out--login-gov.html
similarity index 100%
rename from benefits/core/templates/core/includes/link--sign-out--senior.html
rename to benefits/core/templates/core/includes/link--sign-out--login-gov.html

From cbbf55386f777880a470d7bc6e6387de451b738a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 21:04:02 +0000
Subject: [PATCH 33/43] chore(deps): bump docker/build-push-action from 4 to 5

Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 4 to 5.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v4...v5)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b8cbb5128..b754d5da0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -37,7 +37,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Build, tag, and push image to GitHub Container Registry
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           builder: ${{ steps.buildx.outputs.name }}
           build-args: GIT-SHA=${{ github.sha }}

From ccb60274bd95ecd139646e426683867352462faa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 21:04:05 +0000
Subject: [PATCH 34/43] chore(deps): bump docker/login-action from 2 to 3

Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b8cbb5128..31f9d2dfc 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -26,7 +26,7 @@ jobs:
         run: echo "${{ github.sha }}" >> benefits/static/sha.txt
 
       - name: Docker Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

From c465fc3962fe63f65d1e5483b4508d445417ac89 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 21:04:09 +0000
Subject: [PATCH 35/43] chore(deps): bump docker/setup-buildx-action from 2 to
 3

Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b8cbb5128..9acf8c19c 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -34,7 +34,7 @@ jobs:
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Build, tag, and push image to GitHub Container Registry
         uses: docker/build-push-action@v4

From 0f08308336edbea8f2aeac57e3cfae0ad16b17dc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Sep 2023 21:19:01 +0000
Subject: [PATCH 36/43] chore(deps-dev): bump cypress from 13.1.0 to 13.2.0 in
 /tests/cypress

Bumps [cypress](https://github.com/cypress-io/cypress) from 13.1.0 to 13.2.0.
- [Release notes](https://github.com/cypress-io/cypress/releases)
- [Changelog](https://github.com/cypress-io/cypress/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cypress-io/cypress/compare/v13.1.0...v13.2.0)

---
updated-dependencies:
- dependency-name: cypress
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tests/cypress/package-lock.json | 30 +++++++++++++++---------------
 tests/cypress/package.json      |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/tests/cypress/package-lock.json b/tests/cypress/package-lock.json
index 32ebffd4a..4038eb226 100644
--- a/tests/cypress/package-lock.json
+++ b/tests/cypress/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "AGPL-3.0-or-later",
       "devDependencies": {
-        "cypress": "^13.1.0"
+        "cypress": "^13.2.0"
       }
     },
     "node_modules/@colors/colors": {
@@ -71,9 +71,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "16.18.39",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.39.tgz",
-      "integrity": "sha512-8q9ZexmdYYyc5/cfujaXb4YOucpQxAV4RMG0himLyDUOEr8Mr79VrqsFI+cQ2M2h89YIuy95lbxuYjxT4Hk4kQ==",
+      "version": "18.17.15",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.15.tgz",
+      "integrity": "sha512-2yrWpBk32tvV/JAd3HNHWuZn/VDN1P+72hWirHnvsvTGSqbANi+kSeuQR9yAHnbvaBvHDsoTdXV0Fe+iRtHLKA==",
       "dev": true
     },
     "node_modules/@types/sinonjs__fake-timers": {
@@ -536,15 +536,15 @@
       }
     },
     "node_modules/cypress": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz",
-      "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==",
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz",
+      "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
         "@cypress/request": "^3.0.0",
         "@cypress/xvfb": "^1.2.4",
-        "@types/node": "^16.18.39",
+        "@types/node": "^18.17.5",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
         "arch": "^2.2.0",
@@ -2018,9 +2018,9 @@
       }
     },
     "@types/node": {
-      "version": "16.18.39",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.39.tgz",
-      "integrity": "sha512-8q9ZexmdYYyc5/cfujaXb4YOucpQxAV4RMG0himLyDUOEr8Mr79VrqsFI+cQ2M2h89YIuy95lbxuYjxT4Hk4kQ==",
+      "version": "18.17.15",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.15.tgz",
+      "integrity": "sha512-2yrWpBk32tvV/JAd3HNHWuZn/VDN1P+72hWirHnvsvTGSqbANi+kSeuQR9yAHnbvaBvHDsoTdXV0Fe+iRtHLKA==",
       "dev": true
     },
     "@types/sinonjs__fake-timers": {
@@ -2357,14 +2357,14 @@
       }
     },
     "cypress": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz",
-      "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==",
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz",
+      "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==",
       "dev": true,
       "requires": {
         "@cypress/request": "^3.0.0",
         "@cypress/xvfb": "^1.2.4",
-        "@types/node": "^16.18.39",
+        "@types/node": "^18.17.5",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
         "arch": "^2.2.0",
diff --git a/tests/cypress/package.json b/tests/cypress/package.json
index be183eb9a..590196d48 100644
--- a/tests/cypress/package.json
+++ b/tests/cypress/package.json
@@ -12,6 +12,6 @@
   "license": "AGPL-3.0-or-later",
   "private": true,
   "devDependencies": {
-    "cypress": "^13.1.0"
+    "cypress": "^13.2.0"
   }
 }

From 945db930b1c50b6b63014076147d5bb3d698118a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Sep 2023 21:15:41 +0000
Subject: [PATCH 37/43] chore(deps-dev): bump sentry-sdk from 1.30.0 to 1.31.0

Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.30.0 to 1.31.0.
- [Release notes](https://github.com/getsentry/sentry-python/releases)
- [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-python/compare/1.30.0...1.31.0)

---
updated-dependencies:
- dependency-name: sentry-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 6a113b41f..be4ad0fad 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ dependencies = [
     "django-csp==3.7",
     "eligibility-api==2023.6.1",
     "requests==2.31.0",
-    "sentry-sdk==1.30.0",
+    "sentry-sdk==1.31.0",
     "six==1.16.0",
 ]
 dynamic = ["version"]

From 110202f3b1840ef02a0a636c3bdfc3ef029697e0 Mon Sep 17 00:00:00 2001
From: Kegan Maher <kegan@compiler.la>
Date: Wed, 13 Sep 2023 17:30:32 -0700
Subject: [PATCH 38/43] chore: bump version ahead of release

---
 benefits/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benefits/__init__.py b/benefits/__init__.py
index 024e2c4d0..5654471c6 100644
--- a/benefits/__init__.py
+++ b/benefits/__init__.py
@@ -1,3 +1,3 @@
-__version__ = "2023.04.2"
+__version__ = "2023.09.1"
 
 VERSION = __version__

From 3ac3307477e962b68bb8e13d2bceeef7f8541d0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Sep 2023 21:42:17 +0000
Subject: [PATCH 39/43] chore(deps-dev): bump eligibility-api from 2023.6.1 to
 2023.9.1

Bumps [eligibility-api](https://github.com/cal-itp/eligibility-api) from 2023.6.1 to 2023.9.1.
- [Release notes](https://github.com/cal-itp/eligibility-api/releases)
- [Commits](https://github.com/cal-itp/eligibility-api/compare/2023.06.01...2023.09.1)

---
updated-dependencies:
- dependency-name: eligibility-api
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index be4ad0fad..43a2f9984 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,7 +9,7 @@ dependencies = [
     "Authlib==1.2.1",
     "Django==4.2.5",
     "django-csp==3.7",
-    "eligibility-api==2023.6.1",
+    "eligibility-api==2023.9.1",
     "requests==2.31.0",
     "sentry-sdk==1.31.0",
     "six==1.16.0",

From 13419d41abc728156d1509f9b04598f146d3589c Mon Sep 17 00:00:00 2001
From: Kegan Maher <kegan@compiler.la>
Date: Mon, 18 Sep 2023 20:03:57 +0000
Subject: [PATCH 40/43] chore(version): manage string in pyproject

app code reads dynamically from installed package version
---
 benefits/__init__.py         | 9 ++++++++-
 pyproject.toml               | 4 ++--
 tests/pytest/test_version.py | 9 +++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 tests/pytest/test_version.py

diff --git a/benefits/__init__.py b/benefits/__init__.py
index 5654471c6..cf19a7403 100644
--- a/benefits/__init__.py
+++ b/benefits/__init__.py
@@ -1,3 +1,10 @@
-__version__ = "2023.09.1"
+from importlib.metadata import version, PackageNotFoundError
+
+try:
+    __version__ = version("benefits")
+except PackageNotFoundError:
+    # package is not installed
+    pass
+
 
 VERSION = __version__
diff --git a/pyproject.toml b/pyproject.toml
index 43a2f9984..c9b147f92 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=64", "wheel"]
+requires = ["setuptools>=65", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -14,7 +14,7 @@ dependencies = [
     "sentry-sdk==1.31.0",
     "six==1.16.0",
 ]
-dynamic = ["version"]
+version = "2023.09.1"
 keywords = ["django"]
 license = { file = "LICENSE" }
 name = "benefits"
diff --git a/tests/pytest/test_version.py b/tests/pytest/test_version.py
new file mode 100644
index 000000000..21e7e96fc
--- /dev/null
+++ b/tests/pytest/test_version.py
@@ -0,0 +1,9 @@
+import re
+
+
+def test_version():
+    from benefits import __version__, VERSION
+
+    assert __version__ is not None
+    assert __version__ == VERSION
+    assert re.match(r"\d{4}\.\d{1,2}\.\d+", __version__)

From 5464c845101e213062fc09af42a5f6fecddb986a Mon Sep 17 00:00:00 2001
From: Kegan Maher <kegan@compiler.la>
Date: Mon, 18 Sep 2023 20:48:56 +0000
Subject: [PATCH 41/43] chore: normalize pyproject structure

---
 pyproject.toml | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index c9b147f92..e745ed105 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,10 +1,11 @@
-[build-system]
-requires = ["setuptools>=65", "wheel"]
-build-backend = "setuptools.build_meta"
-
 [project]
-classifiers = ["Programming Language :: Python :: 3 :: Only"]
+name = "benefits"
+version = "2023.09.1"
 description = "Cal-ITP Benefits is an application that enables automated eligibility verification and enrollment for transit benefits onto customers’ existing contactless bank (credit/debit) cards."
+readme = "README.md"
+license = { file = "LICENSE" }
+classifiers = ["Programming Language :: Python :: 3 :: Only"]
+requires-python = ">=3.9"
 dependencies = [
     "Authlib==1.2.1",
     "Django==4.2.5",
@@ -14,12 +15,6 @@ dependencies = [
     "sentry-sdk==1.31.0",
     "six==1.16.0",
 ]
-version = "2023.09.1"
-keywords = ["django"]
-license = { file = "LICENSE" }
-name = "benefits"
-readme = "README.md"
-requires-python = ">=3.9"
 
 [project.optional-dependencies]
 dev = [
@@ -41,13 +36,20 @@ Code = "https://github.com/cal-itp/benefits"
 Documentation = "https://docs.calitp.org/benefits"
 Issues = "https://github.com/cal-itp/benefits/issues"
 
-# Configuration for black
+[build-system]
+requires = ["setuptools>=65", "wheel"]
+build-backend = "setuptools.build_meta"
+
 [tool.black]
 line-length = 127
 target-version = ['py310']
 include = '\.pyi?$'
 
-# Configuration for djlint
+[tool.coverage.run]
+omit = [
+    "benefits/core/migrations/*"
+]
+
 [tool.djlint]
 ignore = "H017,H031"
 indent = 2
@@ -57,11 +59,8 @@ profile = "django"
 preserve_blank_lines = true
 use_gitignore = true
 
-# Configuration for pytest
-[tool.coverage.run]
-omit = [
-    "benefits/core/migrations/*"
-]
+[tool.pyright]
+include = ["benefits", "tests/pytest"]
 
 [tool.pytest.ini_options]
 DJANGO_SETTINGS_MODULE = "benefits.settings"

From 0fdb8dac0754e8a478bbb0945e336aa73fea63bf Mon Sep 17 00:00:00 2001
From: Angela Tran <angela@compiler.la>
Date: Tue, 19 Sep 2023 21:20:23 +0000
Subject: [PATCH 42/43] chore: update Python version for GitHub workflows

---
 .github/workflows/.python-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/.python-version b/.github/workflows/.python-version
index c8cfe3959..2c0733315 100644
--- a/.github/workflows/.python-version
+++ b/.github/workflows/.python-version
@@ -1 +1 @@
-3.10
+3.11

From eeea7383f616cd4627ed7238348886294f993a63 Mon Sep 17 00:00:00 2001
From: Angela Tran <angela@compiler.la>
Date: Tue, 19 Sep 2023 21:30:16 +0000
Subject: [PATCH 43/43] chore: update Black target version to 3.11

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index e745ed105..780a8a3c4 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -42,7 +42,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.black]
 line-length = 127
-target-version = ['py310']
+target-version = ['py311']
 include = '\.pyi?$'
 
 [tool.coverage.run]