From e7168f2884d4f471d2ff1b4c2ab7ae53c9cdc684 Mon Sep 17 00:00:00 2001
From: Biyeun Buczyk <biyeun@dimagi.com>
Date: Mon, 4 Nov 2024 20:59:36 +0100
Subject: [PATCH 001/159] since there can be multiple alerts, also reference
 the index within those alerts

---
 .../templates/case_importer/partials/ko_import_status.html  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html b/corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
index 2aa7572acf89..753af340edb1 100644
--- a/corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
+++ b/corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
@@ -60,14 +60,14 @@
                 class="btn btn-outline-primary btn-sm"
                 data-bs-toggle="collapse"
                 data-bind="attr: {
-                  'data-bs-target': '#rowDetailsCollapse-' + $parentContext.$index(),
-                  'aria-controls': 'rowDetailsCollapse-' + $parentContext.$index()
+                  'data-bs-target': '#rowDetailsCollapse-' + $parentContext.$index() + '-' + $index(),
+                  'aria-controls': 'rowDetailsCollapse-' + $parentContext.$index() + '-' + $index()
                 }"
                 aria-expanded="false">
           {% trans "Toggle Affected Row(s)" %}
         </button>
         <div class="collapse"
-             data-bind="attr: { id: 'rowDetailsCollapse-' + $parentContext.$index() }">
+             data-bind="attr: { id: 'rowDetailsCollapse-' + $parentContext.$index() + '-' + $index() }">
           <div class="card card-body mt-3"
                data-bind="text: rows.join(', ')"></div>
         </div>

From 9e6d941e08972ff1e8e52cfb0895e053b6749ec4 Mon Sep 17 00:00:00 2001
From: Biyeun Buczyk <biyeun@dimagi.com>
Date: Mon, 4 Nov 2024 21:01:13 +0100
Subject: [PATCH 002/159] improve html formatting for readability, move away
 from unstyled list and have separate alerts

---
 .../partials/ko_import_status.html            | 94 +++++++++----------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html b/corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
index 753af340edb1..ff428c2be8d5 100644
--- a/corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
+++ b/corehq/apps/case_importer/templates/case_importer/partials/ko_import_status.html
@@ -27,56 +27,56 @@
   <!--/ko-->
 </div>
 <!--ko if: !$root._.isEmpty(result.errors)-->
-<div class="alert alert-warning">
-  <ul class="list-unstyled">
-    <!--ko foreach: result.errors-->
-    <!--ko if: rows-->
-    <li>
-      <!--ko if: column-->
-      <p><strong>
-        <!-- ko if: rows.length == 1-->
-        {% blocktrans %}
-          <span data-bind="text: rows.length"></span> row had an invalid
-          "<span data-bind="text: column"></span>" cell and was not saved
-        {% endblocktrans %}
+  <!--ko foreach: result.errors-->
+    <div class="alert alert-warning">
+      <!--ko if: rows-->
+        <!--ko if: column-->
+          <h6>
+            <!-- ko if: rows.length == 1-->
+            {% blocktrans %}
+              <span data-bind="text: rows.length"></span> row had an invalid
+              "<span data-bind="text: column"></span>" cell and was not saved
+            {% endblocktrans %}
+            <!--/ko-->
+            <!-- ko if: rows.length > 1-->
+            {% blocktrans %}
+              <span data-bind="text: rows.length"></span> rows had invalid
+              "<span data-bind="text: column"></span>" cells and were not saved
+            {% endblocktrans %}
+            <!--/ko-->
+          </h6>
         <!--/ko-->
-        <!-- ko if: rows.length > 1-->
-        {% blocktrans %}
-          <span data-bind="text: rows.length"></span> rows had invalid
-          "<span data-bind="text: column"></span>" cells and were not saved
-        {% endblocktrans %}
+        <!--ko if: !column -->
+          <h6 data-bind="text: title"></h6>
         <!--/ko-->
-      </strong></p>
-      <!--/ko-->
-      <!--ko if: !column -->
-      <p><strong data-bind="text: title"></strong></p>
-      <!--/ko-->
-      <p data-bind="text: description">
-      </p>
-      <p data-bind="visible: sample, text: sample">
-      </p>
-      <div data-bind="visible: rows.length">
-        <button type="button"
-                class="btn btn-outline-primary btn-sm"
-                data-bs-toggle="collapse"
-                data-bind="attr: {
-                  'data-bs-target': '#rowDetailsCollapse-' + $parentContext.$index() + '-' + $index(),
-                  'aria-controls': 'rowDetailsCollapse-' + $parentContext.$index() + '-' + $index()
-                }"
-                aria-expanded="false">
-          {% trans "Toggle Affected Row(s)" %}
-        </button>
-        <div class="collapse"
-             data-bind="attr: { id: 'rowDetailsCollapse-' + $parentContext.$index() + '-' + $index() }">
-          <div class="card card-body mt-3"
-               data-bind="text: rows.join(', ')"></div>
+        <p data-bind="text: description"></p>
+        <p data-bind="visible: sample, text: sample"></p>
+        <div data-bind="visible: rows.length">
+          <button
+              type="button"
+              class="btn btn-outline-primary btn-sm"
+              data-bs-toggle="collapse"
+              data-bind="attr: {
+                'data-bs-target': '#rowDetailsCollapse-' + $parentContext.$index() + '-' + $index(),
+                'aria-controls': 'rowDetailsCollapse-' + $parentContext.$index() + '-' + $index()
+              }"
+              aria-expanded="false"
+          >
+            {% trans "Toggle Affected Row(s)" %}
+          </button>
+          <div
+              class="collapse"
+              data-bind="attr: { id: 'rowDetailsCollapse-' + $parentContext.$index() + '-' + $index() }"
+          >
+            <div
+                class="card card-body mt-3"
+                data-bind="text: rows.join(', ')"
+            ></div>
+          </div>
         </div>
-      </div>
-    </li>
-    <!--/ko-->
-    <!--/ko-->
-  </ul>
-</div>
+      <!--/ko-->
+    </div>
+  <!--/ko-->
 <!--/ko-->
 <!--/ko-->
 <!--ko if: state == $root.states.SUCCESS && !result-->

From 8391a2d064a215d1b46567b72067334b2fc222b0 Mon Sep 17 00:00:00 2001
From: Ethan Soergel <esoergel@gmail.com>
Date: Fri, 8 Nov 2024 13:38:19 -0500
Subject: [PATCH 003/159] Whitelist domains using post endpoint as API

We'd like to phase out this code path - doing this will at least let us
prevent new projects from using it accidentally (once we start enforcing
the whitelist in a future commit)
---
 .../apps/receiverwrapper/tests/test_auth.py   | 60 ++++++++++++++++++-
 corehq/apps/receiverwrapper/views.py          |  4 ++
 corehq/toggles/__init__.py                    |  7 ++-
 3 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/receiverwrapper/tests/test_auth.py b/corehq/apps/receiverwrapper/tests/test_auth.py
index 0e02aed674c2..25634f5f3ed0 100644
--- a/corehq/apps/receiverwrapper/tests/test_auth.py
+++ b/corehq/apps/receiverwrapper/tests/test_auth.py
@@ -2,21 +2,26 @@
 import uuid
 from datetime import datetime, timedelta
 from unittest import mock
+from urllib.parse import urlencode
 
 from django.http import HttpResponse
 from django.test import Client, TestCase
 from django.urls import reverse
 
+import django_digest.test
 from oauth2_provider.models import get_access_token_model
-from urllib.parse import urlencode
 
 from couchforms import openrosa_response
 
-import django_digest.test
+from corehq import toggles
 from corehq.apps.app_manager.models import Application
 from corehq.apps.domain.shortcuts import create_domain
 from corehq.apps.receiverwrapper.util import DEMO_SUBMIT_MODE
-from corehq.apps.receiverwrapper.views import post_api, secure_post
+from corehq.apps.receiverwrapper.views import (
+    _verify_access,
+    post_api,
+    secure_post,
+)
 from corehq.apps.users.models import (
     CommCareUser,
     HqPermissions,
@@ -422,3 +427,52 @@ def test_edit_data_required(self):
     def test_access_api_required(self):
         self._create_user(edit_data=True, access_api=False)
         self.assert_api_response(403)
+
+
+@mock.patch('corehq.apps.receiverwrapper.views.is_from_formplayer')
+@mock.patch('corehq.toggles.set_toggle')
+@mock.patch('corehq.apps.receiverwrapper.views.cache.get', mock.MagicMock(return_value=None))
+@mock.patch('corehq.apps.receiverwrapper.views.cache.set', mock.MagicMock)
+class TestHasMobileAccess(TestCase):
+    domain = "test-has-mobile-access"
+
+    @classmethod
+    def setUpClass(cls):
+        cls.domain_obj = create_domain(cls.domain)
+        cls.user_without_permission = cls._create_user(access_mobile_endpoints=False)
+        cls.user_with_permission = cls._create_user(access_mobile_endpoints=True)
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.domain_obj.delete()
+
+    @classmethod
+    def _create_user(cls, access_mobile_endpoints=False):
+        role = UserRole.create(
+            cls.domain, 'api-user', permissions=HqPermissions(access_mobile_endpoints=access_mobile_endpoints)
+        )
+        return WebUser.create(cls.domain, str(uuid.uuid4()), 'p@$$w0rd',
+                              None, None, role_id=role.get_id)
+
+    def _verify_access(self, user):
+        _verify_access(self.domain, user.user_id, mock.MagicMock(couch_user=user))
+
+    def test_formplayer_request_without_permission(self, set_toggle, is_from_formplayer):
+        is_from_formplayer.return_value = True
+        self._verify_access(self.user_without_permission)
+        set_toggle.assert_not_called()
+
+    def test_regular_request_without_permission(self, set_toggle, is_from_formplayer):
+        is_from_formplayer.return_value = False
+        self._verify_access(self.user_without_permission)
+        set_toggle.assert_called_with('open_submission_endpoint', self.domain, True, toggles.NAMESPACE_DOMAIN)
+
+    def test_formplayer_request_with_permission(self, set_toggle, is_from_formplayer):
+        is_from_formplayer.return_value = True
+        self._verify_access(self.user_with_permission)
+        set_toggle.assert_not_called()
+
+    def test_regular_request_with_permission(self, set_toggle, is_from_formplayer):
+        is_from_formplayer.return_value = False
+        self._verify_access(self.user_with_permission)
+        set_toggle.assert_not_called()
diff --git a/corehq/apps/receiverwrapper/views.py b/corehq/apps/receiverwrapper/views.py
index df58cd1f8b9e..3e9f41e5a940 100644
--- a/corehq/apps/receiverwrapper/views.py
+++ b/corehq/apps/receiverwrapper/views.py
@@ -79,6 +79,10 @@ def _verify_access(domain, user_id, request):
             cache.set(cache_key, True, CACHE_EXPIRY_7_DAYS_IN_SECS)
             message = f"NoMobileEndpointsAccess: invalid request by {user_id} on {domain}"
             notify_exception(request, message=message)
+            if not toggles.OPEN_SUBMISSION_ENDPOINT.enabled(domain):
+                # Once we're confident this has enabled the flag for all active
+                # usage, we can make domains without the toggle fail hard
+                toggles.OPEN_SUBMISSION_ENDPOINT.set(domain, enabled=True, namespace=toggles.NAMESPACE_DOMAIN)
 
 
 @profile_dump('commcare_receiverwapper_process_form.prof', probability=PROFILE_PROBABILITY, limit=PROFILE_LIMIT)
diff --git a/corehq/toggles/__init__.py b/corehq/toggles/__init__.py
index 1234662bda34..f4cd8b9fab0b 100644
--- a/corehq/toggles/__init__.py
+++ b/corehq/toggles/__init__.py
@@ -1705,7 +1705,6 @@ def _commtrackify(domain_name, toggle_is_enabled):
     [NAMESPACE_DOMAIN]
 )
 
-
 DISABLE_MOBILE_ENDPOINTS = StaticToggle(
     'disable_mobile_endpoints',
     'Disable mobile endpoints for form submissions and restores',
@@ -1719,6 +1718,12 @@ def _commtrackify(domain_name, toggle_is_enabled):
     )
 )
 
+OPEN_SUBMISSION_ENDPOINT = StaticToggle(
+    'open_submission_endpoint',
+    'Leave submission endpoint open to let old APIs keep working',
+    TAG_DEPRECATED,
+    [NAMESPACE_DOMAIN],
+)
 
 EMWF_WORKER_ACTIVITY_REPORT = StaticToggle(
     'emwf_worker_activity_report',

From 91d95ffe6e63d54bb24bb8581a533625e27ab7a0 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:27:49 +0000
Subject: [PATCH 004/159] "Bootstrap 5 Migration - marking domain as in
 progress"

---
 .../apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
index 5684aa10e77a..b652ac9d9c66 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
+++ b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
@@ -143,5 +143,8 @@
   },
   "locations": {
     "is_complete": true
+  },
+  "domain": {
+    "in_progress": true
   }
 }

From 36895919190d43aa6739362ba569cab1b23a086e Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:28:01 +0000
Subject: [PATCH 005/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/sms_rates.html, splitting templates"

---
 .../admin/{ => bootstrap3}/sms_rates.html     |  0
 .../domain/admin/bootstrap5/sms_rates.html    | 44 +++++++++++++++++++
 corehq/apps/domain/views/sms.py               |  2 +-
 3 files changed, 45 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/sms_rates.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/sms_rates.html

diff --git a/corehq/apps/domain/templates/domain/admin/sms_rates.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/sms_rates.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/sms_rates.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/sms_rates.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/sms_rates.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/sms_rates.html
new file mode 100644
index 000000000000..df9504a25988
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/sms_rates.html
@@ -0,0 +1,44 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load hq_shared_tags %}
+{% load crispy_forms_tags %}
+{% load i18n %}
+
+{% requirejs_main_b5 'smsbillables/js/smsbillables.rate_calc' %}
+
+{% block page_content %}
+  <div class="card">  {# todo B5: css-well #}
+    <p class="lead">
+      {% blocktrans %}
+        Use this form to get a cost estimation per 160 character SMS,
+        given a <strong>connection</strong>, <strong>direction</strong>,
+        and <strong>country code</strong>.
+      {% endblocktrans %}
+    </p>
+    <p>
+      {% blocktrans %}
+        The fee will be applied to the most specific criteria available.
+        A fee for a specific country code (if available) will be used
+        over the default of 'Any Country'.
+      {% endblocktrans %}
+    </p>
+    <p>
+      {% blocktrans %}
+        Fees are subject to change based on updates to each carrier and are
+        computed at the time the SMS is sent.
+      {% endblocktrans %}
+    </p>
+  </div>
+  <hr />
+  <div class="ko-sms-rate-calculator">
+    {% crispy rate_calc_form %}  {# todo B5: crispy #}
+    <div class="alert alert-success" data-bind="visible: calculatingRate">
+      {% blocktrans %}
+        Calculating SMS Rate...
+      {% endblocktrans %}
+    </div>
+    <div class="alert alert-info"
+         data-bind="text: rate,
+                        css: { 'alert-danger': hasError, 'alert-info': noError },
+                        visible: showRateInfo"></div>
+  </div>
+{% endblock %}
diff --git a/corehq/apps/domain/views/sms.py b/corehq/apps/domain/views/sms.py
index 7385eb14fd03..23482d8878ac 100644
--- a/corehq/apps/domain/views/sms.py
+++ b/corehq/apps/domain/views/sms.py
@@ -43,7 +43,7 @@ def post(self, request, *args, **kwargs):
 class SMSRatesView(BaseAdminProjectSettingsView, AsyncHandlerMixin):
     urlname = 'domain_sms_rates_view'
     page_title = gettext_lazy("SMS Rate Calculator")
-    template_name = 'domain/admin/sms_rates.html'
+    template_name = 'domain/admin/bootstrap3/sms_rates.html'
     async_handlers = [
         SMSRatesAsyncHandler,
         SMSRatesSelect2AsyncHandler,

From eb06d152601db9de80939b83839a4b0d76b38107 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:28:20 +0000
Subject: [PATCH 006/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/project_privacy.html, splitting templates"

---
 .../domain/admin/{ => bootstrap3}/project_privacy.html      | 0
 .../templates/domain/admin/bootstrap5/project_privacy.html  | 6 ++++++
 corehq/apps/domain/views/settings.py                        | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/project_privacy.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/project_privacy.html

diff --git a/corehq/apps/domain/templates/domain/admin/project_privacy.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/project_privacy.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/project_privacy.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/project_privacy.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/project_privacy.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/project_privacy.html
new file mode 100644
index 000000000000..34b1d901c2dd
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/project_privacy.html
@@ -0,0 +1,6 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load crispy_forms_tags %}
+
+{% block page_content %}
+  {% crispy privacy_form %}  {# todo B5: crispy #}
+{% endblock %}
diff --git a/corehq/apps/domain/views/settings.py b/corehq/apps/domain/views/settings.py
index 69567466f535..eba3b3a64190 100644
--- a/corehq/apps/domain/views/settings.py
+++ b/corehq/apps/domain/views/settings.py
@@ -279,7 +279,7 @@ def logo(request, domain):
 
 
 class EditPrivacySecurityView(BaseAdminProjectSettingsView):
-    template_name = "domain/admin/project_privacy.html"
+    template_name = "domain/admin/bootstrap3/project_privacy.html"
     urlname = "privacy_info"
     page_title = gettext_lazy("Privacy and Security")
 

From eef156f22614315138df9b100785ddfd8bb463f0 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:29:00 +0000
Subject: [PATCH 007/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/confirm_billing_info.html, splitting templates"

---
 .../confirm_billing_info.html                 |  0
 .../bootstrap5/confirm_billing_info.html      | 32 +++++++++++++++++++
 corehq/apps/domain/views/accounting.py        |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/confirm_billing_info.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/confirm_billing_info.html

diff --git a/corehq/apps/domain/templates/domain/confirm_billing_info.html b/corehq/apps/domain/templates/domain/bootstrap3/confirm_billing_info.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/confirm_billing_info.html
rename to corehq/apps/domain/templates/domain/bootstrap3/confirm_billing_info.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/confirm_billing_info.html b/corehq/apps/domain/templates/domain/bootstrap5/confirm_billing_info.html
new file mode 100644
index 000000000000..753e2dce0786
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/confirm_billing_info.html
@@ -0,0 +1,32 @@
+{% extends "domain/base_change_plan.html" %}
+{% load crispy_forms_tags %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{% requirejs_main_b5 'domain/js/confirm_billing_info' %}
+
+{% block form_content %}
+  {% initial_page_data "plan" plan %}
+  {% initial_page_data "cards" cards %}
+  {% initial_page_data "stripe_public_key" stripe_public_key %}
+  {% initial_page_data "downgrade_email_note" downgrade_email_note %}
+  {% registerurl "cards_view" domain %}
+  <p class="lead text-center">
+    {% blocktrans with plan.name as p%}
+      You are about to subscribe to the <strong>{{ p }} Software Plan</strong>.<br/>
+      Please update your billing information below before continuing.
+    {% endblocktrans %}
+  </p>
+
+  <div class="card card-modern-gray card-form-only" id="billing-info">  {# todo B5: css-panel #}
+    <div class="card-body">
+      {% crispy billing_account_info_form %}  {# todo B5: crispy #}
+    </div>
+  </div>
+
+  <div class="card card-modern-gray card-form-only" id="card-manager">  {# todo B5: css-panel #}
+    <div class="card-body">
+      {% include 'domain/stripe_cards.html' %}
+    </div>
+  </div>
+{% endblock %}
diff --git a/corehq/apps/domain/views/accounting.py b/corehq/apps/domain/views/accounting.py
index 55fc866a5f44..72b44ffc2212 100644
--- a/corehq/apps/domain/views/accounting.py
+++ b/corehq/apps/domain/views/accounting.py
@@ -1327,7 +1327,7 @@ def post(self, request, *args, **kwargs):
 
 
 class ConfirmBillingAccountInfoView(ConfirmSelectedPlanView, AsyncHandlerMixin):
-    template_name = 'domain/confirm_billing_info.html'
+    template_name = 'domain/bootstrap3/confirm_billing_info.html'
     urlname = 'confirm_billing_account_info'
     step_title = gettext_lazy("Confirm Billing Information")
     is_new = False

From 0d0787287c469f7a6dd3ecf3bc40d9765199bfd1 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:29:18 +0000
Subject: [PATCH 008/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/renew_plan.html, splitting templates"

---
 .../domain/{ => bootstrap3}/renew_plan.html   |  0
 .../domain/bootstrap5/renew_plan.html         | 49 +++++++++++++++++++
 corehq/apps/domain/views/accounting.py        |  2 +-
 3 files changed, 50 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/renew_plan.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/renew_plan.html

diff --git a/corehq/apps/domain/templates/domain/renew_plan.html b/corehq/apps/domain/templates/domain/bootstrap3/renew_plan.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/renew_plan.html
rename to corehq/apps/domain/templates/domain/bootstrap3/renew_plan.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/renew_plan.html b/corehq/apps/domain/templates/domain/bootstrap5/renew_plan.html
new file mode 100644
index 000000000000..6912137c82dd
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/renew_plan.html
@@ -0,0 +1,49 @@
+{% extends "domain/base_change_plan.html" %}
+{% load hq_shared_tags %}
+{% load i18n %}
+{% load compress %}
+{% load menu_tags %}
+
+{% requirejs_main_b5 'accounting/js/renew_plan_selection' %}
+
+{% block plan_breadcrumbs %}{% endblock %}
+
+{% block form_content %}
+  {% initial_page_data 'renewal_choices' renewal_choices %}
+  {% initial_page_data 'is_annual_plan' is_annual_plan %}
+  {% initial_page_data 'is_self_renewable_plan' is_self_renewable_plan %}
+
+  <p class="lead text-center">
+    {% blocktrans with plan.name as p %}
+      You are renewing your <strong>{{ p }}</strong> subscription.
+    {% endblocktrans %}
+  </p>
+
+  <form class="form"
+        method="post"
+        action="{% url 'domain_subscription_renewal_confirmation' domain %}">
+    {% csrf_token %}
+
+    {% if is_self_renewable_plan %}
+      {% include 'accounting/partials/renew_plan_selection.html' %}
+    {% else %}
+      {% include 'accounting/partials/confirm_plan_summary.html' %}
+    {% endif %}
+
+    <input type="hidden" name="from_plan_page" value="true" />
+    <input type="hidden" name="plan_edition" value="{{ current_edition }}">
+
+    <div class="text-center plan-next">
+      {% if downgrade_messages %}
+        <a class="btn btn-outline-primary btn-lg"
+          href="{% url 'custom_plan_request_quote' domain %}">
+          {% trans 'Talk to Sales' %}
+        </a>
+      {% endif %}
+      <button type="submit"
+              class="btn btn-primary btn-lg">
+        {% trans 'Next' %}
+      </button>
+    </div>
+  </form>
+{% endblock %}
diff --git a/corehq/apps/domain/views/accounting.py b/corehq/apps/domain/views/accounting.py
index 72b44ffc2212..b35a39c6359d 100644
--- a/corehq/apps/domain/views/accounting.py
+++ b/corehq/apps/domain/views/accounting.py
@@ -1526,7 +1526,7 @@ class SubscriptionRenewalView(PlanViewBase, SubscriptionMixin):
     urlname = "domain_subscription_renewal"
     page_title = gettext_lazy("Renew Plan")
     step_title = gettext_lazy("Renew Plan")
-    template_name = "domain/renew_plan.html"
+    template_name = "domain/bootstrap3/renew_plan.html"
 
     @property
     def current_edition(self):

From a3cd78f66d15bb328e4edc79650ea28ddaa9aa7f Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:30:08 +0000
Subject: [PATCH 009/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/recovery_measures_history.html, splitting templates"

---
 .../recovery_measures_history.html            |  0
 .../bootstrap5/recovery_measures_history.html | 63 +++++++++++++++++++
 corehq/apps/domain/views/settings.py          |  2 +-
 3 files changed, 64 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/recovery_measures_history.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/recovery_measures_history.html

diff --git a/corehq/apps/domain/templates/domain/admin/recovery_measures_history.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/recovery_measures_history.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/recovery_measures_history.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/recovery_measures_history.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/recovery_measures_history.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/recovery_measures_history.html
new file mode 100644
index 000000000000..9f77a7fc19c1
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/recovery_measures_history.html
@@ -0,0 +1,63 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load i18n %}
+{% load hq_shared_tags %}
+
+{% block page_content %}
+  <div class="row">
+    <div class="col-md-10">
+
+      {% for app_name, measures in measures_by_app %}
+        <table class="table table-striped">
+          <caption>{{ app_name }}</caption>
+
+          <thead>
+          <th>{% trans "Measure" %}</th>
+          <th>{% trans "Sequence Number" %}</th>
+          <th>{% trans "App Versions" %}</th>
+          <th>{% trans "CC Versions" %}</th>
+          <th>{% trans "Created On" %}</th>
+          <th>{% trans "User" %}</th>
+          <th class="col-md-4">{% trans "Notes" %}</th>
+          </thead>
+
+          <tbody>
+
+          {% for measure in measures %}
+            <tr>
+              <td>{{ measure.get_measure_display }}</td>
+              <td>{{ measure.sequence_number }}</td>
+              <td>
+                {% if measure.app_all_versions %}
+                  {% trans "All" %}
+                {% else %}
+                  {{ measure.app_version_min }} - {{ measure.app_version_max }}
+                {% endif %}
+              </td>
+              <td>
+                {% if measure.cc_all_versions %}
+                  {% trans "All" %}
+                {% else %}
+                  {{ measure.cc_version_min }} - {{ measure.cc_version_max }}
+                {% endif %}
+              </td>
+              <td>{{ measure.created_on }}</td>
+              <td>{{ measure.username }}</td>
+              <td>{{ measure.notes }}</td>
+            </tr>
+          {% endfor %}
+
+          {% if not measures %}
+            <tr>
+              <td colspan="7">
+                {% trans "No measures have been initiated for this application" %}
+              </td>
+            </tr>
+          {% endif %}
+
+          </tbody>
+        </table>
+      {% endfor %}
+
+    </div>
+  </div>
+{% endblock %}
diff --git a/corehq/apps/domain/views/settings.py b/corehq/apps/domain/views/settings.py
index eba3b3a64190..4400187836ec 100644
--- a/corehq/apps/domain/views/settings.py
+++ b/corehq/apps/domain/views/settings.py
@@ -506,7 +506,7 @@ def post(self, request, *args, **kwargs):
 class RecoveryMeasuresHistory(BaseAdminProjectSettingsView):
     urlname = 'recovery_measures_history'
     page_title = gettext_lazy("Recovery Measures History")
-    template_name = 'domain/admin/recovery_measures_history.html'
+    template_name = 'domain/admin/bootstrap3/recovery_measures_history.html'
 
     @property
     def page_context(self):

From 62b09cdd8f9b06ba0b3ae5c311edfeb6b21dd05c Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:30:15 +0000
Subject: [PATCH 010/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/calendar_fixture.html, splitting templates"

---
 .../domain/admin/{ => bootstrap3}/calendar_fixture.html    | 0
 .../domain/admin/bootstrap5/calendar_fixture.html          | 7 +++++++
 2 files changed, 7 insertions(+)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/calendar_fixture.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/calendar_fixture.html

diff --git a/corehq/apps/domain/templates/domain/admin/calendar_fixture.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/calendar_fixture.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/calendar_fixture.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/calendar_fixture.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/calendar_fixture.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/calendar_fixture.html
new file mode 100644
index 000000000000..4a8c2cddf31f
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/calendar_fixture.html
@@ -0,0 +1,7 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load crispy_forms_tags %}
+{% load i18n %}
+{% block page_content %}
+  <h1>{% trans "Calendar Fixture Settings" %}</h1>
+  {% crispy form %}  {# todo B5: crispy #}
+{% endblock %}

From 290385f605facbf42ef0b0be6c30e390d49168c8 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:30:25 +0000
Subject: [PATCH 011/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/edit_alert.html, splitting templates"

---
 .../domain/admin/{ => bootstrap3}/edit_alert.html    |  0
 .../domain/admin/bootstrap5/edit_alert.html          | 12 ++++++++++++
 corehq/apps/domain/views/settings.py                 |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/edit_alert.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/edit_alert.html

diff --git a/corehq/apps/domain/templates/domain/admin/edit_alert.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/edit_alert.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/edit_alert.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/edit_alert.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/edit_alert.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/edit_alert.html
new file mode 100644
index 000000000000..2da40402ae10
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/edit_alert.html
@@ -0,0 +1,12 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load crispy_forms_tags %}
+{% load i18n %}
+
+{% block page_content %}
+  <form class="form form-horizontal" method="post">
+    <fieldset>
+      <legend>{% trans 'Edit Alert' %}</legend>
+      {% crispy form %}  {# todo B5: crispy #}
+    </fieldset>
+  </form>
+{% endblock %}
diff --git a/corehq/apps/domain/views/settings.py b/corehq/apps/domain/views/settings.py
index 4400187836ec..edd0398a315d 100644
--- a/corehq/apps/domain/views/settings.py
+++ b/corehq/apps/domain/views/settings.py
@@ -616,7 +616,7 @@ def _create_alert(self):
 
 
 class EditDomainAlertView(BaseDomainAlertsView):
-    template_name = 'domain/admin/edit_alert.html'
+    template_name = 'domain/admin/bootstrap3/edit_alert.html'
     urlname = 'domain_edit_alert'
     page_title = gettext_lazy("Edit Project Alert")
 

From 800bd0505e0dd0f33dbaf140b01e817c8ab025df Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:30:38 +0000
Subject: [PATCH 012/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/info_basic.html, splitting templates"

---
 .../domain/admin/{ => bootstrap3}/info_basic.html |  0
 .../domain/admin/bootstrap5/info_basic.html       | 15 +++++++++++++++
 corehq/apps/domain/views/settings.py              |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/info_basic.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/info_basic.html

diff --git a/corehq/apps/domain/templates/domain/admin/info_basic.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/info_basic.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/info_basic.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/info_basic.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/info_basic.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/info_basic.html
new file mode 100644
index 000000000000..fb9122791bb2
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/info_basic.html
@@ -0,0 +1,15 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load crispy_forms_tags %}
+{% load hq_shared_tags %}
+
+
+{% requirejs_main_b5 'domain/js/info_basic' %}
+
+{% block stylesheets %}{{ block.super }}
+   <link rel="stylesheet" href="{% static '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.css' %}" type="text/css" />
+{% endblock stylesheets %}
+
+{% block page_content %}
+    {% initial_page_data 'mapbox_access_token' mapbox_access_token %}
+  {% crispy basic_info_form %}  {# todo B5: crispy #}
+{% endblock %}
diff --git a/corehq/apps/domain/views/settings.py b/corehq/apps/domain/views/settings.py
index edd0398a315d..7f0565c18b76 100644
--- a/corehq/apps/domain/views/settings.py
+++ b/corehq/apps/domain/views/settings.py
@@ -129,7 +129,7 @@ def main_context(self):
 
 
 class EditBasicProjectInfoView(BaseEditProjectInfoView):
-    template_name = 'domain/admin/info_basic.html'
+    template_name = 'domain/admin/bootstrap3/info_basic.html'
     urlname = 'domain_basic_info'
     page_title = gettext_lazy("Basic")
 

From 50eef3e1bac927819f984c84a0b5a06500a15022 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:31:01 +0000
Subject: [PATCH 013/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/internal_calculations.html, splitting templates"

---
 .../internal_calculations.html                |  0
 .../bootstrap5/internal_calculations.html     | 28 +++++++++++++++++++
 corehq/apps/domain/views/internal.py          |  2 +-
 3 files changed, 29 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/internal_calculations.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/internal_calculations.html

diff --git a/corehq/apps/domain/templates/domain/internal_calculations.html b/corehq/apps/domain/templates/domain/bootstrap3/internal_calculations.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/internal_calculations.html
rename to corehq/apps/domain/templates/domain/bootstrap3/internal_calculations.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/internal_calculations.html b/corehq/apps/domain/templates/domain/bootstrap5/internal_calculations.html
new file mode 100644
index 000000000000..0e44a7fbdecf
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/internal_calculations.html
@@ -0,0 +1,28 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{% requirejs_main_b5 "domain/js/internal_calculations" %}
+
+{% block page_content %}
+  {% registerurl 'calculated_properties' domain %}
+  <div class="form form-horizontal">
+    <p><button type="button" id="load-all-btn" class="btn btn-primary">{% trans 'Load EVERYTHING' %}</button></p>
+    <hr />
+    {% for calc_tag in order %}
+      <div class="form-group calc-group">  {# todo B5: css-form-group #}
+        <label class="form-label col-md-2">{{ calcs|dict_lookup:calc_tag }}</label>
+        <div class="col-md-8">
+          <div id="calc-{{ calc_tag }}"
+               class="card well-small calc-display"></div>  {# todo B5: css-well #}
+        </div>
+        <div class="col-md-2">
+          <button class="btn btn-primary load-calc-btn" data-calc-tag="{{ calc_tag }}">
+            {% trans "Load Property" %}
+          </button>
+          <div class="calc-error"></div>
+        </div>
+      </div>
+    {% endfor %}
+  </div>
+{% endblock %}
diff --git a/corehq/apps/domain/views/internal.py b/corehq/apps/domain/views/internal.py
index b5d2720d1b67..1a50e7265898 100644
--- a/corehq/apps/domain/views/internal.py
+++ b/corehq/apps/domain/views/internal.py
@@ -222,7 +222,7 @@ def post(self, request, *args, **kwargs):
 class EditInternalCalculationsView(BaseInternalDomainSettingsView):
     urlname = 'domain_internal_calculations'
     page_title = gettext_lazy("Calculated Properties")
-    template_name = 'domain/internal_calculations.html'
+    template_name = 'domain/bootstrap3/internal_calculations.html'
 
     @method_decorator(always_allow_project_access)
     @method_decorator(login_and_domain_required)

From 5a11d4461fd3c7fbfa9006d503607bf397ca03f1 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:31:16 +0000
Subject: [PATCH 014/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/confirm_subscription_renewal.html, splitting templates"

---
 .../confirm_subscription_renewal.html         |  0
 .../confirm_subscription_renewal.html         | 36 +++++++++++++++++++
 corehq/apps/domain/views/accounting.py        |  2 +-
 3 files changed, 37 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/confirm_subscription_renewal.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/confirm_subscription_renewal.html

diff --git a/corehq/apps/domain/templates/domain/confirm_subscription_renewal.html b/corehq/apps/domain/templates/domain/bootstrap3/confirm_subscription_renewal.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/confirm_subscription_renewal.html
rename to corehq/apps/domain/templates/domain/bootstrap3/confirm_subscription_renewal.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/confirm_subscription_renewal.html b/corehq/apps/domain/templates/domain/bootstrap5/confirm_subscription_renewal.html
new file mode 100644
index 000000000000..9166ac561f98
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/confirm_subscription_renewal.html
@@ -0,0 +1,36 @@
+{% extends "domain/base_change_plan.html" %}
+{% load crispy_forms_tags %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{% requirejs_main_b5 'accounting/js/widgets' %}
+
+{% block plan_breadcrumbs %}{% endblock %}
+
+{% block form_content %}
+  <p class="lead text-center">
+    {% blocktrans with next_plan.name as p_name%}
+      You are renewing your plan to <strong>{{ p_name }}</strong>.
+    {% endblocktrans %}
+    {% if next_plan.name == plan.name %}
+      {% trans "— which matches your current feature usage." %}
+    {% endif %}
+    <br />
+    {% blocktrans with subscription.date_end as start_date %}
+      It will be renewed automatically on <strong>{{ start_date }}</strong>.
+    {% endblocktrans %}
+  </p>
+  {% if next_plan.name != plan.name %}
+    <div class="alert alert-warning alert-subscription">
+      {% blocktrans with next_plan.monthly_fee as monthly_fee and subscription.date_end as start_date %}
+        <h4>Note: You are renewing to a different plan</h4>
+        <p>The new plan will take effect on <strong>{{ start_date }}</strong> and will cost <strong>{{ monthly_fee }}</strong>/month.</p>
+      {% endblocktrans %}
+    </div>
+  {% endif %}
+  <div class="card card-modern-gray card-form-only" id="billing-info">  {# todo B5: css-panel #}
+    <div class="card-body">
+      {% crispy confirm_form %}  {# todo B5: crispy #}
+    </div>
+  </div>
+{% endblock %}
diff --git a/corehq/apps/domain/views/accounting.py b/corehq/apps/domain/views/accounting.py
index b35a39c6359d..41937d31aa00 100644
--- a/corehq/apps/domain/views/accounting.py
+++ b/corehq/apps/domain/views/accounting.py
@@ -1592,7 +1592,7 @@ def page_context(self):
 
 class ConfirmSubscriptionRenewalView(PlanViewBase, DomainAccountingSettings,
                                      AsyncHandlerMixin, SubscriptionMixin):
-    template_name = 'domain/confirm_subscription_renewal.html'
+    template_name = 'domain/bootstrap3/confirm_subscription_renewal.html'
     urlname = 'domain_subscription_renewal_confirmation'
     page_title = gettext_lazy("Confirm Billing Information")
     step_title = gettext_lazy("Confirm Billing Information")

From 6e3533b8c4f5bd8f6da7d21ab0b21bcc3aa8deb3 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:31:35 +0000
Subject: [PATCH 015/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/tombstone_management.html, splitting templates"

---
 .../tombstone_management.html                 |  0
 .../bootstrap5/tombstone_management.html      | 60 +++++++++++++++++++
 corehq/apps/domain/views/tombstone.py         |  2 +-
 3 files changed, 61 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/tombstone_management.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/tombstone_management.html

diff --git a/corehq/apps/domain/templates/domain/tombstone_management.html b/corehq/apps/domain/templates/domain/bootstrap3/tombstone_management.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/tombstone_management.html
rename to corehq/apps/domain/templates/domain/bootstrap3/tombstone_management.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/tombstone_management.html b/corehq/apps/domain/templates/domain/bootstrap5/tombstone_management.html
new file mode 100644
index 000000000000..1f07f6a42abd
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/tombstone_management.html
@@ -0,0 +1,60 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load crispy_forms_tags %}
+
+{% block page_content %}
+  <div class="row">
+    <div class="col-sm-12">
+      <h2>{{ current_page.title }}</h2>
+      <p class="help-block">
+          Please type comma-separated domain names of to check tombstones of.
+      </p>
+      {% crispy form %}  {# todo B5: crispy #}
+    </div>
+    <div class="col-sm-12">
+      <table class="table">
+        <tr><th>Name</th><th>Status</th><th></th></tr>
+        {% for name, projects in domains %}
+        <tr>
+          <td>{{ name }}</td><td>
+            {% if projects|length == 0 %}
+              Project does not exist
+            {% elif projects|length == 1 %}
+              {% with projects.0 as project %}
+                {% if project.doc_type == 'Domain-Deleted' %}
+                  Project Tombstone
+                {% else %}
+                  Normal Project
+                {% endif %}
+                (<a href="{% url "raw_doc" %}?id={{ project.get_id }}">raw doc</a>)
+              {% endwith %}
+            {% else %}
+              Multiple Projects with this name!
+              {% regroup projects by doc_type as doc_type_list %}
+              <ul>
+              {% for doc_type in doc_type_list %}
+                <li>
+                {% if doc_type.grouper == 'Domain-Deleted' %}
+                  Project Tombstones:
+                {% else %}
+                  Normal Projects:
+                {% endif %}
+                {{ doc_type.list|length }}
+                ({% for project in doc_type.list %}{% if not forloop.first %}, {% endif %}<a href="{% url "raw_doc" %}?id={{ project.get_id }}">raw doc</a>{% endfor %})
+                </li>
+              {% endfor %}
+              </ul>
+            {% endif %}
+          </td>
+          <td>
+            <form method="post" action="{% url "create_tombstone" %}">
+            {% csrf_token %}
+            <input type="hidden" name="domain" value="{{ name }}">
+            {% if not projects|length %}<button class="btn btn-outline-danger" type="submit">Create Tombstone</button>{% endif %}
+            </form>
+          </td>
+        </tr>
+        {% endfor %}
+      </table>
+    </div>
+  </div>
+{% endblock %}
diff --git a/corehq/apps/domain/views/tombstone.py b/corehq/apps/domain/views/tombstone.py
index bf82ee7d3119..e5ee1cc4f05a 100644
--- a/corehq/apps/domain/views/tombstone.py
+++ b/corehq/apps/domain/views/tombstone.py
@@ -22,7 +22,7 @@
 class TombstoneManagement(BaseAdminSectionView):
     urlname = 'tombstone_management'
     page_title = _("Prevent the use of specific domain names")
-    template_name = 'domain/tombstone_management.html'
+    template_name = 'domain/bootstrap3/tombstone_management.html'
 
     form = None
     domain_results = None

From ed81ed995ee0de2a2e6e7c0bccc76cca42fd8fcb Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:32:19 +0000
Subject: [PATCH 016/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/manage_releases_by_app_profile.html, splitting templates"

---
 .../manage_releases_by_app_profile.html       |  0
 .../manage_releases_by_app_profile.html       | 70 +++++++++++++++++++
 corehq/apps/domain/views/releases.py          |  2 +-
 3 files changed, 71 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/manage_releases_by_app_profile.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/manage_releases_by_app_profile.html

diff --git a/corehq/apps/domain/templates/domain/manage_releases_by_app_profile.html b/corehq/apps/domain/templates/domain/bootstrap3/manage_releases_by_app_profile.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/manage_releases_by_app_profile.html
rename to corehq/apps/domain/templates/domain/bootstrap3/manage_releases_by_app_profile.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/manage_releases_by_app_profile.html b/corehq/apps/domain/templates/domain/bootstrap5/manage_releases_by_app_profile.html
new file mode 100644
index 000000000000..01125ef05cdb
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/manage_releases_by_app_profile.html
@@ -0,0 +1,70 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load hq_shared_tags %}
+{% load crispy_forms_tags %}
+{% load i18n %}
+
+{% requirejs_main_b5 'app_manager/js/manage_releases_by_app_profile' %}
+
+{% block page_content %}
+  {% initial_page_data 'app_releases_by_app_profile' app_releases_by_app_profile %}
+  {% initial_page_data 'appVersionSelectInitialValue' selected_build_details %}
+  {% initial_page_data 'appBuildProfileInitialValues' initial_app_build_profile_details %}
+  {% initial_page_data 'appVersionOnlyShowReleased' True %}
+  {% initial_page_data 'buildProfilesPerApp' build_profiles_per_app %}
+  {% registerurl 'toggle_release_restriction_by_app_profile' domain '---'%}
+  {% registerurl "paginate_releases" domain '---' %}
+    <ul class="nav nav-tabs sticky-tabs">  {# todo B5: css-nav #}
+      <li><a data-bs-toggle="tab" href="#search-form" id="search-tab">{% trans "Search" %}</a></li>
+      <li><a data-bs-toggle="tab" href="#creation-form" id="create-tab">{% trans "Add" %}</a></li>
+    </ul>
+    <div class="spacer"></div>
+    <div class="tab-content">
+      <div id="search-form" class="tab-pane">
+        <form class="form form-horizontal" method="post" id="search-manage-app-releases">
+          {% crispy search_form %}  {# todo B5: crispy #}
+        </form>
+      </div>
+      <div id="creation-form" class="tab-pane">
+        <form class="form form-horizontal disable-on-submit" method="post" id="create-manage-app-releases">
+          {% crispy creation_form %}  {# todo B5: crispy #}
+        </form>
+      </div>
+    </div>
+
+    {% if app_releases_by_app_profile %}
+      <table id="managed-releases" class="table">
+        <thead>
+        <tr>
+          <th class="col-md-2">{% trans 'Application' %}</th>
+          <th class="col-md-2">{% trans 'Profile' %}</th>
+          <th class="col-md-2">{% trans 'Version' %}</th>
+          <th class="col-md-2">{% trans 'Status' %}</th>
+          <th class="col-md-2">{% trans 'Action' %}</th>
+        </tr>
+        </thead>
+        <tbody data-bind="foreach: appReleasesByAppProfile, visible: appReleasesByAppProfile">
+        <tr data-bind="attr: {id: domId}, css: {'bg-success': active }">
+          <td data-bind="text: appName"></td>
+          <td data-bind="text: profileName"></td>
+          <td data-bind="text: version"></td>
+          <td data-bind="text: status"></td>
+          <td>
+            <button type="button" class="btn btn-outline-primary"
+                    data-bind="click: toggleRestriction, css: buttonClass,
+                                      disable: ajaxInProgress">
+              <span data-bind="text: actionText"></span>
+              <i class="spinner fa-spin fa fa-refresh"
+                 data-bind="visible: ajaxInProgress"></i>
+            </button>
+            <br/>
+            <span class="error-message badge text-bg-danger" data-bind="visible: error">
+              {% trans 'Could not update!' %}
+              <span data-bind="text: errorMessage"></span>
+            </span>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    {% endif %}
+
+{% endblock %}
diff --git a/corehq/apps/domain/views/releases.py b/corehq/apps/domain/views/releases.py
index d3e211fc3bb9..1f7eed90af3b 100644
--- a/corehq/apps/domain/views/releases.py
+++ b/corehq/apps/domain/views/releases.py
@@ -96,7 +96,7 @@ def post(self, request, *args, **kwargs):
 @method_decorator([toggles.RELEASE_BUILDS_PER_PROFILE.required_decorator(),
                    require_can_edit_apps], name='dispatch')
 class ManageReleasesByAppProfile(BaseProjectSettingsView):
-    template_name = 'domain/manage_releases_by_app_profile.html'
+    template_name = 'domain/bootstrap3/manage_releases_by_app_profile.html'
     urlname = 'manage_releases_by_app_profile'
     page_title = gettext_lazy("Manage Releases By App Profile")
 

From 43bf5dab107b13851f826c11e84166a4fff77a3b Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:32:42 +0000
Subject: [PATCH 017/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/email/domain_invite.html, splitting templates"

---
 .../email/{ => bootstrap3}/domain_invite.html |  0
 .../email/bootstrap5/domain_invite.html       | 44 +++++++++++++++++++
 corehq/apps/users/models.py                   |  2 +-
 3 files changed, 45 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/email/{ => bootstrap3}/domain_invite.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/email/bootstrap5/domain_invite.html

diff --git a/corehq/apps/domain/templates/domain/email/domain_invite.html b/corehq/apps/domain/templates/domain/email/bootstrap3/domain_invite.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/email/domain_invite.html
rename to corehq/apps/domain/templates/domain/email/bootstrap3/domain_invite.html
diff --git a/corehq/apps/domain/templates/domain/email/bootstrap5/domain_invite.html b/corehq/apps/domain/templates/domain/email/bootstrap5/domain_invite.html
new file mode 100644
index 000000000000..fbb3907ff5bd
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/email/bootstrap5/domain_invite.html
@@ -0,0 +1,44 @@
+{% extends 'registration/email/confirm_account.html' %}
+{% load i18n %}
+
+{% block preview_text %}
+  {% blocktrans %}
+    {{ inviter }} has invited you to join the {{ domain }} project at CommCare HQ!
+  {% endblocktrans %}
+{% endblock %}
+
+{% block cta_headline %}
+  {% blocktrans %}
+    You're invited to join {{ domain }}!
+  {% endblocktrans %}
+{% endblock %}
+
+{% block cta_url %}{{ url }}{% endblock %}
+
+{% block cta_text %}
+  {% blocktrans %}
+    Accept Invitation
+  {% endblocktrans %}
+{% endblock %}
+
+{% block lead_text %}
+  {% blocktrans %}
+    {{ inviter }} has invited you to join the {{ domain }} project on CommCare HQ.
+    This invitation expires in {{ days }} day(s).
+  {% endblocktrans %}
+{% endblock %}
+
+{% block secondary_text %}
+  {% blocktrans %}
+    CommCare HQ is a data management tool used by over 500 organizations
+    to help frontline workers around the world.
+    <a href="https://dimagi.com/commcare/" style="color: #bcdeff;">Learn more about CommCare</a>.  {# todo B5: inline-style #}
+  {% endblocktrans %}
+{% endblock %}
+
+{% block reason_for_email %}
+  {% blocktrans %}
+    You received this message because we received an invitation request from
+    {{ inviter }} from the project "{{ domain }}"
+  {% endblocktrans %}
+{% endblock %}
diff --git a/corehq/apps/users/models.py b/corehq/apps/users/models.py
index 5312cf1fe9d6..6ff3d05de508 100644
--- a/corehq/apps/users/models.py
+++ b/corehq/apps/users/models.py
@@ -2794,7 +2794,7 @@ def send_activation_email(self, remaining_days=30):
         with override_language(lang):
             if domain_request is None:
                 text_content = render_to_string("domain/email/domain_invite.txt", params)
-                html_content = render_to_string("domain/email/domain_invite.html", params)
+                html_content = render_to_string("domain/email/bootstrap3/domain_invite.html", params)
                 subject = _('Invitation from %s to join CommCareHQ') % inviter.formatted_name
             else:
                 text_content = render_to_string("domain/email/domain_request_approval.txt", params)

From cc241037b4ae6814c5d755518600ea7d625e1319 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:32:50 +0000
Subject: [PATCH 018/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/commtrack_settings.html, splitting templates"

---
 corehq/apps/commtrack/views.py                         |  2 +-
 .../admin/{ => bootstrap3}/commtrack_settings.html     |  0
 .../domain/admin/bootstrap5/commtrack_settings.html    | 10 ++++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/commtrack_settings.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/commtrack_settings.html

diff --git a/corehq/apps/commtrack/views.py b/corehq/apps/commtrack/views.py
index 8cd69e26d214..b1652032b397 100644
--- a/corehq/apps/commtrack/views.py
+++ b/corehq/apps/commtrack/views.py
@@ -56,7 +56,7 @@ def dispatch(self, request, *args, **kwargs):
 class CommTrackSettingsView(BaseCommTrackManageView):
     urlname = 'commtrack_settings'
     page_title = gettext_noop("Advanced Settings")
-    template_name = 'domain/admin/commtrack_settings.html'
+    template_name = 'domain/admin/bootstrap3/commtrack_settings.html'
 
     @property
     @memoized
diff --git a/corehq/apps/domain/templates/domain/admin/commtrack_settings.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/commtrack_settings.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/commtrack_settings.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/commtrack_settings.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/commtrack_settings.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/commtrack_settings.html
new file mode 100644
index 000000000000..c72f5e48a7fe
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/commtrack_settings.html
@@ -0,0 +1,10 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load hq_shared_tags %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+{% requirejs_main_b5 "domain/js/commtrack_settings" %}
+
+{% block page_content %}
+  {% crispy form %}  {# todo B5: crispy #}
+{% endblock %}

From bf8b5b7bc3b13d37a47202f0c96a7c4baf0e5f05 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:33:34 +0000
Subject: [PATCH 019/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/partials/payment_modal.html, splitting templates"

---
 .../templates/domain/billing_statements.html  |   6 +-
 .../domain/current_subscription.html          |   2 +-
 .../{ => bootstrap3}/payment_modal.html       |   0
 .../partials/bootstrap5/payment_modal.html    | 117 ++++++++++++++++++
 4 files changed, 121 insertions(+), 4 deletions(-)
 rename corehq/apps/domain/templates/domain/partials/{ => bootstrap3}/payment_modal.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/partials/bootstrap5/payment_modal.html

diff --git a/corehq/apps/domain/templates/domain/billing_statements.html b/corehq/apps/domain/templates/domain/billing_statements.html
index d5b2cd1a0b66..72cd885d37d8 100644
--- a/corehq/apps/domain/templates/domain/billing_statements.html
+++ b/corehq/apps/domain/templates/domain/billing_statements.html
@@ -187,12 +187,12 @@ <h2>{% trans 'Billing Statements' %} <span data-bind="visible: showUnpaidBills">
 
 {% block modals %}{{ block.super }}
   {% with process_invoice_payment_url as process_payment_url %}
-    {% include 'domain/partials/payment_modal.html' with payment_modal_id="paymentModal" title_template="payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment_complete_template_simple" %}
+    {% include 'domain/partials/bootstrap3/payment_modal.html' with payment_modal_id="paymentModal" title_template="payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment_complete_template_simple" %}
   {% endwith %}
   {% with process_bulk_payment_url as process_payment_url %}
-    {% include 'domain/partials/payment_modal.html' with payment_modal_id="bulkPaymentModal" title_template="bulk-payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment_complete_template_simple" %}
+    {% include 'domain/partials/bootstrap3/payment_modal.html' with payment_modal_id="bulkPaymentModal" title_template="bulk-payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment_complete_template_simple" %}
   {% endwith %}
   {% with process_wire_invoice_url as process_payment_url %}
-    {% include 'domain/partials/payment_modal.html' with payment_modal_id="bulkWirePaymentModal" title_template="bulk-wire-payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment_complete_template_wire" %}
+    {% include 'domain/partials/bootstrap3/payment_modal.html' with payment_modal_id="bulkWirePaymentModal" title_template="bulk-wire-payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment_complete_template_wire" %}
   {% endwith %}
 {% endblock %}
diff --git a/corehq/apps/domain/templates/domain/current_subscription.html b/corehq/apps/domain/templates/domain/current_subscription.html
index 0224f98bda02..376e27690b65 100644
--- a/corehq/apps/domain/templates/domain/current_subscription.html
+++ b/corehq/apps/domain/templates/domain/current_subscription.html
@@ -391,5 +391,5 @@ <h4>
 {% endblock %}
 
 {% block modals %}{{ block.super }}
-  {% include 'domain/partials/payment_modal.html' with payment_modal_id="paymentModal" title_template="payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment-complete-template" %}
+  {% include 'domain/partials/bootstrap3/payment_modal.html' with payment_modal_id="paymentModal" title_template="payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment-complete-template" %}
 {% endblock %}
diff --git a/corehq/apps/domain/templates/domain/partials/payment_modal.html b/corehq/apps/domain/templates/domain/partials/bootstrap3/payment_modal.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/partials/payment_modal.html
rename to corehq/apps/domain/templates/domain/partials/bootstrap3/payment_modal.html
diff --git a/corehq/apps/domain/templates/domain/partials/bootstrap5/payment_modal.html b/corehq/apps/domain/templates/domain/partials/bootstrap5/payment_modal.html
new file mode 100644
index 000000000000..a7ddd9253764
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/partials/bootstrap5/payment_modal.html
@@ -0,0 +1,117 @@
+{% load i18n %}
+
+<div class="payment-modal modal fade" id="{{ payment_modal_id }}">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="btn-close" data-bs-dismiss="modal"  {# todo B5: css-close #}
+                aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+        <h4 class="modal-title" data-bind="template: {
+                    data: costItem,
+                    name: '{{ title_template }}',
+                    if: hasCostItem
+                }"></h4>
+      </div>
+      <form method="POST"
+            class="form-horizontal"
+            data-bind="attr: {
+                      id: formId,
+                      action: submitURL,
+                  }">
+        {% csrf_token %}
+        <div class="modal-body">
+          <div data-bind="template: {
+                        data: costItem,
+                        name: '{{ cost_item_template }}',
+                        if: hasCostItem
+                    }, visible: paymentIsNotComplete"></div>
+
+          <p class="alert alert-danger"
+             data-bind="visible: showServerErrorMsg">
+            <i class="fa-solid fa-triangle-exclamation"></i>
+            <span data-bind="text: serverErrorMsg"></span>
+          </p>
+
+          <!-- ko if: paymentMethod() === WIRE -->
+          <fieldset data-bind="visible: paymentIsNotComplete">
+            <legend>{% trans 'Wire Payment Information' %}</legend>
+            <p>
+              {% blocktrans %}
+                Dimagi accepts wire payments via ACH and wire transfer. You will receive an invoice via email with bank information and instructions for wire payment. Please include the Invoice # in the wire payment memo or note field.
+                <a href="https://confluence.dimagi.com/display/commcarepublic/How+to+Pay+by+Credit+Card+or+Wire+Payment" target="_blank">More information...</a>
+              {% endblocktrans %}
+            </p>
+            <div class="form-group">  {# todo B5: css-form-group #}
+              <label class="form-label col-md-3">
+                {% trans 'Invoice Recipients' %}
+              </label>
+              <div class="col-md-9">
+                <input type="text"
+                       data-bind="value: wireEmails"
+                       size="20"
+                       name="emails"
+                       class="form-control"
+                       placeholder="jane@gmail.com john@gmail.com" />
+              </div>
+            </div>
+          </fieldset>
+          <!-- /ko -->
+
+          <!-- ko if: paymentMethod() === CREDIT_CARD -->
+          <div data-bind="template: {
+                        data: newCard,
+                        name: 'select-new-stripe-card-template',
+                        if: mustCreateNewCard
+                    }"></div>
+
+          <div data-bind="template: {
+                        data: $data,
+                        name: 'select-stripe-card-template',
+                        if: canSelectCard
+                    }"></div>
+          <!-- /ko -->
+
+          <div class="alert alert-success" data-bind="visible: paymentIsComplete, template: {
+                        name: '{{ payment_complete_template }}',
+                    }"></div>
+        </div>
+        <div class="modal-footer">
+          <button type="button"
+                  data-bind="visible: paymentIsNotComplete"
+                  class="btn btn-outline-primary"
+                  data-bs-dismiss="modal">
+            {% trans "Cancel" %}
+          </button>
+          <!-- ko if: hasAgreedToPrivacy || isSavedCard -->
+          <button type="submit"
+                  data-bind="
+                                visible: paymentIsNotComplete,
+                                disable: isSubmitDisabled,
+                                click: processPayment,
+                                text: submitBtnText"
+                  class="btn btn-primary">
+          </button>
+          <!-- /ko -->
+          <!-- ko ifnot: hasAgreedToPrivacy -->
+          <button type="submit"
+                  class="btn btn-primary disabled"
+                  data-bind="
+                                text: submitBtnText"
+                  disabled="disabled">
+          </button>
+          <span class="badge text-bg-info">{% trans 'Please agree to the Privacy Policy.' %}</span>
+          <!-- /ko -->
+          <button type="button"
+                  data-bind="visible: paymentIsComplete"
+                  class="btn btn-outline-primary"
+                  data-bs-dismiss="modal">
+            {% trans "Close" %}
+          </button>
+        </div>
+      </form>
+    </div>
+  </div>
+
+</div>

From f69e288fea1e93ed54ad1bc71306edf47ade57e2 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:33:59 +0000
Subject: [PATCH 020/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/update_billing_contact_info.html, splitting templates"

---
 .../update_billing_contact_info.html          |  0
 .../update_billing_contact_info.html          | 21 +++++++++++++++++++
 corehq/apps/domain/views/accounting.py        |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/update_billing_contact_info.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/update_billing_contact_info.html

diff --git a/corehq/apps/domain/templates/domain/update_billing_contact_info.html b/corehq/apps/domain/templates/domain/bootstrap3/update_billing_contact_info.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/update_billing_contact_info.html
rename to corehq/apps/domain/templates/domain/bootstrap3/update_billing_contact_info.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/update_billing_contact_info.html b/corehq/apps/domain/templates/domain/bootstrap5/update_billing_contact_info.html
new file mode 100644
index 000000000000..0a225d2f9bf7
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/update_billing_contact_info.html
@@ -0,0 +1,21 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load crispy_forms_tags %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{% requirejs_main_b5 'domain/js/update_billing_contact_info' %}
+
+{% block additional_initial_page_data %}{{ block.super }}
+  {% initial_page_data "stripe_public_key" stripe_public_key %}
+  {% initial_page_data "cards" cards %}
+  {% registerurl "cards_view" domain %}
+{% endblock %}
+
+{% block page_content %}
+  <div id="billing-info">
+    {% crispy billing_account_info_form %}  {# todo B5: crispy #}
+  </div>
+  <div id="card-manager" style="margin-top:20px;">  {# todo B5: inline-style #}
+    {% include 'domain/stripe_cards.html' %}
+  </div>
+{% endblock %}
diff --git a/corehq/apps/domain/views/accounting.py b/corehq/apps/domain/views/accounting.py
index 41937d31aa00..578f62c3b906 100644
--- a/corehq/apps/domain/views/accounting.py
+++ b/corehq/apps/domain/views/accounting.py
@@ -382,7 +382,7 @@ def page_context(self):
 
 
 class EditExistingBillingAccountView(DomainAccountingSettings, AsyncHandlerMixin):
-    template_name = 'domain/update_billing_contact_info.html'
+    template_name = 'domain/bootstrap3/update_billing_contact_info.html'
     urlname = 'domain_update_billing_info'
     page_title = gettext_lazy("Billing Information")
     async_handlers = [

From 58f017a1f0f5fe59152fdd01aa33676d8a79755a Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:35:07 +0000
Subject: [PATCH 021/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/stripe_cards.html, splitting templates"

---
 .../bootstrap3/confirm_billing_info.html      |   2 +-
 .../domain/{ => bootstrap3}/stripe_cards.html |   0
 .../update_billing_contact_info.html          |   2 +-
 .../bootstrap5/confirm_billing_info.html      |   2 +-
 .../domain/bootstrap5/stripe_cards.html       | 108 ++++++++++++++++++
 .../update_billing_contact_info.html          |   2 +-
 6 files changed, 112 insertions(+), 4 deletions(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/stripe_cards.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/stripe_cards.html

diff --git a/corehq/apps/domain/templates/domain/bootstrap3/confirm_billing_info.html b/corehq/apps/domain/templates/domain/bootstrap3/confirm_billing_info.html
index c0d2a0339600..33f41c448ec5 100644
--- a/corehq/apps/domain/templates/domain/bootstrap3/confirm_billing_info.html
+++ b/corehq/apps/domain/templates/domain/bootstrap3/confirm_billing_info.html
@@ -26,7 +26,7 @@
 
   <div class="panel panel-modern-gray panel-form-only" id="card-manager">
     <div class="panel-body">
-      {% include 'domain/stripe_cards.html' %}
+      {% include 'domain/bootstrap3/stripe_cards.html' %}
     </div>
   </div>
 {% endblock %}
diff --git a/corehq/apps/domain/templates/domain/stripe_cards.html b/corehq/apps/domain/templates/domain/bootstrap3/stripe_cards.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/stripe_cards.html
rename to corehq/apps/domain/templates/domain/bootstrap3/stripe_cards.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap3/update_billing_contact_info.html b/corehq/apps/domain/templates/domain/bootstrap3/update_billing_contact_info.html
index a3e44c626750..46dda5d2d669 100644
--- a/corehq/apps/domain/templates/domain/bootstrap3/update_billing_contact_info.html
+++ b/corehq/apps/domain/templates/domain/bootstrap3/update_billing_contact_info.html
@@ -16,6 +16,6 @@
     {% crispy billing_account_info_form %}
   </div>
   <div id="card-manager" style="margin-top:20px;">
-    {% include 'domain/stripe_cards.html' %}
+    {% include 'domain/bootstrap3/stripe_cards.html' %}
   </div>
 {% endblock %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/confirm_billing_info.html b/corehq/apps/domain/templates/domain/bootstrap5/confirm_billing_info.html
index 753e2dce0786..641dc6260602 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/confirm_billing_info.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/confirm_billing_info.html
@@ -26,7 +26,7 @@
 
   <div class="card card-modern-gray card-form-only" id="card-manager">  {# todo B5: css-panel #}
     <div class="card-body">
-      {% include 'domain/stripe_cards.html' %}
+      {% include 'domain/bootstrap5/stripe_cards.html' %}
     </div>
   </div>
 {% endblock %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/stripe_cards.html b/corehq/apps/domain/templates/domain/bootstrap5/stripe_cards.html
new file mode 100644
index 000000000000..2689ae57f888
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/stripe_cards.html
@@ -0,0 +1,108 @@
+{% load hq_shared_tags %}
+{% load i18n %}
+
+<fieldset>
+  <legend>{% trans 'Saved Credit Cards' %}</legend>
+  <table class='table table-striped'>
+    <tbody data-bind="template: {name: 'card-row', foreach: cards}"></tbody>
+  </table>
+
+  <!-- ko with: newCard -->
+    <button type='button' class="btn btn-primary new-card" data-bs-toggle="modal" href="#card-modal">
+      <i class='fa fa-plus'></i> {% trans 'Add Card' %}
+    </button>
+    <div data-bind="template: {name: 'new-stripe-card-template'}"></div>
+    {% include 'accounting/partials/new_stripe_card_template.html' %}
+  <!-- /ko -->
+</fieldset>
+
+<div class="modal fade" id="success-modal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>  {# todo B5: css-close #}
+        <h4 class="modal-title">{% trans "Credit Card" %}</h4>
+      </div>
+      <div class="modal-body">
+        <div class="alert alert-success">
+          {% trans "Your request was successful!" %}
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button style="" type="button" class="btn btn-outline-primary" data-bs-dismiss="modal">  {# todo B5: inline-style #}
+          {% trans 'Close' %}
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script type="text/html" id="delete-card-modal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>  {# todo B5: css-close #}
+        <h4 class="modal-title">{% trans "Delete Card" %}</h4>
+      </div>
+      <div class="modal-body">
+        <div class="alert alert-success"
+             data-bind="visible: isDeleting">
+          <i class="fa fa-refresh fa-spin"></i> {% trans "Processing your request" %}
+        </div>
+        <div class="alert alert-danger"
+             data-bind="visible: deleteErrorMsg() != '',
+                            text: deleteErrorMsg">
+        </div>
+        {% blocktrans %}
+          Actually remove <strong><span data-bind='text: brand'></span></strong> card
+          ************<strong><span data-bind="text: last4"></span></strong>?
+        {% endblocktrans %}
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-outline-primary" data-bs-dismiss="modal">
+          {% trans 'Cancel' %}
+        </button>
+        <button type="button" class="btn btn-outline-danger"
+                data-bind="click: deleteCard,
+                               enable: !isDeleting()">
+          {% trans 'Delete' %}
+        </button>
+      </div>
+    </div>
+  </div>
+</script>
+
+<script type="text/html" id="card-row">
+  <tr>
+    <td>
+      <i class="fa-regular fa-credit-card"></i> <strong><span data-bind="text: brand"></span></strong>
+      <span class="badge text-bg-success"
+            data-bind="visible: is_autopay">
+                {% trans 'Autopay card' %}
+            </span>
+    </td>
+    <td>
+      ************<strong><span data-bind="text: last4"></span></strong>
+    </td>
+    <td><span data-bind="text: exp_month"></span>/<span data-bind="text: exp_year"></span></td>
+    <td>
+      <button data-bind="visible: is_autopay,
+                               click: unSetAutopay,
+                               enable: $parent.autoPayButtonEnabled"
+              class='btn btn-outline-primary autopay-button'>
+        {% trans 'Remove Autopay' %}
+      </button>
+      <button data-bind="visible: !is_autopay(),
+                               click: setAutopay,
+                               enable: $parent.autoPayButtonEnabled"
+              class='btn btn-outline-primary autopay-button'>
+        {% trans 'Set as autopay card' %}
+      </button>
+    </td>
+    <td>
+      <button class="btn btn-outline-danger" href="#" data-bind="openModal: 'delete-card-modal'">
+        <i class="fa fa-remove"></i> {% trans 'Delete Card' %}
+      </button>
+    </td>
+  </tr>
+</script>
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/update_billing_contact_info.html b/corehq/apps/domain/templates/domain/bootstrap5/update_billing_contact_info.html
index 0a225d2f9bf7..17b0b76d97fd 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/update_billing_contact_info.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/update_billing_contact_info.html
@@ -16,6 +16,6 @@
     {% crispy billing_account_info_form %}  {# todo B5: crispy #}
   </div>
   <div id="card-manager" style="margin-top:20px;">  {# todo B5: inline-style #}
-    {% include 'domain/stripe_cards.html' %}
+    {% include 'domain/bootstrap5/stripe_cards.html' %}
   </div>
 {% endblock %}

From ce6bcbf15785581dd8e0e6e8550f5bcdf4ea4c84 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:35:30 +0000
Subject: [PATCH 022/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/transfer_domain_pending.html, splitting templates"

---
 .../transfer_domain_pending.html              |  0
 .../bootstrap5/transfer_domain_pending.html   | 34 +++++++++++++++++++
 corehq/apps/domain/views/internal.py          |  2 +-
 3 files changed, 35 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/transfer_domain_pending.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/transfer_domain_pending.html

diff --git a/corehq/apps/domain/templates/domain/admin/transfer_domain_pending.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/transfer_domain_pending.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/transfer_domain_pending.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/transfer_domain_pending.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/transfer_domain_pending.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/transfer_domain_pending.html
new file mode 100644
index 000000000000..f9b342e5d16d
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/transfer_domain_pending.html
@@ -0,0 +1,34 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load hq_shared_tags %}
+{% load crispy_forms_tags %}
+{% load i18n %}
+
+
+{% block page_content %}
+  <div class="row">
+    <div class="col-md-12">
+      <h4>
+        {% blocktrans with username=transfer.to_username %}
+          You have a pending transfer with {{ username }}
+        {% endblocktrans %}
+      </h4>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-2">
+      <a href="{% url 'transfer_domain_view' domain %}?resend=true" class="btn btn-primary">
+        {% blocktrans %}
+          Resend Transfer Request
+        {% endblocktrans %}
+      </a>
+    </div>
+    <div class="col-md-2">
+      <form action="{{ transfer.deactivate_url }}" method="POST">
+        {% csrf_token %}
+        <input class="btn btn-outline-danger" type="submit" value="{% trans "Cancel Transfer" %}" />
+      </form>
+    </div>
+  </div>
+{% endblock %}
+
+
diff --git a/corehq/apps/domain/views/internal.py b/corehq/apps/domain/views/internal.py
index 1a50e7265898..73a320c4320b 100644
--- a/corehq/apps/domain/views/internal.py
+++ b/corehq/apps/domain/views/internal.py
@@ -340,7 +340,7 @@ def transfer_domain_form(self):
     def get(self, request, *args, **kwargs):
 
         if self.active_transfer:
-            self.template_name = 'domain/admin/transfer_domain_pending.html'
+            self.template_name = 'domain/admin/bootstrap3/transfer_domain_pending.html'
 
             if request.GET.get('resend', None):
                 self.active_transfer.send_transfer_request()

From a72acc4936a426c90041b0f74d981069ce75feeb Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:36:05 +0000
Subject: [PATCH 023/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/global_sms_rates.html, splitting templates"

---
 .../{ => bootstrap3}/global_sms_rates.html    |  0
 .../admin/bootstrap5/global_sms_rates.html    | 95 +++++++++++++++++++
 corehq/apps/domain/views/sms.py               |  2 +-
 3 files changed, 96 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/global_sms_rates.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/global_sms_rates.html

diff --git a/corehq/apps/domain/templates/domain/admin/global_sms_rates.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/global_sms_rates.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/global_sms_rates.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/global_sms_rates.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/global_sms_rates.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/global_sms_rates.html
new file mode 100644
index 000000000000..a6a16ec4bd51
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/global_sms_rates.html
@@ -0,0 +1,95 @@
+{% extends "hqwebapp/bootstrap5/two_column.html" %}
+{% load hq_shared_tags %}
+{% load crispy_forms_tags %}
+{% load i18n %}
+
+{% requirejs_main_b5 'smsbillables/js/smsbillables.rate_calc' %}
+
+{% block title %}{% trans "SMS Pricing" %}{% endblock %}
+
+{% block page_title %}{% trans "SMS Pricing" %}{% endblock page_title %}
+
+{% block page_breadcrumbs %}
+  <ol id="hq-breadcrumbs" class="breadcrumb breadcrumb-hq-section">  {# todo B5: css-breadcrumb #}
+    <li>
+      <a href="/pricing/"><strong>{% trans "Pricing" %}</strong></a>
+    </li>
+    <li class="active">
+      {% trans "SMS Pricing" %}
+    </li>
+  </ol>
+{% endblock %}
+
+{% block page_content %}
+  <p class="lead">
+    {% blocktrans %}
+      View SMS prices for using Dimagi's connections in each country.
+    {% endblocktrans %}
+  </p>
+  <p>
+    {% blocktrans %}
+      You can choose a connection for your project under Messaging -> SMS Connectivity
+    {% endblocktrans %}
+  </p>
+  <hr />
+  <div class="ko-public-sms-rate-calculator">
+    {% crispy rate_calc_form %}  {# todo B5: crispy #}
+    <div class="alert alert-info" data-bind="visible: calculatingRate">
+      {% blocktrans %}
+        Calculating SMS Rate...
+      {% endblocktrans %}
+    </div>
+    <div class="alert"
+         data-bind="text: rateErrorText,
+                        css: { 'alert-danger': hasError, 'alert-info': noError },
+                        visible: showRateInfo"></div>
+    <table class="table table-striped table-bordered" style="margin-bottom:0"  {# todo B5: inline-style #}
+           data-bind="visible: showTable">
+      <thead>
+      <tr>
+        <th>
+          {% trans "Connection" %}
+        </th>
+        <th>
+          {% trans "Incoming" %}
+        </th>
+        <th>
+          {% trans "Outgoing" %}
+        </th>
+      </tr>
+      </thead>
+      <tbody>
+      <!-- ko foreach: rate_table -->
+      <tr>
+        <td>
+          <span data-bind="text: gateway"></span>
+        </td>
+        <td>
+          <span data-bind="text: inn"></span>
+        </td>
+        <td>
+          <span data-bind="text: out"></span>
+        </td>
+      </tr>
+      <!-- /ko -->
+      <tr>
+        <td>
+          <span>{% trans "Your own Android Gateway" %}</span>
+        </td>
+        <td>
+          <span>USD 0.01</span>
+        </td>
+        <td>
+          <span>USD 0.01</span>
+      </tr>
+      </tbody>
+    </table>
+    <br />
+    <div class="alert alert-info"
+         data-bind="visible: noError">
+      {% blocktrans %}
+        Pricing is per message sent or received. Fees are subject to change based on provider rates and exchange rates and are computed at the time the SMS is sent or received.
+      {% endblocktrans %}
+    </div>
+  </div>
+{% endblock %}
diff --git a/corehq/apps/domain/views/sms.py b/corehq/apps/domain/views/sms.py
index 23482d8878ac..5563c8c39616 100644
--- a/corehq/apps/domain/views/sms.py
+++ b/corehq/apps/domain/views/sms.py
@@ -20,7 +20,7 @@
 class PublicSMSRatesView(BasePageView, AsyncHandlerMixin):
     urlname = 'public_sms_rates_view'
     page_title = gettext_lazy("SMS Rate Calculator")
-    template_name = 'domain/admin/global_sms_rates.html'
+    template_name = 'domain/admin/bootstrap3/global_sms_rates.html'
     async_handlers = [PublicSMSRatesAsyncHandler]
 
     def dispatch(self, request, *args, **kwargs):

From 210ad401518a7675a7d0f2334a31194d56703134 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:37:00 +0000
Subject: [PATCH 024/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/partials/license_explanations.html, splitting templates"

---
 .../license_explanations.html                 |  0
 .../bootstrap5/license_explanations.html      | 32 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 rename corehq/apps/domain/templates/domain/partials/{ => bootstrap3}/license_explanations.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/partials/bootstrap5/license_explanations.html

diff --git a/corehq/apps/domain/templates/domain/partials/license_explanations.html b/corehq/apps/domain/templates/domain/partials/bootstrap3/license_explanations.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/partials/license_explanations.html
rename to corehq/apps/domain/templates/domain/partials/bootstrap3/license_explanations.html
diff --git a/corehq/apps/domain/templates/domain/partials/bootstrap5/license_explanations.html b/corehq/apps/domain/templates/domain/partials/bootstrap5/license_explanations.html
new file mode 100644
index 000000000000..08482c387fbe
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/partials/bootstrap5/license_explanations.html
@@ -0,0 +1,32 @@
+{% load i18n %}
+<a data-bs-toggle="modal" href="#license-explanations">More information about licenses...</a>
+<div class="modal fade" id="license-explanations">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>  {# todo B5: css-close #}
+        <h3 class="modal-title">About available licenses for shared media and projects</h3>
+      </div>
+      <div class="modal-body">
+        <h4>Creative Commons</h4>
+
+        <p>
+          Creative Commons offers several ways for copyright holders to offer their media to the public
+          free of charge.
+          Depending on the license you choose, you can restrict the use of your copyrighted materials to
+          require
+          attribution, restrict modification, and restrict commercial use.
+          <a target="_blank"
+             href="http://creativecommons.org/choose/">{% trans "Use the Creative Commons website" %}</a>
+          {% trans "to choose a Creative Commons license." %}
+        </p>
+      </div>
+      <div class="modal-footer">
+        <a href="#" class="btn btn-outline-primary" data-bs-dismiss="modal">Close</a>
+      </div>
+    </div>
+  </div>
+</div>
+{% if extra %}
+  <div style="margin-top: .5em">{{ extra }}</div>  {# todo B5: inline-style #}
+{% endif %}

From a4074b7aa7a5cc106d04f244622359fd2e2bdf6d Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:37:25 +0000
Subject: [PATCH 025/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/case_search.html, splitting templates"

---
 .../admin/{ => bootstrap3}/case_search.html   |   0
 .../domain/admin/bootstrap5/case_search.html  | 155 ++++++++++++++++++
 corehq/apps/domain/views/settings.py          |   2 +-
 3 files changed, 156 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/case_search.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html

diff --git a/corehq/apps/domain/templates/domain/admin/case_search.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/case_search.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/case_search.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/case_search.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html
new file mode 100644
index 000000000000..a7088c4d74bd
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html
@@ -0,0 +1,155 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{% requirejs_main_b5 'domain/js/case_search_main' %}
+
+{% block page_content %}
+  {% include 'domain/admin/partials/case_search_templates.html' %}
+  {% initial_page_data 'case_types' case_types %}
+  {% initial_page_data 'values' values %}
+  {% registerurl 'case_search_config' request.domain %}
+  <h1>{% trans "Enable Case Search" %}</h1>
+
+  <div class="row">
+    <div class="col-md-6">
+      <form id="case-search-config">
+        {% csrf_token %}
+        <div data-bind="saveButton: saveButton"></div>
+        <p class="spacer"></p>
+
+        <p>
+          {% blocktrans %}Enabling case search for the project will allow mobile users to look up cases
+            that don't necessarily belong to them, and claim them. Possible applications range from cases
+            for patients who move from one location to another, and other lost-to-follow-up scenarios, to
+            any scenario involving searching for information, products, people or items.{% endblocktrans %}
+        </p>
+        <p class="text-danger">
+          {% blocktrans %}WARNING: Enabling Case Search allows users to read the data of
+            other users' cases, and take ownership of them, from modules whose case lists are configured
+            for searching.{% endblocktrans %}
+        </p>
+
+        <p>
+          <input id="enable" type="checkbox" data-bind="checked: toggleEnabled"/>  {# todo B5: css-checkbox #}
+          <label for="enable">{% trans "Enable Case Search" %}</label>
+        </p>
+
+        {% if request.user.is_superuser %}
+          <div data-bind="visible: toggleEnabled">
+            {% blocktrans %}
+              Visit <a href='{{ case_search_url }}' target='_blank'>Case Search</a> to test out your configuration.
+            {% endblocktrans %}
+          </div>
+        {% endif %}
+
+        <div id="fuzzies_div" data-bind="visible: toggleEnabled">
+          <h2>{% trans "Fuzzy Search Properties" %}</h2>
+          <p>
+            {% blocktrans %}
+              Add a list of all fuzzy search properties by case type below. These are
+              properties that might be spelled inexactly by a user, e.g. "name".
+              <br><br>
+              When working with related case properties, add them to the case type that
+              you will be searching on, not the related case type. For example, if fuzzy matching
+              on the parent's case name, add <strong>parent/name</strong> here as a property of
+              the child case type.
+            {% endblocktrans %}
+          </p>
+
+          <div data-bind="template: { name: 'case_type_template',
+                                    foreach: fuzzyProperties,
+                                    as: 'caseTypeProps' }"></div>
+          <button type="button"
+                  class="btn btn-primary"
+                  data-bind="click: $root.addCaseType">
+            <i class="fa fa-plus"></i> {% trans "Add case type" %}
+          </button>
+        </div>
+
+        <div data-bind="visible: toggleEnabled">
+          <h2>{% trans "Synchronous Web Apps Submissions" %}</h2>
+          <p>
+            <input id="sync-web-apps" type="checkbox" data-bind="checked: synchronousWebApps"/>  {# todo B5: css-checkbox #}
+            <label for="sync-web-apps">
+              {% blocktrans %}
+                Update case search data immediately on web apps form submission.
+              {% endblocktrans %}
+            </label>
+          </p>
+          <p class="help-block">
+            {% blocktrans %}
+              This will slow down submissions but prevent case search data from going stale.
+            {% endblocktrans %}
+          </p>
+        </div>
+
+        <div data-bind="visible: toggleEnabled">
+          <h2>{% trans "Sync Cases On Form Entry" %}</h2>
+          <p>
+            <input id="sync-case-on-form-entry" type="checkbox" data-bind="checked: syncCaseOnFormEntry"/>  {# todo B5: css-checkbox #}
+            <label for="sync-case-on-form-entry">
+              {% blocktrans %}
+                Update local case data immediately before entering a web apps form.
+              {% endblocktrans %}
+            </label>
+          </p>
+          <p class="help-block">
+            {% blocktrans %}
+              This will slow down form entry, but will prevent stale case data from populating the form.
+            {% endblocktrans %}
+          </p>
+        </div>
+
+        <div data-bind="visible: toggleEnabled">
+          <h2>{% trans "Remove Special Characters" %}</h2>
+          <p>
+            {% blocktrans %}
+              Remove characters from incoming search queries for particular case properties. For example, you can remove '+' from phone numbers or '-' from ID queries.
+            {% endblocktrans %}
+          </p>
+          <table class="table table-striped">
+            <thead>
+            <th>
+              Case Type
+            </th>
+            <th>
+              Case Property
+            </th>
+            <th>
+              String to remove
+            </th>
+            <th></th>
+            </thead>
+            <tbody data-bind="foreach: ignorePatterns">
+            <tr>
+              <td>
+                <select class="form-select" data-bind="options: $root.caseTypes, value: caseType"></select>
+              </td>
+              <td>
+                <input type="text" class="form-control" data-bind="value: caseProperty" placeholder="e.g. name" />
+              </td>
+              <td>
+                <input type="text" class="form-control" data-bind="value: regex" placeholder="e.g. +" />
+              </td>
+              <td>
+                <button type="button"
+                        class="btn btn-outline-danger float-end"
+                        data-bind="click: function(){$parent.removeIgnorePatterns($data); $parent.change();}">
+                  <i class="fa-regular fa-trash-can"></i>
+                </button>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+          <button type="button"
+                  class="btn btn-primary"
+                  data-bind="click: addIgnorePatterns">
+            <i class="fa fa-plus"></i> {% trans "Add case property" %}
+          </button>
+        </div>
+      </form>
+    </div>
+  </div>
+
+{% endblock %}
diff --git a/corehq/apps/domain/views/settings.py b/corehq/apps/domain/views/settings.py
index 7f0565c18b76..de9edb6329fa 100644
--- a/corehq/apps/domain/views/settings.py
+++ b/corehq/apps/domain/views/settings.py
@@ -327,7 +327,7 @@ def post(self, request, *args, **kwargs):
 class CaseSearchConfigView(BaseAdminProjectSettingsView):
     urlname = 'case_search_config'
     page_title = gettext_lazy('Case Search')
-    template_name = 'domain/admin/case_search.html'
+    template_name = 'domain/admin/bootstrap3/case_search.html'
 
     @method_decorator(domain_admin_required)
     @method_decorator(toggles.SYNC_SEARCH_CASE_CLAIM.required_decorator())

From cc8761f736c382205ba1e036fb61a4fd0996ee3b Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:37:35 +0000
Subject: [PATCH 026/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/data_migration_in_progress.html, splitting templates"

---
 corehq/apps/domain/middleware.py                         | 2 +-
 .../{ => bootstrap3}/data_migration_in_progress.html     | 0
 .../domain/bootstrap5/data_migration_in_progress.html    | 9 +++++++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/data_migration_in_progress.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/data_migration_in_progress.html

diff --git a/corehq/apps/domain/middleware.py b/corehq/apps/domain/middleware.py
index e02a9af2e043..8b4b0eb90c05 100644
--- a/corehq/apps/domain/middleware.py
+++ b/corehq/apps/domain/middleware.py
@@ -73,7 +73,7 @@ def process_view(self, request, view_func, view_args, view_kwargs):
             if DATA_MIGRATION.enabled(request.domain):
                 return TemplateResponse(
                     request=request,
-                    template='domain/data_migration_in_progress.html',
+                    template='domain/bootstrap3/data_migration_in_progress.html',
                     status=503,
                     context={
                         'domain': request.domain
diff --git a/corehq/apps/domain/templates/domain/data_migration_in_progress.html b/corehq/apps/domain/templates/domain/bootstrap3/data_migration_in_progress.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/data_migration_in_progress.html
rename to corehq/apps/domain/templates/domain/bootstrap3/data_migration_in_progress.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/data_migration_in_progress.html b/corehq/apps/domain/templates/domain/bootstrap5/data_migration_in_progress.html
new file mode 100644
index 000000000000..9051ec90f382
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/data_migration_in_progress.html
@@ -0,0 +1,9 @@
+{% extends "hqwebapp/bootstrap5/base_page.html" %}
+{% load i18n %}
+
+{% block page_content %}
+  <h1>{% block title %}{% trans "Domain Temporarily Unavailable" %}{% endblock %}</h1>
+
+  <p>{% blocktrans %}The page you requested is currently unavailable due to a
+    data migration. Please check back later.{% endblocktrans %}</p>
+{% endblock %}

From 55b591124fdf13982f5a48acc4314f44916c1bb5 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:38:08 +0000
Subject: [PATCH 027/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/activate_transfer_domain.html, splitting templates"

---
 .../activate_transfer_domain.html             |  0
 .../bootstrap5/activate_transfer_domain.html  | 42 +++++++++++++++++++
 corehq/apps/domain/views/internal.py          |  2 +-
 3 files changed, 43 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/activate_transfer_domain.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/activate_transfer_domain.html

diff --git a/corehq/apps/domain/templates/domain/activate_transfer_domain.html b/corehq/apps/domain/templates/domain/bootstrap3/activate_transfer_domain.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/activate_transfer_domain.html
rename to corehq/apps/domain/templates/domain/bootstrap3/activate_transfer_domain.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/activate_transfer_domain.html b/corehq/apps/domain/templates/domain/bootstrap5/activate_transfer_domain.html
new file mode 100644
index 000000000000..08eddbc4bc5d
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/activate_transfer_domain.html
@@ -0,0 +1,42 @@
+{% extends 'hqwebapp/bootstrap5/base_navigation.html' %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{% block content %}
+  <div class="container" id="hq-content">
+    <div class="row">
+      <div class="page-header">  {# todo B5: css-page-header #}
+        <h1>{% trans "Transfer project ownership" %}</h1>
+      </div>
+      <div class="col-lg-8 col-sm-12">
+        {% if transfer %}
+          <p class="lead">
+            {% blocktrans with domain=transfer.domain%}
+              By clicking "accept" below you acknowledge that you accept full ownership of this project space ("{{ domain }}").
+              You agree to be bound by the terms of Dimagi's <a href="https://www.dimagi.com/terms/latest/privacy/">Terms of Service and Business Agreement</a>.
+              By accepting this agreement, your are acknowledging you have permission and authority to accept these terms. A Dimagi representative will notify you when the transfer is complete.
+            {% endblocktrans %}
+          </p>
+          <div class="row">
+            <div class="col-lg-2">
+              <form action="{{ transfer.activate_url }}" method="POST">{% csrf_token %}
+                <input type="submit" value="{% trans "Accept" %}" class="btn btn-primary"/>
+              </form>
+            </div>
+            <div class="col-lg-2">
+              <form action="{{ transfer.deactivate_url }}" method="POST">{% csrf_token %}
+                <input type="submit" value="{% trans "Decline" %}" class="btn btn-outline-danger"/>
+              </form>
+            </div>
+          </div>
+        {% else %}
+          <p class="lead">
+            {% blocktrans %}
+              Sorry this transfer request has expired.
+            {% endblocktrans %}
+          </p>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+{% endblock content %}
diff --git a/corehq/apps/domain/views/internal.py b/corehq/apps/domain/views/internal.py
index 73a320c4320b..3de34e55ecbf 100644
--- a/corehq/apps/domain/views/internal.py
+++ b/corehq/apps/domain/views/internal.py
@@ -377,7 +377,7 @@ def dispatch(self, request, *args, **kwargs):
 class ActivateTransferDomainView(BasePageView):
     urlname = 'activate_transfer_domain'
     page_title = 'Activate Domain Transfer'
-    template_name = 'domain/activate_transfer_domain.html'
+    template_name = 'domain/bootstrap3/activate_transfer_domain.html'
 
     @property
     @memoized

From 8ebba6209542b11b25b0709b062c992ad8027f83 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:38:46 +0000
Subject: [PATCH 028/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/confirm_plan.html, splitting templates"

---
 .../domain/{ => bootstrap3}/confirm_plan.html |   0
 .../domain/bootstrap5/confirm_plan.html       | 182 ++++++++++++++++++
 corehq/apps/domain/views/accounting.py        |   2 +-
 3 files changed, 183 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/confirm_plan.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/confirm_plan.html

diff --git a/corehq/apps/domain/templates/domain/confirm_plan.html b/corehq/apps/domain/templates/domain/bootstrap3/confirm_plan.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/confirm_plan.html
rename to corehq/apps/domain/templates/domain/bootstrap3/confirm_plan.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/confirm_plan.html b/corehq/apps/domain/templates/domain/bootstrap5/confirm_plan.html
new file mode 100644
index 000000000000..d7134be023b3
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/confirm_plan.html
@@ -0,0 +1,182 @@
+{% extends "domain/base_change_plan.html" %}
+{% load i18n %}
+{% load hq_shared_tags %}
+{% requirejs_main_b5 'accounting/js/confirm_plan' %}
+
+{% block form_content %}
+  {% initial_page_data 'is_upgrade' is_upgrade %}
+  {% initial_page_data 'is_same_edition' is_same_edition %}
+  {% initial_page_data 'is_paused' is_paused %}
+  {% initial_page_data 'next_invoice_date' next_invoice_date %}
+  {% initial_page_data 'current_plan' current_plan %}
+  {% initial_page_data 'new_plan_edition' new_plan_edition %}
+  {% initial_page_data 'is_downgrade_before_minimum' is_downgrade_before_minimum %}
+  {% initial_page_data 'current_subscription_end_date' current_subscription_end_date %}
+  {% initial_page_data 'start_date_after_minimum_subscription' start_date_after_minimum_subscription %}
+  {% registerurl 'email_on_downgrade' domain %}
+  {% registerurl 'confirm_billing_account_info' domain %}
+
+  <div class="ko-template" id="confirm-plan-content">
+    {% if is_paused %}
+      {% include 'accounting/partials/confirm_pause_summary.html' %}
+    {% else %}
+      {% include 'accounting/partials/confirm_plan_summary.html' %}
+    {% endif %}
+
+    <form action="{% if is_paused %}{% url 'pause_subscription' domain %}{% else %}{% url 'confirm_billing_account_info' domain %}{% endif %}"
+          method="post"
+          class="form">
+      {% csrf_token %}
+      <input type="hidden" value="{{ plan.edition }}" name="plan_edition" />
+      <input type="hidden" value="" name="downgrade_reason" id="downgrade-reason"/>
+      <input type="hidden" value="" name="will_project_restart" id="will-project-restart"/>
+      <input type="hidden" value="" name="new_tool" id="new-tool"/>
+      <input type="hidden" value="" name="new_tool_reason" id="new-tool-reason"/>
+      <input type="hidden" value="" name="feedback" id="feedback"/>
+      {% if not is_paused %}
+        <hr />
+        <p class="text-center">
+          {% blocktrans %}
+            Clicking the 'Confirm Plan' button below will bring you to a page where you can confirm your billing information.
+          {% endblocktrans %}
+        </p>
+      {% endif %}
+      <div class="text-center plan-next">
+        <a href="{% url 'domain_select_plan' domain %}" class="btn btn-outline-primary btn-lg">
+          {% if is_paused %}
+            {% trans 'Select different option' %}
+          {% else %}
+            {% trans 'Select different plan' %}
+          {% endif %}
+        </a>
+        <button class="btn btn-primary btn-lg"
+                data-bind="enable: oUserAgreementSigned, click: openDowngradeModal">
+          {% if is_paused %}
+            {% trans 'Confirm Pause' %}
+          {% else %}
+            {% trans "Confirm Plan" %}
+          {% endif %}
+        </button>
+      </div>
+    </form>
+
+  </div>
+{% endblock %}
+
+{% block modals %}{{ block.super }}
+  <div class="modal fade" id="modal-downgrade">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="btn-close" data-bs-dismiss="modal">  {# todo B5: css-close #}
+            <span aria-hidden="true">&times;</span>
+            <span class="sr-only">{% trans "Close" %}</span>
+          </button>
+          <h4 class="modal-title">
+            {% if is_paused %}
+              {% trans 'Before you pause...' %}
+            {% else %}
+              {% trans 'Downgrading?' %}
+            {% endif %}
+          </h4>
+        </div>
+        <div class="modal-body">
+          <p class="lead">
+            {% blocktrans %}
+              We'd love to make CommCare work better for you.
+              Please help us by answering these simple questions.
+            {% endblocktrans %}
+          </p>
+
+          <p>
+            {% if is_paused %}
+              {% blocktrans %}
+                Why are you pausing your subscription today?
+              {% endblocktrans %}
+            {% else %}
+              {% blocktrans %}
+                Why are you downgrading your subscription today?
+              {% endblocktrans %}
+            {% endif %}
+            <select multiple="multiple"  {# todo B5: css-select-form-control #}
+                    class="form-control"
+                    data-bind="selectedOptions: oDowngradeReason,
+                               options: downgradeReasonList"></select>
+          </p>
+
+          <!-- ko if: oProjectEnded -->
+            <p>
+              {% blocktrans %}
+                Do you think your project may start again?
+              {% endblocktrans %}
+              <select class="form-select"
+                      data-bind="value: oWillProjectRestart">
+                <option value="yes">
+                  {% trans "Yes" %}
+                </option>
+                <option value="no"
+                        selected="selected">
+                  {% trans "No" %}
+                </option>
+              </select>
+            </p>
+          <!-- /ko -->
+
+          <!-- ko if: oNewToolNeeded -->
+            <p>
+              {% blocktrans %}
+                Could you indicate which new tool you’re using?
+              {% endblocktrans %}
+              <textarea class="form-control vertical-resize"
+                        data-bind="textInput: oNewTool"></textarea>
+            </p>
+            <p>
+              {% blocktrans %}
+                Why are you switching to a new tool?
+              {% endblocktrans %}
+              <select multiple="multiple"  {# todo B5: css-select-form-control #}
+                      class="form-control"
+                      data-bind="selectedOptions: oNewToolReason,
+                                 options: newToolReasonList"></select>
+            </p>
+          <!-- /ko -->
+
+          <!-- ko if: oOtherSelected -->
+            <p>
+              {% blocktrans %}
+                Please specify
+              {% endblocktrans %}
+              <textarea class="form-control vertical-resize"
+                        data-bind="textInput: oOtherNewToolReason"></textarea>
+            </p>
+          <!-- /ko -->
+
+          <p>
+            {% blocktrans %}
+              Please let us know any other feedback you have
+            {% endblocktrans %}
+            <textarea class="form-control vertical-resize"
+                      data-bind="textInput: oFeedback"></textarea>
+          </p>
+
+        </div>
+        <div class="modal-footer">
+          <!-- ko if: oRequiredQuestionsAnswered -->
+            <button type="button"
+                    class="btn btn-primary"
+                    data-bind="click: submitDowngrade">
+              {% trans "Continue" %}
+            </button>
+          <!-- /ko -->
+          <!-- ko ifnot: oRequiredQuestionsAnswered -->
+            <button type="button"
+                    disabled="disabled"
+                    class="btn btn-outline-primary">
+              {% trans "Continue" %}
+            </button>
+          <!-- /ko -->
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock %}
diff --git a/corehq/apps/domain/views/accounting.py b/corehq/apps/domain/views/accounting.py
index 578f62c3b906..aa2fde405f5d 100644
--- a/corehq/apps/domain/views/accounting.py
+++ b/corehq/apps/domain/views/accounting.py
@@ -1205,7 +1205,7 @@ def back_button(self):
 
 
 class ConfirmSelectedPlanView(PlanViewBase):
-    template_name = 'domain/confirm_plan.html'
+    template_name = 'domain/bootstrap3/confirm_plan.html'
     urlname = 'confirm_selected_plan'
 
     @property

From c120b7bb48f16d1109578b8159306f66cc09ce15 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:38:56 +0000
Subject: [PATCH 029/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/pro_bono/page_content.html, splitting templates"

---
 .../{ => bootstrap3}/page_content.html        |  0
 .../pro_bono/bootstrap5/page_content.html     | 21 +++++++++++++++++++
 .../templates/domain/pro_bono/domain.html     |  2 +-
 .../templates/domain/pro_bono/static.html     |  2 +-
 4 files changed, 23 insertions(+), 2 deletions(-)
 rename corehq/apps/domain/templates/domain/pro_bono/{ => bootstrap3}/page_content.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/pro_bono/bootstrap5/page_content.html

diff --git a/corehq/apps/domain/templates/domain/pro_bono/page_content.html b/corehq/apps/domain/templates/domain/pro_bono/bootstrap3/page_content.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/pro_bono/page_content.html
rename to corehq/apps/domain/templates/domain/pro_bono/bootstrap3/page_content.html
diff --git a/corehq/apps/domain/templates/domain/pro_bono/bootstrap5/page_content.html b/corehq/apps/domain/templates/domain/pro_bono/bootstrap5/page_content.html
new file mode 100644
index 000000000000..3ee2b8f0b5f1
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/pro_bono/bootstrap5/page_content.html
@@ -0,0 +1,21 @@
+{% load crispy_forms_tags %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{% block page_content %}
+  {% if is_submitted %}
+    <h4>{% trans "Thank you for your submission.  A representative will be in contact with you shortly." %}</h4>
+    <p><strong>Contact email(s):</strong> {{ pro_bono_form.contact_email.value }}</p>
+    <p><strong>Organization:</strong> {{ pro_bono_form.organization.value }}</p>
+    <p><strong>Project Space:</strong> {% if domain %}{{ domain }}{% else %}{{ pro_bono_form.domain.value }}{% endif %}</p>
+    <p><strong>Project overview:</strong> {{ pro_bono_form.project_overview.value }}</p>
+    <p><strong>Estimated annual expenditures on airtime:</strong> {{ pro_bono_form.airtime_expense.value }}</p>
+    <p><strong>Estimated annual expenditures on devices:</strong> {{ pro_bono_form.device_expense.value }}</p>
+    <p><strong>Pay only features needed:</strong> {{ pro_bono_form.pay_only_features_needed.value }}</p>
+    <p><strong>Duration of project:</strong> {{ pro_bono_form.duration_of_project.value }}</p>
+    <p><strong>Number of expected users:</strong> {{ pro_bono_form.num_expected_users.value }}</p>
+    <p><strong>Dimagi contact:</strong> {{ pro_bono_form.dimagi_contact.value }}</p>
+  {% else %}
+    {% crispy pro_bono_form %}  {# todo B5: crispy #}
+  {% endif %}
+{% endblock %}
diff --git a/corehq/apps/domain/templates/domain/pro_bono/domain.html b/corehq/apps/domain/templates/domain/pro_bono/domain.html
index 8977b75a3d6c..1207b6d20c82 100644
--- a/corehq/apps/domain/templates/domain/pro_bono/domain.html
+++ b/corehq/apps/domain/templates/domain/pro_bono/domain.html
@@ -4,5 +4,5 @@
 {% requirejs_main 'domain/js/pro-bono' %}
 
 {% block page_content %}
-  {% include 'domain/pro_bono/page_content.html' %}
+  {% include 'domain/pro_bono/bootstrap3/page_content.html' %}
 {% endblock %}
diff --git a/corehq/apps/domain/templates/domain/pro_bono/static.html b/corehq/apps/domain/templates/domain/pro_bono/static.html
index 4afbc24c303c..da68a3107139 100644
--- a/corehq/apps/domain/templates/domain/pro_bono/static.html
+++ b/corehq/apps/domain/templates/domain/pro_bono/static.html
@@ -4,5 +4,5 @@
 {% requirejs_main 'domain/js/pro-bono' %}
 
 {% block page_content %}
-  {% include 'domain/pro_bono/page_content.html' %}
+  {% include 'domain/pro_bono/bootstrap3/page_content.html' %}
 {% endblock %}

From 2300a0bcc5c22835823ce6a80a60cbe761cbf953 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:39:12 +0000
Subject: [PATCH 030/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/flags_and_privileges.html, splitting templates"

---
 .../flags_and_privileges.html                 |   0
 .../bootstrap5/flags_and_privileges.html      | 145 ++++++++++++++++++
 corehq/apps/domain/views/internal.py          |   2 +-
 3 files changed, 146 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/flags_and_privileges.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/flags_and_privileges.html

diff --git a/corehq/apps/domain/templates/domain/admin/flags_and_privileges.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/flags_and_privileges.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/flags_and_privileges.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/flags_and_privileges.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/flags_and_privileges.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/flags_and_privileges.html
new file mode 100644
index 000000000000..16abbae24638
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/flags_and_privileges.html
@@ -0,0 +1,145 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{% js_entry_b3 'domain/js/toggles' %}
+
+{% block page_content %}
+
+  {% initial_page_data 'domain' domain %}
+  {% initial_page_data 'toggles' toggles %}
+  {% registerurl 'set_toggle' '---' %}
+  {% registerurl 'edit_toggle' '---' %}
+
+  <div class="row">
+    <div class="col-md-10">
+      <p>
+        Features can be enabled or disabled based on feature flags or privileges. This page
+        is intended to provide a list of what features a domain has access to.
+      </p>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-md-10">
+      <h1>Privileges</h1>
+      <p>
+        {% url "domain_subscription_view" domain as software_plan_url %}
+        Access to some features is dependent on a the software plan to which the domain
+        is subscribed.
+        <a href="{{ software_plan_url }}">Current Subscription</a>
+      </p>
+    </div>
+    <div class="col-md-10">
+      <table class="table table-striped">
+        <thead>
+        <th>Privilege</th>
+        <th class="text-center text-nowrap">Enabled for domain?</th>
+        </thead>
+        <tbody>
+        {% for privilege_name, enabled_for_domain in privileges %}
+          <tr class="{% if enabled_for_domain %}success{% else %}warning{% endif %}">
+            <td>{{ privilege_name }}</td>
+            <td class="text-center">
+              {% if enabled_for_domain %}
+                <i class="fa fa-check"></i>
+              {% else %}
+                <i class="fa fa-ban"></i>
+              {% endif %}
+            </td>
+          </tr>
+        {% endfor %}
+        </tbody>
+      </table>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-md-10">
+      <h1>Feature Flags</h1>
+      <p>
+        {% url 'toggle_list' as toggle_url %}
+        Feature Flags turn on features for individual users or projects. They are editable only by
+        super users, in the <a href="{{ toggle_url }}">Feature Flag edit UI</a>.
+        In addition, some feature flags are randomly enabled by domain.
+      </p>
+      <p>
+        Following are all flags enabled for this domain and/or for you.
+        This does not include any flags set for other users in this domain.
+      </p>
+    </div>
+    <div class="col-md-10">
+      <table class="table table-striped ko-template" id="toggles-table">
+        <thead>
+        <th>Tag</th>
+        <th class="text-center text-nowrap"><!-- placeholder for flag icon --></th>
+        <th>Feature</th>
+        <th class="text-center text-nowrap">Enabled for me?</th>
+        <th class="text-center text-nowrap">Enabled for domain?</th>
+        </thead>
+        <tbody data-bind="foreach: toggles">
+        <tr>
+          <td>
+                            <span data-bind="css: ('label-' + tagCssClass),
+                                             text: tag"
+                                  class="badge"></span>
+          </td>
+
+          <td>
+            <i class="fa fa-flag" data-bind="visible: isEnabled"></i>
+          </td>
+
+          <td data-bind="css: {'text-body-secondary': !isEnabled()}" >
+            <div class="row clickable" data-bind="click: showHideDescription">
+              <!--ko text: badge --><!--/ko-->
+
+              <span data-bind="visible: description || helpLink">&hellip;</span>
+            </div>
+
+            <div class="row" data-bind="slideVisible: expanded()">
+              <br />
+              <p data-bind="visible: description, html: description"></p>
+              <span data-bind="visible: helpLink">
+                                    <a data-bind="attr: {href: helpLink}">Documentation</a>
+                                </span>
+
+              <hr data-bind="visible: description || helpLink" />
+
+              <span data-bind="css: ('label-' + tagCssClass),
+                                                    text: tag"
+                    class="badge"></span>
+              <span data-bind="html: tagDescription"></span>
+
+              <div class="text-end">
+                <small><a class="text-uppercase" data-bind="attr: {href: editLink}, text: slug"></a></small>
+              </div>
+            </div>
+          </td>
+
+          <td class="text-center">
+            <i class="fa fa-user" data-bind="visible: userEnabled"></i>
+          </td>
+
+          <td class="text-center">
+            <div data-bind="visible: hasDomainNamespace">
+              <button type="button"
+                      class="btn btn-outline-primary"
+                      data-bind="click: toggleEnabledState,
+                                 disable: setTogglePending,
+                                 css: {
+                                    'active': domainEnabled(),
+                                 }">
+                <i class="fa" data-bind="css: domainEnabled() ? 'fa-rocket' : 'fa-ban', hidden: setTogglePending"></i>
+                <i class="fa fa-spin fa-refresh" data-bind="visible: setTogglePending"></i>
+                <!--ko text: domainEnabled() ? 'Enabled' : 'Not Enabled' --><!--/ko-->
+              </button>
+            </div>
+            <div data-bind="visible: !hasDomainNamespace">---</div>
+          </td>
+
+        </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+{% endblock %}
diff --git a/corehq/apps/domain/views/internal.py b/corehq/apps/domain/views/internal.py
index 3de34e55ecbf..8b7c97e30086 100644
--- a/corehq/apps/domain/views/internal.py
+++ b/corehq/apps/domain/views/internal.py
@@ -243,7 +243,7 @@ def page_context(self):
 class FlagsAndPrivilegesView(BaseAdminProjectSettingsView):
     urlname = 'feature_flags_and_privileges'
     page_title = gettext_lazy("Feature Flags and Privileges")
-    template_name = 'domain/admin/flags_and_privileges.html'
+    template_name = 'domain/admin/bootstrap3/flags_and_privileges.html'
 
     def _get_toggles(self):
 

From 94b77174ef4e240d81ac2e18561146bd3d3d53f1 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:39:44 +0000
Subject: [PATCH 031/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/insufficient_privilege_notification.html, splitting templates"

---
 .../insufficient_privilege_notification.html  |  0
 .../insufficient_privilege_notification.html  | 32 +++++++++++++++++++
 corehq/apps/domain/views/accounting.py        |  2 +-
 3 files changed, 33 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/insufficient_privilege_notification.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/insufficient_privilege_notification.html

diff --git a/corehq/apps/domain/templates/domain/insufficient_privilege_notification.html b/corehq/apps/domain/templates/domain/bootstrap3/insufficient_privilege_notification.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/insufficient_privilege_notification.html
rename to corehq/apps/domain/templates/domain/bootstrap3/insufficient_privilege_notification.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/insufficient_privilege_notification.html b/corehq/apps/domain/templates/domain/bootstrap5/insufficient_privilege_notification.html
new file mode 100644
index 000000000000..e719d619f002
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/insufficient_privilege_notification.html
@@ -0,0 +1,32 @@
+{% extends 'hqwebapp/bootstrap5/base_page.html' %}
+{% load i18n %}
+
+{% block page_content %}
+  {% if is_paused %}
+    {% include 'hqwebapp/partials/bootstrap5/paused_plan_notice.html' %}
+  {% else %}
+    <p class="lead">
+      {% blocktrans %}
+        <strong>{{ feature_name }}</strong> is only available to projects
+        subscribed to <strong>{{ plan_name }}</strong> plan or higher.
+        To access this feature, you must subscribe to the
+        <strong>{{ plan_name }}</strong> plan.
+      {% endblocktrans %}
+    </p>
+    {% if not is_domain_admin %}
+      <div class="alert alert-info">
+        <i class="fa fa-info-circle"></i>
+        {% blocktrans %}
+          You must be a Project Administrator to make Subscription changes.
+        {% endblocktrans %}
+      </div>
+    {% endif %}
+    <div class="btn-toolbar">
+      <a href="https://wiki.commcarehq.org/display/commcarepublic/CommCare+Plan+Details"
+         class="btn btn-outline-primary" target="_blank">{% trans 'Read more about our plans' %}</a>
+      {% if is_domain_admin %}
+        <a href="{{ change_subscription_url }}" class="btn btn-primary">{% trans 'Change My Plan' %}</a>
+      {% endif %}
+    </div>
+  {% endif %}
+{% endblock %}
diff --git a/corehq/apps/domain/views/accounting.py b/corehq/apps/domain/views/accounting.py
index aa2fde405f5d..d553e3b7587f 100644
--- a/corehq/apps/domain/views/accounting.py
+++ b/corehq/apps/domain/views/accounting.py
@@ -126,7 +126,7 @@
 
 class SubscriptionUpgradeRequiredView(LoginAndDomainMixin, BasePageView, DomainViewMixin):
     page_title = gettext_lazy("Upgrade Required")
-    template_name = "domain/insufficient_privilege_notification.html"
+    template_name = "domain/bootstrap3/insufficient_privilege_notification.html"
 
     @property
     def page_url(self):

From 6e7d2b3ee1382885577e47a0b27f57f8532b6045 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:40:03 +0000
Subject: [PATCH 032/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/transfer_domain.html, splitting templates"

---
 .../admin/{ => bootstrap3}/transfer_domain.html |  0
 .../admin/bootstrap5/transfer_domain.html       | 17 +++++++++++++++++
 corehq/apps/domain/views/internal.py            |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/transfer_domain.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/transfer_domain.html

diff --git a/corehq/apps/domain/templates/domain/admin/transfer_domain.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/transfer_domain.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/transfer_domain.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/transfer_domain.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/transfer_domain.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/transfer_domain.html
new file mode 100644
index 000000000000..fc81be4601dc
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/transfer_domain.html
@@ -0,0 +1,17 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load hq_shared_tags %}
+{% load crispy_forms_tags %}
+{% load i18n %}
+
+
+{% block page_content %}
+  <div class="page-header">  {# todo B5: css-page-header #}
+    <h3>
+      {% blocktrans %}
+        Use this to transfer your project to another user.
+      {% endblocktrans %}
+    </h3>
+  </div>
+  {% crispy form %}  {# todo B5: crispy #}
+{% endblock %}
+
diff --git a/corehq/apps/domain/views/internal.py b/corehq/apps/domain/views/internal.py
index 8b7c97e30086..b87443b342b2 100644
--- a/corehq/apps/domain/views/internal.py
+++ b/corehq/apps/domain/views/internal.py
@@ -322,7 +322,7 @@ def _get_rate_limits(scope, rate_limiter):
 class TransferDomainView(BaseAdminProjectSettingsView):
     urlname = 'transfer_domain_view'
     page_title = gettext_lazy("Transfer Project")
-    template_name = 'domain/admin/transfer_domain.html'
+    template_name = 'domain/admin/bootstrap3/transfer_domain.html'
 
     @property
     @memoized

From 80edf8becf3450ce4bd5ea5ca25c9766ce8f99d4 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:41:05 +0000
Subject: [PATCH 033/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/pro_bono/domain.html, splitting templates"

---
 .../domain/pro_bono/{ => bootstrap3}/domain.html          | 0
 .../templates/domain/pro_bono/bootstrap5/domain.html      | 8 ++++++++
 corehq/apps/domain/views/pro_bono.py                      | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/pro_bono/{ => bootstrap3}/domain.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/pro_bono/bootstrap5/domain.html

diff --git a/corehq/apps/domain/templates/domain/pro_bono/domain.html b/corehq/apps/domain/templates/domain/pro_bono/bootstrap3/domain.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/pro_bono/domain.html
rename to corehq/apps/domain/templates/domain/pro_bono/bootstrap3/domain.html
diff --git a/corehq/apps/domain/templates/domain/pro_bono/bootstrap5/domain.html b/corehq/apps/domain/templates/domain/pro_bono/bootstrap5/domain.html
new file mode 100644
index 000000000000..e5734285e89f
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/pro_bono/bootstrap5/domain.html
@@ -0,0 +1,8 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load hq_shared_tags %}
+
+{% requirejs_main_b5 'domain/js/pro-bono' %}
+
+{% block page_content %}
+  {% include 'domain/pro_bono/bootstrap5/page_content.html' %}
+{% endblock %}
diff --git a/corehq/apps/domain/views/pro_bono.py b/corehq/apps/domain/views/pro_bono.py
index 7d2346f5a465..d00c8d03139b 100644
--- a/corehq/apps/domain/views/pro_bono.py
+++ b/corehq/apps/domain/views/pro_bono.py
@@ -57,7 +57,7 @@ def requesting_domain(self):
 
 
 class ProBonoView(ProBonoMixin, DomainAccountingSettings):
-    template_name = 'domain/pro_bono/domain.html'
+    template_name = 'domain/pro_bono/bootstrap3/domain.html'
     urlname = 'pro_bono'
     use_domain_field = False
 

From ecc598da7951cff2b8fd8d1489dae2d4adf69e15 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:41:50 +0000
Subject: [PATCH 034/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/project_limits.html, splitting templates"

---
 .../domain/admin/{ => bootstrap3}/project_limits.html  |  0
 .../domain/admin/bootstrap5/project_limits.html        | 10 ++++++++++
 corehq/apps/domain/views/internal.py                   |  2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/project_limits.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/project_limits.html

diff --git a/corehq/apps/domain/templates/domain/admin/project_limits.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/project_limits.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/project_limits.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/project_limits.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/project_limits.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/project_limits.html
new file mode 100644
index 000000000000..f675e86c2d54
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/project_limits.html
@@ -0,0 +1,10 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load hq_shared_tags %}
+
+{% block page_content %}
+
+  {% initial_page_data 'domain' domain %}
+
+  {% include "domain/admin/partials/project_limits_table.html" %}
+
+{% endblock %}
diff --git a/corehq/apps/domain/views/internal.py b/corehq/apps/domain/views/internal.py
index b87443b342b2..4683db4c5365 100644
--- a/corehq/apps/domain/views/internal.py
+++ b/corehq/apps/domain/views/internal.py
@@ -289,7 +289,7 @@ def page_context(self):
 class ProjectLimitsView(BaseAdminProjectSettingsView):
     urlname = 'internal_project_limits_summary'
     page_title = gettext_lazy("Project Limits")
-    template_name = 'domain/admin/project_limits.html'
+    template_name = 'domain/admin/bootstrap3/project_limits.html'
 
     @property
     def page_context(self):

From 1e9403f6cf90f6105ea397e397b8c21007d84e3d Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:42:32 +0000
Subject: [PATCH 035/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/manage_alerts.html, splitting templates"

---
 .../admin/{ => bootstrap3}/manage_alerts.html |   0
 .../admin/bootstrap5/manage_alerts.html       | 104 ++++++++++++++++++
 corehq/apps/domain/views/settings.py          |   2 +-
 3 files changed, 105 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/manage_alerts.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/manage_alerts.html

diff --git a/corehq/apps/domain/templates/domain/admin/manage_alerts.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/manage_alerts.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/manage_alerts.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/manage_alerts.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/manage_alerts.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/manage_alerts.html
new file mode 100644
index 000000000000..b7428d991fcb
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/manage_alerts.html
@@ -0,0 +1,104 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load crispy_forms_tags %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{% requirejs_main_b5 "domain/js/manage_alerts" %}
+
+{% block page_content %}
+    {% initial_page_data 'alerts' alerts %}
+    {% registerurl 'domain_edit_alert' domain '---' %}
+
+    <form class="form form-horizontal" method="post">
+      <fieldset>
+        <legend>{% trans 'Add New Alert' %}</legend>
+        {% crispy form %}  {# todo B5: crispy #}
+      </fieldset>
+    </form>
+    <div id="ko-alert-container">
+      <h3>
+        {% trans "Available Alerts" %}
+      </h3>
+      <p>
+        {% trans "You can only have 3 alerts activated at any one time" %}
+      </p>
+      <table class="table">
+        <thead>
+          <tr>
+            <th>
+              {% trans "Start Time" %}
+            </th>
+            <th>
+              {% trans "End Time" %}
+            </th>
+            <th>
+              {% trans "Message" %}
+            </th>
+            <th>
+              {% trans "Added By" %}
+            </th>
+            <th>
+              {% trans "Actions" %}
+            </th>
+          </tr>
+        </thead>
+        {% if alerts %}
+        <tbody data-bind="foreach: alerts">
+          <tr>
+            <td data-bind="text: start_time"></td>
+            <td data-bind="text: end_time"></td>
+            <td>
+              <div class="alert alert-warning"
+                   data-bind="html: html"></div>
+            </td>
+            <td data-bind="text: created_by_user">
+            </td>
+            <td>
+              <form action="{% url 'update_domain_alert_status' domain %}" method="post" style="float: left; margin-right: 5px;">  {# todo B5: inline-style #}
+                {% csrf_token %}
+                <input name="alert_id"
+                       type="hidden"
+                       data-bind="value: id">
+                <button type="submit"
+                        class="btn btn-primary"
+                        name="command"
+                        value="activate"
+                        data-bind="hidden: active">
+                  <span>{% trans "Activate Alert" %}</span>
+                </button>
+                <button type="submit"
+                        class="btn btn-outline-danger"
+                        name="command"
+                        value="deactivate"
+                        data-bind="visible: active">
+                  {% trans "De-activate Alert" %}
+                </button>
+              </form>
+              <a class="btn btn-outline-primary" data-bind="attr: {href: editUrl}" style="float: left; margin-right: 5px;">  {# todo B5: inline-style #}
+                <i class="fa fa-edit"></i>
+                {% trans "Edit" %}
+              </a>
+              <form action="{% url 'delete_domain_alert' domain %}" method="post" style="float: left">  {# todo B5: inline-style #}
+                {% csrf_token %}
+                <input name="alert_id"
+                       type="hidden"
+                       data-bind="value: id">
+                <button type="submit"
+                      class="btn btn-outline-danger">
+                  <i class="fa fa-trash"></i>
+                  {% trans "Delete" %}
+                </button>
+              </form>
+            </td>
+          </tr>
+        </tbody>
+        {% else %}
+        <tbody>
+          <tr>
+            <td>{% trans "No alerts added yet for the project." %}</td>
+          </tr>
+        </tbody>
+        {% endif %}
+      </table>
+    </div>
+{% endblock %}
diff --git a/corehq/apps/domain/views/settings.py b/corehq/apps/domain/views/settings.py
index de9edb6329fa..227de2eb6a02 100644
--- a/corehq/apps/domain/views/settings.py
+++ b/corehq/apps/domain/views/settings.py
@@ -548,7 +548,7 @@ def _convert_server_time_to_user_time(timestamp, timezone):
 
 
 class ManageDomainAlertsView(BaseDomainAlertsView):
-    template_name = 'domain/admin/manage_alerts.html'
+    template_name = 'domain/admin/bootstrap3/manage_alerts.html'
     urlname = 'domain_manage_alerts'
     page_title = gettext_lazy("Manage Project Alerts")
 

From 555978242bfe1ec5d3f5e3d6f53688b9017752b9 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:46:35 +0000
Subject: [PATCH 036/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/current_subscription.html, splitting templates"

---
 .../current_subscription.html                 |   0
 .../bootstrap5/current_subscription.html      | 395 ++++++++++++++++++
 corehq/apps/domain/views/accounting.py        |   2 +-
 3 files changed, 396 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/current_subscription.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/current_subscription.html

diff --git a/corehq/apps/domain/templates/domain/current_subscription.html b/corehq/apps/domain/templates/domain/bootstrap3/current_subscription.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/current_subscription.html
rename to corehq/apps/domain/templates/domain/bootstrap3/current_subscription.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/current_subscription.html b/corehq/apps/domain/templates/domain/bootstrap5/current_subscription.html
new file mode 100644
index 000000000000..ca87ebfdecbb
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/current_subscription.html
@@ -0,0 +1,395 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{% requirejs_main_b5 'domain/js/current_subscription' %}
+
+{% block page_content %}
+  {% initial_page_data "stripe_public_key" stripe_public_key %}
+  {% initial_page_data "payment_error_messages" payment_error_messages %}
+  {% initial_page_data "wire_email" user_email %}
+  {% initial_page_data "plan" plan %}
+  {% initial_page_data "can_purchase_credits" can_purchase_credits %}
+  {% initial_page_data "can_change_subscription" can_change_subscription %}
+  {% registerurl "domain_credits_payment" domain %}
+  {% registerurl "domain_wire_payment" domain %}
+
+  <div class="row">
+    <div class="col-md-12">
+      <article id="subscriptionSummary" class="form-horizontal">
+        <legend>{% trans 'Current Subscription' %}</legend>
+        <div class="form-group">  {# todo B5: css-form-group #}
+          <label class="form-label col-md-2">{% trans 'Plan' %}</label>
+          <div class="col-md-10">
+            <div class="{{ plan.css_class }}">
+              <h4>
+                {% if plan.is_paused %}
+                  {% blocktrans %}
+                    Your Subscription is Paused
+                  {% endblocktrans %}
+                {% elif plan.is_trial %}
+                  {{ plan.trial_length }}{% trans ' Day Trial' %}
+                {% else %}
+                  {{ plan.name }}
+                {% endif %}
+              </h4>
+              <p><i class="fa fa-info-circle"></i>
+                {% if plan.is_paused %}
+                  {% blocktrans with date_paused=plan.date_start pe=plan.previous_subscription_edition %}
+                    Your {{ pe }} Edition subscription was paused on {{ date_paused }}. Please subscribe to a plan to gain access to your project again.
+                  {% endblocktrans %}
+                {% elif plan.is_trial %}
+                  {% blocktrans with pn=plan.name trial_length=plan.trial_length %}
+                    The {{ trial_length }} Day Trial includes all the features present in the
+                    {{ pn }} Software Plan, which is our full set of features.
+                  {% endblocktrans %}
+                {% else %}{{ plan.description }}{% endif %}</p>
+            </div>
+            {% if plan.do_not_invoice and not plan.is_paused %}
+              <div class="alert alert-info">
+                {% blocktrans %}
+                  <strong>Note:</strong> This subscription will not be invoiced.
+                {% endblocktrans %}
+              </div>
+            {% endif %}
+            {% if can_change_subscription %}
+              {% if plan.is_annual_plan %}
+                <form action="{% url 'annual_plan_request_quote' domain %}">
+                  <div style="margin-top:10px;">  {# todo B5: inline-style #}
+                    <label class="form-label">{% trans "Got questions about your plan?" %}</label>
+                    <button class="btn btn-primary btn-lg">
+                      {% trans 'Talk to Sales' %}
+                    </button>
+                  </div>
+                </form>
+              {% else %}
+                <p>
+                  <a class="btn btn-primary" style="margin-top:10px;" href="{{ change_plan_url }}">  {# todo B5: inline-style #}
+                    {% if plan.is_paused %}
+                      {% trans "Subscribe to Plan" %}
+                    {% else %}
+                      {% trans "Change Plan" %}
+                    {% endif %}
+                  </a>
+                </p>
+              {% endif %}
+              {% if plan.next_subscription.exists and plan.next_subscription.is_paused %}
+                <div class="alert alert-warning">
+                  <i class="fa fa-warning"></i>
+                  {% blocktrans with plan.next_subscription.date_start as next_date %}
+                    This subscription will be paused on {{ next_date }}.
+                  {% endblocktrans %}
+                </div>
+              {% endif %}
+            {% endif %}
+
+            {% if plan.is_trial %}
+              <div class="alert alert-info">
+                <i class="fa fa-info-circle"></i>
+                {% blocktrans with plan.date_end as date_end %}
+                  Your trial expires on {{ date_end }}.
+                {% endblocktrans %}
+              </div>
+            {% endif %}
+          </div>
+        </div>
+        {% if not plan.is_trial and not plan.is_paused %}
+          {% if plan.date_start %}
+            <div class="form-group">  {# todo B5: css-form-group #}
+              <label class="form-label col-md-2">{% trans 'Date Started' %}</label>
+              <div class="col-md-10">
+                <p class="form-control-text">{{ plan.date_start }}</p>
+              </div>
+            </div>
+          {% endif %}
+          {% if plan.date_end %}
+            <div class="form-group">  {# todo B5: css-form-group #}
+              <label class="form-label col-md-2">{% trans 'Date Ending' %}</label>
+              <div class="col-md-10">
+                <p class="form-control-text">{{ plan.date_end }}</p>
+                {% if plan.next_subscription.can_renew %}
+                  <a href="{{ plan.next_subscription.renew_url }}"
+                     class="btn btn-primary">
+                    {% trans "Renew Plan" %}
+                  </a>
+                {% endif %}
+              </div>
+            </div>
+          {% endif %}
+          <div data-bind="foreach: products">
+            <div class="form-group">  {# todo B5: css-form-group #}
+              <label class="form-label col-md-2">{% trans 'Current Price' %}</label>
+              <div class="col-md-10">
+                <p class="form-control-text"
+                   data-bind="text: monthlyFee"></p>
+              </div>
+            </div>
+          </div>
+        {% endif %}
+        {% if plan.next_subscription.exists and not plan.next_subscription.is_paused %}
+          <div class="form-group">  {# todo B5: css-form-group #}
+            <label class="form-label col-md-2">
+              {% trans "Next Subscription Begins" %}
+            </label>
+            <div class="col-md-10">
+              <p class="form-control-text">
+                {{ plan.next_subscription.date_start }}
+              </p>
+            </div>
+          </div>
+          <div class="form-group">  {# todo B5: css-form-group #}
+            <label class="form-label col-md-2">
+              {% trans "Next Subscription Plan" %}
+            </label>
+            <div class="col-md-10">
+              <p class="form-control-text">
+                {{ plan.next_subscription.name }}
+              </p>
+            </div>
+          </div>
+          <div class="form-group">  {# todo B5: css-form-group #}
+            <label class="form-label col-md-2">
+              {% trans "Next Subscription Price" %}
+            </label>
+            <div class="col-md-10">
+              <p class="form-control-text">
+                {{ plan.next_subscription.price }}
+              </p>
+            </div>
+          </div>
+        {% endif %}
+        {% if plan.has_account_level_credit %}
+          <legend>{% trans 'Subscription Credit' %}</legend>
+        {% endif %}
+        <div class="form form-horizontal">
+          {% if plan.has_credits_in_non_general_credit_line %}
+            <div data-bind="foreach: products">
+              <div class="form-group">  {# todo B5: css-form-group #}
+                <label class="form-label col-md-2">
+                  {% trans 'Plan Credit' %}
+                </label>
+                <div class="col-md-10">
+                  <p class="form-control-text" data-bind="text: amount"></p>
+                </div>
+              </div>
+            </div>
+          {% endif %}
+          {% if plan.general_credit and plan.general_credit.is_visible or not plan.has_credits_in_non_general_credit_line %}
+            <div class="form-group">  {# todo B5: css-form-group #}
+              <label class="form-label col-md-2">
+                {% if plan.has_credits_in_non_general_credit_line %}
+                  {% trans 'General Credit' %}
+                {% else %}
+                  {% trans 'Credits Remaining' %}
+                {% endif %}
+              </label>
+              <div class="col-md-10">
+                <p class="form-control-text js-general-credit">{{ plan.general_credit.amount }}</p>
+              </div>
+            </div>
+          {% endif %}
+          <div data-bind="with: prepayments">
+            <div class="form-group">  {# todo B5: css-form-group #}
+              <div class="col-md-10 offset-md-2">
+                {% if can_purchase_credits %}
+                  <button type="button"
+                          class="btn btn-primary"
+                          data-bs-toggle="modal"
+                          data-bs-target="#paymentModal"
+                          data-bind="click: function(){triggerPayment($root.paymentHandler.CREDIT_CARD)}">
+                    {% trans 'Prepay by Credit Card' %}
+                  </button>
+                  <button type="button"
+                          class="btn btn-outline-primary"
+                          data-bs-toggle="modal"
+                          data-bs-target="#paymentModal"
+                          data-bind="click: function(){triggerPayment($root.paymentHandler.WIRE)}">
+                    {% trans 'Generate Prepayment Invoice' %}
+                  </button>
+                {% else %}
+                  <span class="badge text-bg-secondary">
+                                        <i class="fa fa-info-circle"></i>
+                                        {% trans "Not Billing Admin, Can't Add Credit" %}
+                                    </span>
+                {% endif %}
+              </div>
+            </div>
+          </div>
+        </div>
+        {% if plan.has_account_level_credit %}
+          <legend>{% trans 'Account Credit' %}</legend>
+          <div class="form form-horizontal">
+            <div data-bind="foreach: products">
+              <div class="form-group" data-bind="visible: isAccountVisible">  {# todo B5: css-form-group #}
+                <label class="form-label col-md-2">
+                  {% trans 'Plan Credit' %}
+                  <div class="hq-help">
+                    <a href="#"
+                       data-content="This is credit that can be applied to your software plan.
+                                            It's likely that someone from Dimagi added these credits for you."
+                       data-title="Account Plan Credit"
+                       data-original-title=""
+                       title="">
+                      <i class="fa fa-question-circle"></i>
+                    </a>
+                  </div>
+                </label>
+                <div class="col-md-10">
+                  <p class="form-control-text" data-bind="text: accountAmount"></p>
+                </div>
+              </div>
+            </div>
+            {% if plan.account_general_credit and plan.account_general_credit.is_visible %}
+              <div class="form-group">  {# todo B5: css-form-group #}
+                <label class="form-label col-md-2">
+                  {% trans 'General Credit' %}
+                  <div class="hq-help">
+                    <a href="#"
+                       data-content="This is credit that can be applied to either your software
+                                            plan or the features below. It's likely that someone from Dimagi added
+                                            these credits for you."
+                       data-title="Account General Credit"
+                       data-original-title=""
+                       title="">
+                      <i class="fa fa-question-circle"></i>
+                    </a>
+                  </div>
+                </label>
+                <div class="col-md-10">
+                  <p class="form-control-text">{{ plan.account_general_credit.amount }}</p>
+                </div>
+              </div>
+            {% endif %}
+          </div>
+        {% endif %}
+        {% if not plan.is_paused %}
+          <legend>{% trans 'Usage Summary' %}</legend>
+          {% if plan.has_credits_in_non_general_credit_line %}
+            <table class="table table-bordered table-striped">
+              <thead>
+              <tr>
+                <th>{% trans "Feature" %}</th>
+                <th>{% trans "Current Use" %}</th>
+                <th>{% trans "Remaining" %}</th>
+                <th>{% trans "Credits Available" %}</th>
+                {% if show_account_credits %}
+                  <th>{% trans "Account Credits Available" %}</th>
+                {% endif %}
+              </tr>
+              </thead>
+              <tbody data-bind="foreach: features">
+              <tr>
+                <td data-bind="text: name"></td>
+                <td data-bind="text: usage"></td>
+                <td data-bind="text: remaining"></td>
+                <td data-bind="text: amount"></td>
+                {% if show_account_credits %}
+                  <td data-bind="text: accountAmount"></td>
+                {% endif %}
+              </tr>
+              </tbody>
+            </table>
+          {% else %}
+            <table class="table table-bordered table-striped">
+              <thead>
+              <tr>
+                <th>{% trans "Feature" %}</th>
+                <th>{% trans "Included in Software Plan" %}</th>
+                <th>{% trans "Current Usage" %}</th>
+                {% if show_account_credits %}
+                  <th>{% trans "Account Credits Available" %}</th>
+                {% endif %}
+              </tr>
+              </thead>
+              <tbody data-bind="foreach: features">
+              <tr>
+                <td data-bind="text: name"></td>
+                <td data-bind="text: limit"></td>
+                <td data-bind="text: usage"></td>
+                {% if show_account_credits %}
+                  <td data-bind="text: accountAmount"></td>
+                {% endif %}
+              </tr>
+              </tbody>
+            </table>
+          {% endif %}
+        {% endif %}
+      </article>
+    </div>
+  </div>
+
+  {% include 'accounting/partials/stripe_card_ko_template.html' %}
+
+  <script type="text/html" id="cost-item-template">
+    <fieldset>
+      <legend>
+        {% trans 'Prepayment Amount' %}
+      </legend>
+
+      <div class="alert alert-info">
+        {% trans 'One credit is equivalent to one USD. Credits are applied to monthly invoices' %}
+      </div>
+
+      <div data-bind="with: general_credit">
+        <div class="form-group">  {# todo B5: css-form-group #}
+          <label class="form-label col-md-2">
+            <span data-bind="text: name"></span>
+          </label>
+          <div class="col-md-10">
+            <div class="input-group">
+              <span class="input-group-addon">$</span>  {# todo B5: css-input-group-addon #}
+              <input type="text"
+                     class="form-control"
+                     data-bind="
+                                   attr:{name: creditType},
+                                   textInput: addAmount" />
+            </div>
+            <div class="alert alert-danger"
+                 data-bind="visible: !addAmountValid()">
+              <i class="fa-solid fa-triangle-exclamation"></i>
+              <span>{% blocktrans %}
+                Please enter an amount that's either $0 or  greater than $0.5
+              {% endblocktrans %}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="form-group">  {# todo B5: css-form-group #}
+        <label class="form-label col-md-2">
+          {% trans 'Total Credits' %}
+        </label>
+        <div class="col-md-10">
+          <p class="form-control-text" data-bind="text: ('$ ' + amount())"></p>
+        </div>
+      </div>
+      <input type="hidden" name="amount" data-bind="value: amount" />
+    </fieldset>
+  </script>
+
+  <script type="text/html" id="payment-method-modal-title">
+    <!-- ko if: $root.paymentMethod() === $root.CREDIT_CARD -->
+    {% trans 'Prepay by Credit Card' %}
+    <!-- /ko -->
+    <!-- ko if: $root.paymentMethod() === $root.WIRE -->
+    {% trans 'Generate Prepayment Invoice' %}
+    <!-- /ko -->
+  </script>
+
+  <script type="text/html" id="payment-complete-template">
+    <!-- ko if: $root.paymentMethod() === $root.CREDIT_CARD -->
+    {% trans "Thank you for your payment!" %}
+    <!-- /ko -->
+    <!-- ko if: $root.paymentMethod() === $root.WIRE -->
+    {% blocktrans %}
+      Thank you! You will receive an invoice via email with instructions for wire payment.
+      Please include the invoice ID in the wire payment details.
+    {% endblocktrans %}
+    <!-- /ko -->
+  </script>
+
+{% endblock %}
+
+{% block modals %}{{ block.super }}
+  {% include 'domain/partials/bootstrap5/payment_modal.html' with payment_modal_id="paymentModal" title_template="payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment-complete-template" %}
+{% endblock %}
diff --git a/corehq/apps/domain/views/accounting.py b/corehq/apps/domain/views/accounting.py
index d553e3b7587f..201c1678a10c 100644
--- a/corehq/apps/domain/views/accounting.py
+++ b/corehq/apps/domain/views/accounting.py
@@ -202,7 +202,7 @@ def main_context(self):
 
 class DomainSubscriptionView(DomainAccountingSettings):
     urlname = 'domain_subscription_view'
-    template_name = 'domain/current_subscription.html'
+    template_name = 'domain/bootstrap3/current_subscription.html'
     page_title = gettext_lazy("Current Subscription")
 
     @property

From 65ea295d6e2f425a897200107e4304c698b819b8 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:46:47 +0000
Subject: [PATCH 037/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/internal_subscription_management.html, splitting templates"

---
 .../internal_subscription_management.html     |  0
 .../internal_subscription_management.html     | 37 +++++++++++++++++++
 corehq/apps/domain/views/accounting.py        |  2 +-
 3 files changed, 38 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/internal_subscription_management.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/internal_subscription_management.html

diff --git a/corehq/apps/domain/templates/domain/internal_subscription_management.html b/corehq/apps/domain/templates/domain/bootstrap3/internal_subscription_management.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/internal_subscription_management.html
rename to corehq/apps/domain/templates/domain/bootstrap3/internal_subscription_management.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/internal_subscription_management.html b/corehq/apps/domain/templates/domain/bootstrap5/internal_subscription_management.html
new file mode 100644
index 000000000000..c1d457031c38
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/internal_subscription_management.html
@@ -0,0 +1,37 @@
+{% extends 'hqwebapp/bootstrap5/base_section.html' %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+{% load hq_shared_tags %}
+
+{% requirejs_main_b5 'domain/js/internal_subscription_management' %}
+
+{% block page_content %}
+  {% blocktrans %}
+    <p>
+      This page is visible to Dimagi employees only (you have an @dimagi.com email address).  You can use this page
+      to set up a subscription for this project space.
+
+      Use this tool only for projects that are:
+    <ul>
+      <li>an internal test project</li>
+      <li>part of a contracted project</li>
+      <li>a short term extended trial for biz dev</li>
+    </ul>
+    </p>
+
+    <h3>
+      Your project is currently subscribed to {{ plan_name }}.
+    </h3>
+  {% endblocktrans %}
+
+  <div id="subscription_management">
+    {% crispy select_subscription_type_form %}  {# todo B5: crispy #}
+
+    {% for form in subscription_management_forms %}
+      <div data-bind="visible: subscriptionType() == '{{ form.slug }}'">
+        {% crispy form %}  {# todo B5: crispy #}
+      </div>
+    {% endfor %}
+  </div>
+
+{% endblock %}
diff --git a/corehq/apps/domain/views/accounting.py b/corehq/apps/domain/views/accounting.py
index 201c1678a10c..87fbd9506ae2 100644
--- a/corehq/apps/domain/views/accounting.py
+++ b/corehq/apps/domain/views/accounting.py
@@ -866,7 +866,7 @@ def get(self, request, *args, **kwargs):
 
 
 class InternalSubscriptionManagementView(BaseAdminProjectSettingsView):
-    template_name = 'domain/internal_subscription_management.html'
+    template_name = 'domain/bootstrap3/internal_subscription_management.html'
     urlname = 'internal_subscription_mgmt'
     page_title = gettext_lazy("Dimagi Internal Subscription Management")
     form_classes = INTERNAL_SUBSCRIPTION_MANAGEMENT_FORMS

From abfe58cca3db5e2c35d8a2cc2c6ce7e71d1ce935 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:47:37 +0000
Subject: [PATCH 038/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/partials/restrictive_license.html, splitting templates"

---
 .../bootstrap5/restrictive_license.html       | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 corehq/apps/domain/templates/domain/partials/bootstrap5/restrictive_license.html

diff --git a/corehq/apps/domain/templates/domain/partials/bootstrap5/restrictive_license.html b/corehq/apps/domain/templates/domain/partials/bootstrap5/restrictive_license.html
new file mode 100644
index 000000000000..17a1101b1970
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/partials/bootstrap5/restrictive_license.html
@@ -0,0 +1,37 @@
+{% load i18n %}
+{% blocktrans %}
+  This license doesn't cover all your multimedia.
+{% endblocktrans %}
+<a data-bs-toggle="modal" href="#restrictive-license-notice">{% trans 'More info...' %}</a>
+<div class="modal fade" id="restrictive-license-notice">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <a class="btn-close" href="#" data-bs-dismiss="modal">&times;</a>  {# todo B5: css-close #}
+        <h4 class="modal-title">{% trans 'Select a more restrictive license' %}</h4>
+      </div>
+      <div class="modal-body">
+        <p>
+          {% blocktrans %}
+            Since you've opted to publish your multimedia along with your app,
+            you must select a license that is more restrictive than the multimedia in the app.
+          {% endblocktrans %}
+        </p>
+        <p>
+          {% blocktrans %}
+            To satisfy this condition, you can either decide not to publish the multimedia
+            or select one of the following licenses:
+          {% endblocktrans %}
+        </p>
+        <ul>
+          {% for license in licenses %}
+            <p class="text-info text-center">{{ license }}</p>
+          {% endfor %}
+        </ul>
+      </div>
+      <div class="modal-footer">
+        <a href="#" class="btn btn-outline-primary" data-bs-dismiss="modal">Close</a>
+      </div>
+    </div>
+  </div>
+</div>

From 3aa3e3b01a0dc83ded47dcb980d0f0a15cd03274 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:47:49 +0000
Subject: [PATCH 039/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/partials/project_limits_table.html, splitting templates"

---
 .../admin/bootstrap3/project_limits.html      |  2 +-
 .../admin/bootstrap5/project_limits.html      |  2 +-
 .../project_limits_table.html                 |  0
 .../bootstrap5/project_limits_table.html      | 38 +++++++++++++++++++
 .../templates/hqadmin/global_thresholds.html  |  2 +-
 5 files changed, 41 insertions(+), 3 deletions(-)
 rename corehq/apps/domain/templates/domain/admin/partials/{ => bootstrap3}/project_limits_table.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/partials/bootstrap5/project_limits_table.html

diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap3/project_limits.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/project_limits.html
index ba5f3a0ff58f..c41d0d1377a8 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap3/project_limits.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap3/project_limits.html
@@ -5,6 +5,6 @@
 
   {% initial_page_data 'domain' domain %}
 
-  {% include "domain/admin/partials/project_limits_table.html" %}
+  {% include "domain/admin/partials/bootstrap3/project_limits_table.html" %}
 
 {% endblock %}
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/project_limits.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/project_limits.html
index f675e86c2d54..cc4b23fb7ea6 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap5/project_limits.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/project_limits.html
@@ -5,6 +5,6 @@
 
   {% initial_page_data 'domain' domain %}
 
-  {% include "domain/admin/partials/project_limits_table.html" %}
+  {% include "domain/admin/partials/bootstrap5/project_limits_table.html" %}
 
 {% endblock %}
diff --git a/corehq/apps/domain/templates/domain/admin/partials/project_limits_table.html b/corehq/apps/domain/templates/domain/admin/partials/bootstrap3/project_limits_table.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/partials/project_limits_table.html
rename to corehq/apps/domain/templates/domain/admin/partials/bootstrap3/project_limits_table.html
diff --git a/corehq/apps/domain/templates/domain/admin/partials/bootstrap5/project_limits_table.html b/corehq/apps/domain/templates/domain/admin/partials/bootstrap5/project_limits_table.html
new file mode 100644
index 000000000000..6cb3dcc1263e
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/partials/bootstrap5/project_limits_table.html
@@ -0,0 +1,38 @@
+{% comment %}
+This page is for internal admin use only, and thus is not marked up for translation.
+If this page is ever converted to a user-facing UI
+or otherwise intended for a non-English-only audience, it should be translated.
+{% endcomment %}
+
+<div class="row">
+  <div class="col-md-10">
+    {% for header, rate_infos in project_limits %}
+    <h1>{{ header }}</h1>
+    <table class="table table-striped">
+      <thead>
+        <tr>
+          <th>Window Size</th>
+          <th>% Usage</th>
+          <th>Usage</th>
+          <th>Limit</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for rate_info in rate_infos %}
+        <tr>
+          <td>{{ rate_info.key }}</td>
+          <td>
+            {{ rate_info.percent_usage }}%
+            <div class="progress">  {# todo B5: css-progress #}
+              <div class="progress-bar progress-bar-striped" style="width: {{ rate_info.percent_usage }}%"></div>  {# todo B5: inline-style #}
+            </div>
+          </td>
+          <td>{{ rate_info.current_usage }}</td>
+          <td>{{ rate_info.limit }}</td>
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+    {% endfor %}
+  </div>
+</div>
diff --git a/corehq/apps/hqadmin/templates/hqadmin/global_thresholds.html b/corehq/apps/hqadmin/templates/hqadmin/global_thresholds.html
index 7ff8ad978204..610e22b16a2d 100644
--- a/corehq/apps/hqadmin/templates/hqadmin/global_thresholds.html
+++ b/corehq/apps/hqadmin/templates/hqadmin/global_thresholds.html
@@ -3,6 +3,6 @@
 
 {% block reportcontent %}
 
-  {% include "domain/admin/partials/project_limits_table.html" %}
+  {% include "domain/admin/partials/bootstrap3/project_limits_table.html" %}
 
 {% endblock %}

From ff96a52264e49e344bd2d4a8be5727697552b1fb Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:51:21 +0000
Subject: [PATCH 040/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/base_change_plan.html, splitting templates"

---
 .../{ => bootstrap3}/base_change_plan.html    |  0
 .../bootstrap3/confirm_billing_info.html      |  2 +-
 .../domain/bootstrap3/confirm_plan.html       |  2 +-
 .../confirm_subscription_renewal.html         |  2 +-
 .../domain/bootstrap3/renew_plan.html         |  2 +-
 .../domain/bootstrap5/base_change_plan.html   | 30 +++++++++++++++++++
 .../bootstrap5/confirm_billing_info.html      |  2 +-
 .../domain/bootstrap5/confirm_plan.html       |  2 +-
 .../confirm_subscription_renewal.html         |  2 +-
 .../domain/bootstrap5/renew_plan.html         |  2 +-
 .../domain/templates/domain/select_plan.html  |  2 +-
 .../domain/selected_plan_contact.html         |  2 +-
 12 files changed, 40 insertions(+), 10 deletions(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/base_change_plan.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/base_change_plan.html

diff --git a/corehq/apps/domain/templates/domain/base_change_plan.html b/corehq/apps/domain/templates/domain/bootstrap3/base_change_plan.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/base_change_plan.html
rename to corehq/apps/domain/templates/domain/bootstrap3/base_change_plan.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap3/confirm_billing_info.html b/corehq/apps/domain/templates/domain/bootstrap3/confirm_billing_info.html
index 33f41c448ec5..a757e5041f99 100644
--- a/corehq/apps/domain/templates/domain/bootstrap3/confirm_billing_info.html
+++ b/corehq/apps/domain/templates/domain/bootstrap3/confirm_billing_info.html
@@ -1,4 +1,4 @@
-{% extends "domain/base_change_plan.html" %}
+{% extends "domain/bootstrap3/base_change_plan.html" %}
 {% load crispy_forms_tags %}
 {% load hq_shared_tags %}
 {% load i18n %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap3/confirm_plan.html b/corehq/apps/domain/templates/domain/bootstrap3/confirm_plan.html
index 9d85be9b2b5e..42803337aece 100644
--- a/corehq/apps/domain/templates/domain/bootstrap3/confirm_plan.html
+++ b/corehq/apps/domain/templates/domain/bootstrap3/confirm_plan.html
@@ -1,4 +1,4 @@
-{% extends "domain/base_change_plan.html" %}
+{% extends "domain/bootstrap3/base_change_plan.html" %}
 {% load i18n %}
 {% load hq_shared_tags %}
 {% requirejs_main 'accounting/js/confirm_plan' %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap3/confirm_subscription_renewal.html b/corehq/apps/domain/templates/domain/bootstrap3/confirm_subscription_renewal.html
index dd8a3371aab4..fb1641b34d7c 100644
--- a/corehq/apps/domain/templates/domain/bootstrap3/confirm_subscription_renewal.html
+++ b/corehq/apps/domain/templates/domain/bootstrap3/confirm_subscription_renewal.html
@@ -1,4 +1,4 @@
-{% extends "domain/base_change_plan.html" %}
+{% extends "domain/bootstrap3/base_change_plan.html" %}
 {% load crispy_forms_tags %}
 {% load hq_shared_tags %}
 {% load i18n %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap3/renew_plan.html b/corehq/apps/domain/templates/domain/bootstrap3/renew_plan.html
index 9b48a1ebaaa0..e5e3c46b8a6c 100644
--- a/corehq/apps/domain/templates/domain/bootstrap3/renew_plan.html
+++ b/corehq/apps/domain/templates/domain/bootstrap3/renew_plan.html
@@ -1,4 +1,4 @@
-{% extends "domain/base_change_plan.html" %}
+{% extends "domain/bootstrap3/base_change_plan.html" %}
 {% load hq_shared_tags %}
 {% load i18n %}
 {% load compress %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/base_change_plan.html b/corehq/apps/domain/templates/domain/bootstrap5/base_change_plan.html
new file mode 100644
index 000000000000..e496f42ac9f7
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/base_change_plan.html
@@ -0,0 +1,30 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load i18n %}
+{% load hq_shared_tags %}
+{% load compress %}
+
+{% block stylesheets %}{{ block.super }}
+  {% compress css %}
+    <link type="text/less"
+          rel="stylesheet"
+          media="all"
+          href="{% static 'accounting/less/pricing.less' %}" />
+  {% endcompress %}
+{% endblock %}
+
+{% block page_content %}
+  {% block plan_breadcrumbs %}
+  <ol class="breadcrumb">  {# todo B5: css-breadcrumb #}
+    {% for step in steps %}
+      <li>
+        <a href="{{ step.url }}" class="breadcrumb-{{ forloop.counter }}">{{ step.title }}</a>
+      </li>
+    {% endfor %}
+  </ol>
+  {% endblock %}
+  <div class="select-plan-header">
+    <h2>{{ step_title }}</h2>
+  </div>
+  {% block form_content %}
+  {% endblock %}
+{% endblock %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/confirm_billing_info.html b/corehq/apps/domain/templates/domain/bootstrap5/confirm_billing_info.html
index 641dc6260602..12b1bdef12f0 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/confirm_billing_info.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/confirm_billing_info.html
@@ -1,4 +1,4 @@
-{% extends "domain/base_change_plan.html" %}
+{% extends "domain/bootstrap5/base_change_plan.html" %}
 {% load crispy_forms_tags %}
 {% load hq_shared_tags %}
 {% load i18n %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/confirm_plan.html b/corehq/apps/domain/templates/domain/bootstrap5/confirm_plan.html
index d7134be023b3..16699c59d563 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/confirm_plan.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/confirm_plan.html
@@ -1,4 +1,4 @@
-{% extends "domain/base_change_plan.html" %}
+{% extends "domain/bootstrap5/base_change_plan.html" %}
 {% load i18n %}
 {% load hq_shared_tags %}
 {% requirejs_main_b5 'accounting/js/confirm_plan' %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/confirm_subscription_renewal.html b/corehq/apps/domain/templates/domain/bootstrap5/confirm_subscription_renewal.html
index 9166ac561f98..58d9b04f14f2 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/confirm_subscription_renewal.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/confirm_subscription_renewal.html
@@ -1,4 +1,4 @@
-{% extends "domain/base_change_plan.html" %}
+{% extends "domain/bootstrap5/base_change_plan.html" %}
 {% load crispy_forms_tags %}
 {% load hq_shared_tags %}
 {% load i18n %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/renew_plan.html b/corehq/apps/domain/templates/domain/bootstrap5/renew_plan.html
index 6912137c82dd..b00b78e6366c 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/renew_plan.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/renew_plan.html
@@ -1,4 +1,4 @@
-{% extends "domain/base_change_plan.html" %}
+{% extends "domain/bootstrap5/base_change_plan.html" %}
 {% load hq_shared_tags %}
 {% load i18n %}
 {% load compress %}
diff --git a/corehq/apps/domain/templates/domain/select_plan.html b/corehq/apps/domain/templates/domain/select_plan.html
index c2ce7b4827ee..747694058e72 100644
--- a/corehq/apps/domain/templates/domain/select_plan.html
+++ b/corehq/apps/domain/templates/domain/select_plan.html
@@ -1,4 +1,4 @@
-{% extends "domain/base_change_plan.html" %}
+{% extends "domain/bootstrap3/base_change_plan.html" %}
 {% load hq_shared_tags %}
 {% load i18n %}
 {% load menu_tags %}
diff --git a/corehq/apps/domain/templates/domain/selected_plan_contact.html b/corehq/apps/domain/templates/domain/selected_plan_contact.html
index 7ffb5a9c5f0a..a9f83b213613 100644
--- a/corehq/apps/domain/templates/domain/selected_plan_contact.html
+++ b/corehq/apps/domain/templates/domain/selected_plan_contact.html
@@ -1,4 +1,4 @@
-{% extends "domain/base_change_plan.html" %}
+{% extends "domain/bootstrap3/base_change_plan.html" %}
 {% load crispy_forms_tags %}
 {% load i18n %}
 

From dff58753b1d240f0f24d5285da721e4fd9c8e198 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:53:18 +0000
Subject: [PATCH 041/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/selected_plan_contact.html, splitting templates"

---
 .../{ => bootstrap3}/selected_plan_contact.html   |  0
 .../domain/bootstrap5/selected_plan_contact.html  | 15 +++++++++++++++
 corehq/apps/domain/views/accounting.py            |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/selected_plan_contact.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/selected_plan_contact.html

diff --git a/corehq/apps/domain/templates/domain/selected_plan_contact.html b/corehq/apps/domain/templates/domain/bootstrap3/selected_plan_contact.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/selected_plan_contact.html
rename to corehq/apps/domain/templates/domain/bootstrap3/selected_plan_contact.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/selected_plan_contact.html b/corehq/apps/domain/templates/domain/bootstrap5/selected_plan_contact.html
new file mode 100644
index 000000000000..4d33af0560da
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/selected_plan_contact.html
@@ -0,0 +1,15 @@
+{% extends "domain/bootstrap5/base_change_plan.html" %}
+{% load crispy_forms_tags %}
+{% load i18n %}
+
+{% block form_content %}
+  <p class="lead text-center">
+    {{ lead_text }}
+  </p>
+
+  <div class="card card-modern-gray card-form-only">  {# todo B5: css-panel #}
+    <div class="card-body">
+      {% crispy contact_form %}  {# todo B5: crispy #}
+    </div>
+  </div>
+{% endblock %}
diff --git a/corehq/apps/domain/views/accounting.py b/corehq/apps/domain/views/accounting.py
index 87fbd9506ae2..2c1483408ed9 100644
--- a/corehq/apps/domain/views/accounting.py
+++ b/corehq/apps/domain/views/accounting.py
@@ -1107,7 +1107,7 @@ def can_change_subscription(self):
 
 
 class ContactFormViewBase(PlanViewBase):
-    template_name = 'domain/selected_plan_contact.html'
+    template_name = 'domain/bootstrap3/selected_plan_contact.html'
     step_title = gettext_lazy("Contact Dimagi")
     lead_text = gettext_lazy("Please submit the following form and a member of our sales team will be "
                              "in touch shortly about your plan.")

From 2f64ad85d59072414b946f45e4abec86b5de3b50 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:53:30 +0000
Subject: [PATCH 042/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/feature_previews.html, splitting templates"

---
 .../{ => bootstrap3}/feature_previews.html    |   0
 .../admin/bootstrap5/feature_previews.html    | 140 ++++++++++++++++++
 corehq/apps/domain/views/settings.py          |   2 +-
 3 files changed, 141 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/feature_previews.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/feature_previews.html

diff --git a/corehq/apps/domain/templates/domain/admin/feature_previews.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/feature_previews.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/feature_previews.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/feature_previews.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/feature_previews.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/feature_previews.html
new file mode 100644
index 000000000000..1efbf65cb4a4
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/feature_previews.html
@@ -0,0 +1,140 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load i18n %}
+{% load hq_shared_tags %}
+
+{% block page_content %}
+  <p class="lead">
+    {% trans "Feature Previews" %}
+  </p>
+  <div class="row">
+    <div class="col-lg-6">
+      <p class="help-block">
+        <strong>
+          {% trans "What are Feature Previews?" %}
+        </strong>
+        <br/>
+        {% blocktrans %}
+          Before we invest in making certain product features generally
+          available, we release them as Feature Previews to learn the
+          following two things from usage data and qualitative feedback.
+        {% endblocktrans %}
+      </p>
+      <ul>
+        <li>
+          <p class="help-block">
+            {% blocktrans %}
+              <strong>Perceived Value:</strong>
+              The biggest risk in product development is to
+              build something that offers little value to our users. As such,
+              we make Feature Previews generally available only if they have
+              high perceived value.
+            {% endblocktrans %}
+          </p>
+        </li>
+        <li>
+          <p class="help-block">
+            {% blocktrans %}
+              <strong>User Experience:</strong>
+              Even if a feature has high perceived value,
+              it is important that the user experience of the feature is
+              optimized such that our users actually receive the value.
+              As such, we make high value Feature Previews generally
+              available after we optimize the user experience.
+            {% endblocktrans %}
+          </p>
+        </li>
+      </ul>
+      <p class="help-block">
+        {% blocktrans %}
+          Feature Previews are in active product development, therefore
+          should not be used for business critical workflows. We encourage
+          you to use Feature Previews and provide us feedback, however
+          please note that Feature Previews:
+        {% endblocktrans %}
+      </p>
+      <ul>
+        <li>
+          <p class="help-block">
+            {% blocktrans %}
+              May not be optimized for performance
+            {% endblocktrans %}
+          </p>
+        </li>
+        <li>
+          <p class="help-block">
+            {% blocktrans %}
+              Are not supported by the CommCare Support Team
+            {% endblocktrans %}
+          </p>
+        </li>
+        <li>
+          <p class="help-block">
+            {% blocktrans %}
+              May change at any time without notice
+            {% endblocktrans %}
+          </p>
+        </li>
+        <li>
+          <p class="help-block">
+            {% blocktrans %}
+              Are not subject to any warranties on current and future
+              availability. Please refer to our
+              <a href="http://www.dimagi.com/terms/latest/tos/"
+                 target="_blank">terms</a> to
+              learn more.
+            {% endblocktrans %}
+          </p>
+        </li>
+      </ul>
+      <div class="alert alert-info">
+        <p>
+          {% blocktrans %}
+            Looking for something that used to be here?
+          {% endblocktrans %}
+        </p>
+        <p>
+          {% blocktrans %}
+            The feature flags <strong>Control Mapping in Case List</strong>,
+            <strong>Custom Calculations in Case List</strong>, <strong>Custom
+            Single and Multiple Answer Questions</strong>, and <strong>Icons in
+            Case List</strong> are now add-ons for individual apps. To turn
+            them on, go to the application's settings and choose the
+            <strong>Add-Ons</strong> tab.
+          {% endblocktrans %}
+        </p>
+      </div>
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col-md-10">
+      <form action="" method="post">
+        {% csrf_token %}
+        <button type="submit" class="btn btn-primary">{% trans "Update previews" %}</button>
+        <table class="table table-striped">
+          <thead>
+          <th class="col-md-3">{% trans "Feature Name" %}</th>
+          <th>{% trans "Description" %}</th>
+          <th>{% trans "Enable" %}</th>
+          </thead>
+          <tbody>
+          {% for feature, enabled in features %}
+            <tr>
+              <td>{{ feature.label }}</td>
+              <td>
+                {{ feature.description }}<br/>
+                {% if feature.help_link %}
+                  <a href="{{ feature.help_link }}" target="_blank">{% trans "More information" %}</a>
+                {% endif %}
+              </td>
+              <td>
+                <input type="checkbox" name="{{ feature.slug }}" {% if enabled %}checked{% endif %}/>  {# todo B5: css-checkbox #}
+              </td>
+            </tr>
+          {% endfor %}
+          </tbody>
+        </table>
+      </form>
+    </div>
+  </div>
+{% endblock %}
diff --git a/corehq/apps/domain/views/settings.py b/corehq/apps/domain/views/settings.py
index 227de2eb6a02..b71ba4d819ef 100644
--- a/corehq/apps/domain/views/settings.py
+++ b/corehq/apps/domain/views/settings.py
@@ -414,7 +414,7 @@ def page_context(self):
 class FeaturePreviewsView(BaseAdminProjectSettingsView):
     urlname = 'feature_previews'
     page_title = gettext_lazy("Feature Previews")
-    template_name = 'domain/admin/feature_previews.html'
+    template_name = 'domain/admin/bootstrap3/feature_previews.html'
 
     @method_decorator(domain_admin_required)
     def dispatch(self, request, *args, **kwargs):

From b0eee376308fdc4a696eb3edc58a3c0720752e7e Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:55:01 +0000
Subject: [PATCH 043/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/commtrack_action_table.html, splitting templates"

---
 .../commtrack_action_table.html               |  0
 .../bootstrap5/commtrack_action_table.html    | 31 +++++++++++++++++++
 .../templates/domain/admin/sms_settings.html  |  2 +-
 3 files changed, 32 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/commtrack_action_table.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/commtrack_action_table.html

diff --git a/corehq/apps/domain/templates/domain/admin/commtrack_action_table.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/commtrack_action_table.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/commtrack_action_table.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/commtrack_action_table.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/commtrack_action_table.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/commtrack_action_table.html
new file mode 100644
index 000000000000..5cc795aae177
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/commtrack_action_table.html
@@ -0,0 +1,31 @@
+{% load i18n %}
+<div class="card ">  {# todo B5: css-panel #}
+  <table class="table table-striped table-bordered">
+    <thead>
+    <tr>
+      <th>{% trans "Name" %}</th>
+      <th>{% trans "SMS Keyword" %}</th>
+      <th>{% trans "Action Type" %}</th>
+      <th></th>
+    </tr>
+    </thead>
+    <tbody data-bind="foreach: actions">
+    <tr>
+      <td class="form-group" data-bind="css: { 'has-error': captionError }">  {# todo B5: css-form-group, css-has-error #}
+        <input class="form-control" data-bind="value: caption" type="text" />
+        <div class="help-inline" data-bind="text: captionError"></div>
+      </td>
+      <td class="form-group" data-bind="css: { 'has-error': keywordError }">  {# todo B5: css-form-group, css-has-error #}
+        <input class="form-control" data-bind="value: keyword" type="text" />
+        <div class="help-inline" data-bind="text: keywordError"></div>
+      </td>
+      <td class="form-group">  {# todo B5: css-form-group #}
+        <select class="form-control" data-bind="value: type, options: $parent.action_types, optionsText: 'label', optionsValue: 'value'"></select>
+      </td>
+      <td>
+        <button type="button" class="btn btn-outline-danger" data-bind="click: $parent.remove_action"><i class="fa fa-remove"></i> {% trans "Remove" %}</button>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+</div>
diff --git a/corehq/apps/domain/templates/domain/admin/sms_settings.html b/corehq/apps/domain/templates/domain/admin/sms_settings.html
index 96720b3d968e..b0f48245abf2 100644
--- a/corehq/apps/domain/templates/domain/admin/sms_settings.html
+++ b/corehq/apps/domain/templates/domain/admin/sms_settings.html
@@ -12,7 +12,7 @@
     <fieldset>
       <legend>{% trans 'Stock Actions' %}</legend>
       <div class="{% css_field_class %}">
-        {% include "domain/admin/commtrack_action_table.html" %}
+        {% include "domain/admin/bootstrap3/commtrack_action_table.html" %}
         <button type="button" class="btn btn-outline-primary float-end" data-bind="click: new_action">
           <i class="fa fa-plus"></i> {% trans "New Action" %}
         </button>

From 5ed05fd577450af8a36bc70ba25e1ff7bb754846 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:55:38 +0000
Subject: [PATCH 044/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/manage_releases_by_location.html, splitting templates"

---
 .../manage_releases_by_location.html          |  0
 .../manage_releases_by_location.html          | 74 +++++++++++++++++++
 corehq/apps/domain/views/releases.py          |  2 +-
 3 files changed, 75 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/manage_releases_by_location.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/manage_releases_by_location.html

diff --git a/corehq/apps/domain/templates/domain/manage_releases_by_location.html b/corehq/apps/domain/templates/domain/bootstrap3/manage_releases_by_location.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/manage_releases_by_location.html
rename to corehq/apps/domain/templates/domain/bootstrap3/manage_releases_by_location.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/manage_releases_by_location.html b/corehq/apps/domain/templates/domain/bootstrap5/manage_releases_by_location.html
new file mode 100644
index 000000000000..7457e55a9880
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/manage_releases_by_location.html
@@ -0,0 +1,74 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load hq_shared_tags %}
+{% load crispy_forms_tags %}
+{% load i18n %}
+
+{% requirejs_main_b5 'app_manager/js/manage_releases_by_location' %}
+
+{% block page_content %}
+  {% initial_page_data 'app_releases_by_location' app_releases_by_location %}
+  {% initial_page_data 'appVersionSelectInitialValue' selected_build_details %}
+  {% initial_page_data 'locationSearchSelectInitialValue' selected_location_details %}
+  {% initial_page_data 'appVersionOnlyShowReleased' True %}
+  {% registerurl 'deactivate_release_restriction' domain '---'%}
+  {% registerurl 'activate_release_restriction' domain '---'%}
+  {% registerurl "paginate_releases" domain '---' %}
+  {% registerurl 'location_search' domain %}
+
+  <div class="row">
+    <div class="col-md-12">
+      <div class="card card-modern-gray card-form-only">  {# todo B5: css-panel #}
+        <div class="card-body">
+          <form class="form-horizontal disable-on-submit" id="manage-app-releases" action=""
+                method='post'>
+            {% crispy manage_releases_by_location_form %}  {# todo B5: crispy #}
+          </form>
+          {% if app_releases_by_location %}
+            <table id="managed-releases" class="table">
+              <thead>
+              <tr>
+                <th class="col-md-2">{% trans 'Application' %}</th>
+                <th class="col-md-2">{% trans 'Location' %}</th>
+                <th class="col-md-2">{% trans 'Version' %}</th>
+                <th class="col-md-4">{% trans 'Last Activity' %}</th>
+                <th class="col-md-2">{% trans 'Action' %}</th>
+              </tr>
+              </thead>
+              <tbody data-bind="foreach: appReleasesByLocation, visible: appReleasesByLocation">
+              <tr data-bind="attr: {id: domId}, css: {'bg-success': active() }">
+                <td data-bind="text: app"></td>
+                <td data-bind="text: location"></td>
+                <td data-bind="text: version"></td>
+                <td>
+                  <div data-bind="visible: activatedOn">
+                    {% trans 'Activated On : ' %}
+                    <span data-bind="text: activatedOn"></span>
+                  </div>
+                  <div data-bind="visible: deactivatedOn">
+                    {% trans 'Deactivated On : ' %}
+                    <span data-bind="text: deactivatedOn"></span>
+                  </div>
+                </td>
+                <td>
+                  <button type="button" class="btn btn-outline-primary"
+                          data-bind="click: toggleRestriction, css: buttonClass,
+                                            disable: ajaxInProgress">
+                    <span data-bind="text: actionText"></span>
+                    <i class="spinner fa-spin fa fa-refresh"
+                       data-bind="visible: ajaxInProgress"></i>
+                  </button>
+                  <br/>
+                  <span class="error-message badge text-bg-danger" data-bind="visible: error">
+                    {% trans 'Could not update!' %}
+                    <span data-bind="text: errorMessage"></span>
+                  </span>
+                </td>
+              </tr>
+              </tbody>
+            </table>
+          {% endif %}
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock %}
diff --git a/corehq/apps/domain/views/releases.py b/corehq/apps/domain/views/releases.py
index 1f7eed90af3b..20a196d30989 100644
--- a/corehq/apps/domain/views/releases.py
+++ b/corehq/apps/domain/views/releases.py
@@ -34,7 +34,7 @@
 @method_decorator([toggles.MANAGE_RELEASES_PER_LOCATION.required_decorator(),
                    require_can_edit_apps], name='dispatch')
 class ManageReleasesByLocation(BaseProjectSettingsView):
-    template_name = 'domain/manage_releases_by_location.html'
+    template_name = 'domain/bootstrap3/manage_releases_by_location.html'
     urlname = 'manage_releases_by_location'
     page_title = gettext_lazy("Manage Releases By Location")
 

From 6889f862904d96c6621c807fb93dcea57896384a Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:56:19 +0000
Subject: [PATCH 045/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/select_plan.html, splitting templates"

---
 .../domain/{ => bootstrap3}/select_plan.html  |   0
 .../domain/bootstrap5/select_plan.html        | 261 ++++++++++++++++++
 corehq/apps/domain/views/accounting.py        |   2 +-
 3 files changed, 262 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/select_plan.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/select_plan.html

diff --git a/corehq/apps/domain/templates/domain/select_plan.html b/corehq/apps/domain/templates/domain/bootstrap3/select_plan.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/select_plan.html
rename to corehq/apps/domain/templates/domain/bootstrap3/select_plan.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/select_plan.html b/corehq/apps/domain/templates/domain/bootstrap5/select_plan.html
new file mode 100644
index 000000000000..4d78bc5796df
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/select_plan.html
@@ -0,0 +1,261 @@
+{% extends "domain/bootstrap5/base_change_plan.html" %}
+{% load hq_shared_tags %}
+{% load i18n %}
+{% load menu_tags %}
+
+{% requirejs_main_b5 'accounting/js/pricing_table' %}
+
+{% block form_content %}
+  {% initial_page_data 'editions' editions %}
+  {% initial_page_data 'planOptions' plan_options %}
+  {% initial_page_data 'currentPlan' current_edition %}
+  {% initial_page_data 'is_renewal' is_renewal %}
+  {% initial_page_data 'start_date_after_minimum_subscription' start_date_after_minimum_subscription %}
+  {% initial_page_data 'subscription_below_minimum' subscription_below_minimum %}
+  {% initial_page_data 'next_subscription_edition' next_subscription_edition %}
+  {% initial_page_data 'invoicing_contact_email' INVOICING_CONTACT_EMAIL %}
+  {% initial_page_data 'current_price' current_price %}
+  {% initial_page_data 'is_price_discounted' is_price_discounted %}
+  {% registerurl 'email_on_downgrade' domain %}
+
+  <p class="lead text-center">
+    {{ lead_text }}
+    <a href="{% prelogin_url 'public_pricing' %}" target="_blank">
+      {% trans "Learn More" %}
+    </a>
+  </p>
+
+  <section id="plans" class="ko-template">
+
+    <p class="switch-label text-center">
+      {% trans "Pay Monthly" %}
+      <label class="switch">
+        <input type="checkbox" id="pricing-toggle" data-bind="{checked: oShowAnnualPricing}">  {# todo B5: css-checkbox #}
+        <span class="slider round slider-blue slider-blue-on"></span>
+      </label>
+      {% trans "Pay Annually" %}
+    </p>
+
+    <p class="text-center">
+      {% blocktrans %}
+        Save close to 20% when you pay annually.  {# todo B5: css-close #}
+      {% endblocktrans %}
+    </p>
+
+    <p class="refund-text text-center"
+       data-bind="css: oRefundCss">
+      <i class="fa fa-check"></i>
+      <a href="https://dimagi.com/terms/latest/tos/"
+         class="check-icon blue">
+        {% trans '90 day refund policy' %}
+      </a>
+    </p>
+
+    <div class="select-plan-row">
+      <!-- ko foreach: oPlanOptions -->
+      <div class="select-plan-col">
+        <a href="#"
+           class="tile"
+           data-bind="css: oCssClass, click: selectPlan">
+          <h3 data-bind="text: oName"></h3>
+          <p class="pricing-type"
+             data-bind="text: oPricingTypeText, css: oPricingTypeCssClass"></p>
+
+          <p class="plan-price" data-bind="text: oDisplayPrice"></p>
+          <p class="plan-monthly-label">
+            {% trans "monthly" %}
+            <span data-bind="visible: oDisplayDiscountNotice">({% trans 'discounted' %})</span>
+          </p>
+          <p class="plan-desc" data-bind="text: oDescription"></p>
+
+          <p class="plan-downgrade-notice text-warning"
+             data-bind="visible: oShowDowngradeNotice">
+            <i class="fa fa-warning"></i>
+            {% blocktrans %}
+              This plan will be downgrading to
+              <span data-bind="text: oNextPlan"></span> on
+              <span data-bind="text: oNextDate"></span>.
+            {% endblocktrans %}
+          </p>
+
+          <p class="plan-downgrade-notice text-warning"
+             data-bind="visible: oShowPausedNotice">
+            <i class="fa fa-warning"></i>
+            {% blocktrans %}
+              This plan will be pausing on<br />
+              <span data-bind="text: oNextDate"></span>.
+            {% endblocktrans %}
+          </p>
+
+          <div class="btn btn-current"
+               data-bind="visible: oIsCurrentPlan">
+            {% trans "Current Plan" %}
+          </div>
+
+          <div class="btn btn-select"
+               data-bind="visible: !oIsCurrentPlan()">
+            {% trans "Select Plan" %}
+          </div>
+        </a>
+      </div>
+      <!-- /ko -->
+    </div>
+
+    <div data-bind="visible: !oIsCurrentPlanCommunity() && !oIsNextPlanPaused() && !oIsCurrentPlanPaused()">
+      <a href="#"
+         class="tile tile-paused"
+         data-bind="click: selectPausedPlan, css: oPausedCss">
+        <h4 class="text-center">
+          {% blocktrans %}
+            Pause Subscription
+          {% endblocktrans %}
+        </h4>
+        <p>
+          {% blocktrans %}
+            What happens after you pause?
+          {% endblocktrans %}
+        </p>
+        <ul>
+          <li>
+            {% blocktrans %}
+              You will lose access to your project space, but you will be
+              able to re-subscribe anytime in the future.
+            {% endblocktrans %}
+          </li>
+          <li>
+            {% blocktrans %}
+              You will no longer be billed.
+            {% endblocktrans %}
+          </li>
+        </ul>
+      </a>
+    </div>
+
+    <div class="alert {% if can_domain_unpause %}alert-info{% else %}alert-danger{% endif %} text-center"
+         data-bind="visible: oIsCurrentPlanPaused">
+      <p class="lead">
+        {% if can_domain_unpause %}
+          <i class="fa-regular fa-circle-pause"></i>
+          {% blocktrans %}
+            Your subscription is currently paused.
+          {% endblocktrans %}
+        {% else %}
+          {% url 'domain_billing_statements' domain as url_statements %}
+          <i class="fa fa-warning"></i>
+          {% blocktrans %}
+            Your subscription is currently paused because you have
+            <a href="{{ url_statements }}">past-due invoices</a>.
+          {% endblocktrans %}
+            <br />
+          {% blocktrans %}
+            You will not be allowed to un-pause your project until
+            these invoices are paid.
+          {% endblocktrans %}
+        {% endif %}
+      </p>
+    </div>
+
+    <div class="alert alert-warning text-center"
+         data-bind="visible: oIsNextPlanPaused">
+      <i class="fa fa-warning"></i>
+      {% blocktrans %}
+        Your subscription will be pausing on
+        <span data-bind="text: oStartDateAfterMinimumSubscription"></span> unless
+        you select a different plan above.
+      {% endblocktrans %}
+    </div>
+
+    <div class="alert alert-warning text-center"
+         style="margin-top: 20px;"  {# todo B5: inline-style #}
+         data-bind="visible: oIsNextPlanDowngrade">
+      <i class="fa fa-warning"></i>
+      {% blocktrans %}
+        Your subscription will be downgrading to
+        <span data-bind="text: oNextSubscription"></span> on
+        <span data-bind="text: oStartDateAfterMinimumSubscription"></span> unless
+        you select a different plan above.
+      {% endblocktrans %}
+    </div>
+
+    <div class="community-plan-notice alert alert-info text-center"
+         data-bind="visible: oIsCurrentPlanCommunity">
+      <p class="lead">
+        {% blocktrans %}
+          You are currently on the FREE CommCare Community plan.
+        {% endblocktrans %}
+      </p>
+    </div>
+
+    <form
+      {% if is_renewal %}
+        action="{% url 'domain_subscription_renewal_confirmation' domain %}"
+      {% else %}
+        action="{% url 'confirm_selected_plan' domain %}"
+      {% endif %}
+        class="form"
+        id="select-plan-form"
+        method="post"
+        data-bind="visible: oShowNext"
+        style="display: none;"  {# todo B5: inline-style #}
+        action="{% url 'confirm_selected_plan' domain %}">
+      {% csrf_token %}
+      {% if is_renewal %}
+        <input type="hidden" name="from_plan_page" value="true">
+      {% endif %}
+
+      {% if can_domain_unpause %}
+        <input type="hidden" name="plan_edition" data-bind="value: oSelectedPlan">
+        <div class="text-center plan-next">
+          <button type="submit"
+                  class="btn btn-primary btn-lg"
+                  data-bind="click: openMinimumSubscriptionModal, disable: oIsSubmitDisabled">
+            {% trans 'Next' %}
+          </button>
+        </div>
+      {% else %}
+        <div class="text-center plan-next">
+          <button type="button"
+                  class="btn btn-primary btn-lg"
+                  disabled="disabled">
+            {% trans 'Next' %}
+          </button>
+        </div>
+      {% endif %}
+    </form>
+
+    <form action="{% url 'annual_plan_request_quote' domain %}"
+          data-bind="visible: !oShowNext()">
+      {% csrf_token %}
+      <input type="hidden" name="plan_edition" data-bind="value: oSelectedPlan">
+      <div class="text-center plan-next">
+        <button class="btn btn-primary btn-lg" data-bind="click: contactSales">
+          {% trans 'Talk to Sales' %}
+        </button>
+      </div>
+    </form>
+
+  </section>
+{% endblock %}
+
+{% block modals %}{{ block.super }}
+  <div class="modal fade" id="modal-minimum-subscription">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="btn-close" data-bs-dismiss="modal">  {# todo B5: css-close #}
+            <span aria-hidden="true">&times;</span>
+            <span class="sr-only">{% trans "Close" %}</span>
+          </button>
+          <h4 class="modal-title">Downgrading?</h4>
+        </div>
+        <div class="modal-body">
+          <br><br>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-primary" data-bs-dismiss="modal">{% trans "Dismiss" %}</button>
+          <button type="button" class="btn btn-outline-danger" data-bind="click: submitDowngradeForm">{% trans "Continue" %}</button>
+        </div>
+      </div>
+    </div>
+  </div>
+{% endblock %}
diff --git a/corehq/apps/domain/views/accounting.py b/corehq/apps/domain/views/accounting.py
index 2c1483408ed9..940bf8fbea5b 100644
--- a/corehq/apps/domain/views/accounting.py
+++ b/corehq/apps/domain/views/accounting.py
@@ -1090,7 +1090,7 @@ def page_context(self):
 
 
 class SelectPlanView(PlanViewBase):
-    template_name = 'domain/select_plan.html'
+    template_name = 'domain/bootstrap3/select_plan.html'
     urlname = 'domain_select_plan'
     step_title = gettext_lazy("Select Plan")
 

From 3b3e6190c19656dcf3b23d3dd490801b19036f55 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:56:40 +0000
Subject: [PATCH 046/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/location_fixture.html, splitting templates"

---
 .../domain/admin/{ => bootstrap3}/location_fixture.html    | 0
 .../domain/admin/bootstrap5/location_fixture.html          | 7 +++++++
 corehq/apps/domain/views/fixtures.py                       | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/location_fixture.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/location_fixture.html

diff --git a/corehq/apps/domain/templates/domain/admin/location_fixture.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/location_fixture.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/location_fixture.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/location_fixture.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/location_fixture.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/location_fixture.html
new file mode 100644
index 000000000000..f6f06763df0c
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/location_fixture.html
@@ -0,0 +1,7 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load crispy_forms_tags %}
+{% load i18n %}
+{% block page_content %}
+  <h1>{% trans "Location Fixture Settings" %}</h1>
+  {% crispy form %}  {# todo B5: crispy #}
+{% endblock %}
diff --git a/corehq/apps/domain/views/fixtures.py b/corehq/apps/domain/views/fixtures.py
index 61650a763638..0f9398a004cc 100644
--- a/corehq/apps/domain/views/fixtures.py
+++ b/corehq/apps/domain/views/fixtures.py
@@ -13,7 +13,7 @@
 class LocationFixtureConfigView(BaseAdminProjectSettingsView):
     urlname = 'location_fixture_config'
     page_title = gettext_lazy('Location Fixture')
-    template_name = 'domain/admin/location_fixture.html'
+    template_name = 'domain/admin/bootstrap3/location_fixture.html'
 
     @method_decorator(domain_admin_required)
     @method_decorator(toggles.HIERARCHICAL_LOCATION_FIXTURE.required_decorator())

From 312c29eac2542c1f43a8bf1fdeae708957e3b845 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:58:12 +0000
Subject: [PATCH 047/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/billing_statements.html, splitting templates"

---
 .../{ => bootstrap3}/billing_statements.html  |   0
 .../domain/bootstrap5/billing_statements.html | 198 ++++++++++++++++++
 corehq/apps/domain/views/accounting.py        |   2 +-
 corehq/apps/enterprise/views.py               |   2 +-
 4 files changed, 200 insertions(+), 2 deletions(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/billing_statements.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/billing_statements.html

diff --git a/corehq/apps/domain/templates/domain/billing_statements.html b/corehq/apps/domain/templates/domain/bootstrap3/billing_statements.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/billing_statements.html
rename to corehq/apps/domain/templates/domain/bootstrap3/billing_statements.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/billing_statements.html b/corehq/apps/domain/templates/domain/bootstrap5/billing_statements.html
new file mode 100644
index 000000000000..a431bab6e886
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/billing_statements.html
@@ -0,0 +1,198 @@
+{% extends 'hqwebapp/bootstrap5/base_paginated_crud.html' %}
+{% load i18n %}
+{% load hq_shared_tags %}
+
+{% requirejs_main_b5 'domain/js/billing_statements' %}
+
+{% block paginated_list_top %}
+  {% initial_page_data 'pagination' pagination %}  {# todo B5: css-pagination #}
+  {% initial_page_data 'stripe_options' stripe_options %}
+  {% initial_page_data 'payment_urls' payment_urls %}
+  {% initial_page_data 'payment_error_messages' payment_error_messages %}
+  {% initial_page_data 'item_creation_allowed' pagination.create.is_allowed %}
+  {% initial_page_data 'total_balance' total_balance %}
+  {% initial_page_data 'show_plan' show_plan %}
+
+  <div id="currentBalanceSection">
+    <h2>{% trans 'Total Due:' %}
+      <span data-bind="text: displayTotalDue, visible: hasInitialLoadFinished"></span>
+    </h2>
+    {% if not is_ops_user_but_not_admin %}
+      <p data-bind="visible: hasInitialLoadFinished() && totalDue()">
+        <button type="button"
+                class="btn btn-primary"
+                data-bs-toggle="modal"
+                data-bs-target="#bulkPaymentModal"
+                id="bulkPaymentBtn">
+          {% trans 'Pay by Credit Card' %}
+        </button>
+      </p>
+      <p data-bind="visible: hasInitialLoadFinished() && totalDue()">
+        <button type="button"
+                class="btn btn-primary"
+                data-bs-toggle="modal"
+                data-bs-target="#bulkWirePaymentModal"
+                id="bulkWirePaymentBtn">
+          {% trans 'Pay by Wire' %}
+        </button>
+      </p>
+    {% else %}
+      <span class="badge text-bg-secondary">
+            <i class="fa fa-info-circle"></i>
+            {% trans "Not Billing Admin, Can't Make Payment" %}
+        </span>
+    {% endif %}
+  </div>
+  <h2>{% trans 'Billing Statements' %} <span data-bind="visible: showUnpaidBills">({% trans 'Unpaid' %})</span></h2>
+  <p>
+    <button type="button"
+            class="btn btn-primary"
+            data-bind="event: {click: toggleUnpaidBills},
+                           visible: showAllBills">
+      {% trans 'Show Only Unpaid Statements' %}
+    </button>
+    <button type="button"
+            class="btn btn-primary"
+            data-bind="event: {click: toggleUnpaidBills},
+                           visible: showUnpaidBills">
+      {% trans 'Show All Statements' %}
+    </button>
+  </p>
+{% endblock %}
+
+{% block pagination_templates %}
+  <script type="text/html" id="statement-row-template">
+    <td class="col-md-2" data-bind="text: invoice_number"></td>
+    {% if show_plan %}
+      <td class="col-md-2" data-bind="text: plan.name"></td>
+    {% endif %}
+    <td class="col-md-3">
+      <span data-bind="text: start"></span> - <span data-bind="text: end"></span>
+    </td>
+    <td class="col-md-1" data-bind="text: date_due"></td>
+    <td class="col-md-2">
+      <span data-bind="text: payment_status, attr: {class: payment_class}"></span>
+      <!-- ko if: canMakePayment -->
+      {% if not is_ops_user_but_not_admin %}
+        <button type="button"
+                class="btn btn-primary payment-button"
+                data-bs-toggle="modal"
+                data-bs-target="#paymentModal">
+          {% trans 'Make Payment' %}
+        </button>
+      {% else %}
+        <span class="badge text-bg-secondary">
+                    <i class="fa fa-info-circle"></i>
+                    {% trans "Not Billing Admin, Can't Make Payment" %}
+                </span>
+      {% endif %}
+      <!-- /ko -->
+    </td>
+    <td class="col-md-2">
+      <a class="btn btn-primary"
+         data-bind="attr: { href: pdfUrl }"
+         target="_blank">{% trans 'Download' %}</a>
+    </td>
+  </script>
+
+  {% include 'accounting/partials/stripe_card_ko_template.html' %}
+
+  <script type="text/html" id="cost-item-template">
+    <div class="form-group">  {# todo B5: css-form-group #}
+      <input type="hidden"
+             name="invoice_id"
+             data-bind="value: id" />
+      <label class="form-label col-md-3">
+        {% trans 'Payment Amount' %}
+      </label>
+      <div class="col-md-9">
+        <div class="radio">
+          <label>
+            <input type="radio"
+                   name="paymentAmount"
+                   id="payment-amount-full"
+                   data-bind="checked: paymentAmountType"
+                   value="full">
+            {% blocktrans %}
+              Pay the full balance: $<span data-bind="text: balance"></span>
+            {% endblocktrans %}
+          </label>
+        </div>
+        <div class="radio">
+          <label data-bind="visible: showCustomOption">
+            <input type="radio"
+                   name="paymentAmount"
+                   id="payment-amount-custom"
+                   data-bind="checked: paymentAmountType"
+                   value="partial">
+            {% blocktrans %}
+              Pay a portion of the balance:
+            {% endblocktrans %}
+            <div class="input-group">
+              <span class="input-group-addon">$</span>  {# todo B5: css-input-group-addon #}
+              <input type="text"
+                     class="form-control"
+                     name="customPaymentAmount"
+                     data-bind="value: customPaymentAmount,
+                                   event: { click: selectPartialPayment }" />
+            </div>
+          </label>
+          <div class="alert alert-danger"
+               data-bind="visible: showAmountRangeError">
+            <i class="fa-solid fa-triangle-exclamation"></i>
+            {% blocktrans %}
+              Please enter an amount that's between $0.50 and $<span data-bind="text: balance"></span>.
+            {% endblocktrans %}
+          </div>
+          <div class="alert alert-danger"
+               data-bind="visible: showAmountLeftoverError">
+            <i class="fa-solid fa-triangle-exclamation"></i>
+            {% blocktrans %}
+              You can't enter an amount between $<span data-bind="text: maxPartialAmount"></span>
+              and $<span data-bind="text: balance"></span> because
+              the next transfer will be below the minimum amount of $0.50.
+            {% endblocktrans %}
+          </div>
+        </div>
+      </div>
+    </div>
+  </script>
+
+  <script type="text/html" id="payment-method-modal-title">
+    {% blocktrans %}
+      Payment for Statement No. <span data-bind="text: invoiceNumber"></span>
+    {% endblocktrans %}
+  </script>
+
+  <script type="text/html" id="bulk-wire-payment-method-modal-title">
+    {% trans 'Bulk Wire Payment' %}
+  </script>
+
+  <script type="text/html" id="bulk-payment-method-modal-title">
+    {% trans 'Bulk Payment' %}
+  </script>
+
+  <script type="text/html" id="payment_complete_template_simple">
+    {% trans "Thank you for your payment!" %}
+  </script>
+
+  <script type="text/html" id="payment_complete_template_wire">
+    {% blocktrans %}
+      Thank you for your upcoming wire payment.
+      An invoice with your total balance and the instructions to do the wire payment
+      has just been sent to your email address.
+    {% endblocktrans %}
+  </script>
+{% endblock %}
+
+{% block modals %}{{ block.super }}
+  {% with process_invoice_payment_url as process_payment_url %}
+    {% include 'domain/partials/bootstrap5/payment_modal.html' with payment_modal_id="paymentModal" title_template="payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment_complete_template_simple" %}
+  {% endwith %}
+  {% with process_bulk_payment_url as process_payment_url %}
+    {% include 'domain/partials/bootstrap5/payment_modal.html' with payment_modal_id="bulkPaymentModal" title_template="bulk-payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment_complete_template_simple" %}
+  {% endwith %}
+  {% with process_wire_invoice_url as process_payment_url %}
+    {% include 'domain/partials/bootstrap5/payment_modal.html' with payment_modal_id="bulkWirePaymentModal" title_template="bulk-wire-payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment_complete_template_wire" %}
+  {% endwith %}
+{% endblock %}
diff --git a/corehq/apps/domain/views/accounting.py b/corehq/apps/domain/views/accounting.py
index 940bf8fbea5b..f7a3e3f5cab5 100644
--- a/corehq/apps/domain/views/accounting.py
+++ b/corehq/apps/domain/views/accounting.py
@@ -444,7 +444,7 @@ def post(self, request, *args, **kwargs):
 
 
 class DomainBillingStatementsView(DomainAccountingSettings, CRUDPaginatedViewMixin):
-    template_name = 'domain/billing_statements.html'
+    template_name = 'domain/bootstrap3/billing_statements.html'
     urlname = 'domain_billing_statements'
     page_title = gettext_lazy("Billing Statements")
 
diff --git a/corehq/apps/enterprise/views.py b/corehq/apps/enterprise/views.py
index 7883da63ffb1..169d1ed15ef6 100644
--- a/corehq/apps/enterprise/views.py
+++ b/corehq/apps/enterprise/views.py
@@ -229,7 +229,7 @@ def page_url(self):
 
 @method_decorator(require_enterprise_admin, name='dispatch')
 class EnterpriseBillingStatementsView(DomainAccountingSettings, CRUDPaginatedViewMixin):
-    template_name = 'domain/billing_statements.html'
+    template_name = 'domain/bootstrap3/billing_statements.html'
     urlname = 'enterprise_billing_statements'
     page_title = gettext_lazy("Billing Statements")
 

From 46b053f540c33b0b638104dd6f2ef7c897af272b Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 18:59:20 +0000
Subject: [PATCH 048/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/partials/case_search_templates.html, splitting templates"

---
 .../domain/admin/bootstrap3/case_search.html  |  2 +-
 .../domain/admin/bootstrap5/case_search.html  |  2 +-
 .../case_search_templates.html                |  0
 .../bootstrap5/case_search_templates.html     | 37 +++++++++++++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)
 rename corehq/apps/domain/templates/domain/admin/partials/{ => bootstrap3}/case_search_templates.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/partials/bootstrap5/case_search_templates.html

diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap3/case_search.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/case_search.html
index 03f9c71f60a6..2717a7e75b83 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap3/case_search.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap3/case_search.html
@@ -5,7 +5,7 @@
 {% requirejs_main 'domain/js/case_search_main' %}
 
 {% block page_content %}
-  {% include 'domain/admin/partials/case_search_templates.html' %}
+  {% include 'domain/admin/partials/bootstrap3/case_search_templates.html' %}
   {% initial_page_data 'case_types' case_types %}
   {% initial_page_data 'values' values %}
   {% registerurl 'case_search_config' request.domain %}
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html
index a7088c4d74bd..95c1036be5a9 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html
@@ -5,7 +5,7 @@
 {% requirejs_main_b5 'domain/js/case_search_main' %}
 
 {% block page_content %}
-  {% include 'domain/admin/partials/case_search_templates.html' %}
+  {% include 'domain/admin/partials/bootstrap5/case_search_templates.html' %}
   {% initial_page_data 'case_types' case_types %}
   {% initial_page_data 'values' values %}
   {% registerurl 'case_search_config' request.domain %}
diff --git a/corehq/apps/domain/templates/domain/admin/partials/case_search_templates.html b/corehq/apps/domain/templates/domain/admin/partials/bootstrap3/case_search_templates.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/partials/case_search_templates.html
rename to corehq/apps/domain/templates/domain/admin/partials/bootstrap3/case_search_templates.html
diff --git a/corehq/apps/domain/templates/domain/admin/partials/bootstrap5/case_search_templates.html b/corehq/apps/domain/templates/domain/admin/partials/bootstrap5/case_search_templates.html
new file mode 100644
index 000000000000..7e5eb3531828
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/partials/bootstrap5/case_search_templates.html
@@ -0,0 +1,37 @@
+{% load i18n %}
+
+<div id="property_template" class="d-none">
+  <div class="form-group form-inline clearfix">  {# todo B5: css-form-group, css-form-inline #}
+    <label>{% trans "Case property" %}
+      <input type="text" class="form-control" data-bind="value: property.name" placeholder="e.g. name" />
+    </label>
+    <button type="button"
+            class="btn btn-outline-danger float-end"
+            data-bind="click: function(){$parent.removeProperty($data); $root.change();}">
+      <i class="fa-regular fa-trash-can"></i>
+    </button>
+  </div>
+</div>
+
+<div id="case_type_template" class="d-none">
+  <div class="card ">  {# todo B5: css-panel #}
+    <div class="card-header clearfix form-inline">  {# todo B5: css-form-inline #}
+      <strong>{% trans "Case type" %}</strong>
+      <select class="form-select" data-bind="options: $root.caseTypes, value: caseType"></select>
+      <button type="button"
+              class="btn btn-outline-danger float-end"
+              data-bind="click: $root.removeCaseType">
+        <i class="fa-regular fa-trash-can"></i>
+      </button>
+    </div>
+    <div class="card-body">
+      <div data-bind="template: { name: 'property_template', foreach: properties, as: 'property' }"></div>
+      <button type="button"
+              class="btn btn-primary"
+              data-bind="click: addProperty">
+        <i class="fa fa-plus"></i> {% trans "Add case property" %}
+      </button>
+    </div>
+  </div>
+
+</div>

From f605acdaed25017563c4bb8b4e4f52266a8f6576 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 19:00:03 +0000
Subject: [PATCH 049/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/select.html, splitting templates"

---
 .../domain/{ => bootstrap3}/select.html       |  0
 .../templates/domain/bootstrap5/select.html   | 70 +++++++++++++++++++
 corehq/apps/domain/views/base.py              |  2 +-
 3 files changed, 71 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/select.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/select.html

diff --git a/corehq/apps/domain/templates/domain/select.html b/corehq/apps/domain/templates/domain/bootstrap3/select.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/select.html
rename to corehq/apps/domain/templates/domain/bootstrap3/select.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/select.html b/corehq/apps/domain/templates/domain/bootstrap5/select.html
new file mode 100644
index 000000000000..21fbbc5e42c6
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/select.html
@@ -0,0 +1,70 @@
+{% extends "hqwebapp/bootstrap5/base_page.html"  %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{% block title %}{% trans "My Projects" %}{% endblock title %}
+
+{% requirejs_main_b5 'domain/js/select' %}
+
+{% block page_content %}
+  {% initial_page_data 'invitation_links' invitation_links %}
+  {% initial_page_data 'domain_links' domain_links %}
+
+<div id="all-links" class="ko-template">
+  <div class="btn-toolbar" data-bind="visible: invitationLinks().length > 1">
+    <a class="btn btn-primary"
+       href="{% url "accept_all_invitations" %}">
+      <i class="fa fa-envelope"></i>
+      {% trans 'Accept All Invitations' %}
+    </a>
+  </div>
+  <div class="spacer"></div>
+
+  <div class="card text-bg-info" data-bind="visible: invitationLinks().length">  {# todo B5: css-panel #}
+    <div class="card-header ">
+      <h3 class="card-title">
+        {% trans 'My Invitations' %}
+      </h3>
+    </div>
+    <div class="card-body">
+      <ul class="list-invitations" data-bind="foreach: invitationLinks">
+        <li>
+          <a data-bind="attr: {href: url}" class="btn btn-outline-primary btn-sm">
+            <i class='fa fa-envelope'>
+            </i>
+            {% trans "Accept" %}
+          </a>
+          <!-- ko text: display_name -->
+          <!-- /ko -->
+        </li>
+      </ul>
+    </div>
+  </div>
+  <div class="card ">  {# todo B5: css-panel #}
+    <div class="card-header ">
+      <div class="row">
+        <div class="col-md-6">
+          <h3 class="card-title" style="padding-top: 7px;">  {# todo B5: inline-style #}
+            {% trans 'My Projects' %}
+          </h3>
+        </div>
+        <div class="col-md-6">
+          <search-box data-apply-bindings="false"
+                      params="value: query,
+                              action: search,
+                              immediate: true,
+                              placeholder: '{% trans_html_attr "Search Projects..." %}'">
+          </search-box>
+        </div>
+      </div>
+    </div>
+    <div class="card-body">
+      <ul class="nav nav-pills nav-stacked" data-bind="foreach: domainLinks">  {# todo B5: css-nav #}
+        <li>
+          <a data-bind="attr: {href: url}, text: display_name"></a>
+        </li>
+      </ul>
+    </div>
+  </div>
+</div>
+{% endblock %}
diff --git a/corehq/apps/domain/views/base.py b/corehq/apps/domain/views/base.py
index e22f9bfa6b79..940e5a651737 100644
--- a/corehq/apps/domain/views/base.py
+++ b/corehq/apps/domain/views/base.py
@@ -53,7 +53,7 @@ def select(request, do_not_redirect=False, next_view=None):
         'current_page': {'page_name': _('Select A Project')},
     }
 
-    domain_select_template = "domain/select.html"
+    domain_select_template = "domain/bootstrap3/select.html"
     last_visited_domain = request.session.get('last_visited_domain')
     if open_invitations \
        or do_not_redirect \

From e972b5d78e346ebb93becac8707ed640a898bc82 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 19:00:45 +0000
Subject: [PATCH 050/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/pro_bono/static.html, splitting templates"

---
 .../domain/pro_bono/{ => bootstrap3}/static.html          | 0
 .../templates/domain/pro_bono/bootstrap5/static.html      | 8 ++++++++
 corehq/apps/domain/views/pro_bono.py                      | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/pro_bono/{ => bootstrap3}/static.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/pro_bono/bootstrap5/static.html

diff --git a/corehq/apps/domain/templates/domain/pro_bono/static.html b/corehq/apps/domain/templates/domain/pro_bono/bootstrap3/static.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/pro_bono/static.html
rename to corehq/apps/domain/templates/domain/pro_bono/bootstrap3/static.html
diff --git a/corehq/apps/domain/templates/domain/pro_bono/bootstrap5/static.html b/corehq/apps/domain/templates/domain/pro_bono/bootstrap5/static.html
new file mode 100644
index 000000000000..dbe80f3564b6
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/pro_bono/bootstrap5/static.html
@@ -0,0 +1,8 @@
+{% extends 'hqwebapp/bootstrap5/base_page.html' %}
+{% load hq_shared_tags %}
+
+{% requirejs_main_b5 'domain/js/pro-bono' %}
+
+{% block page_content %}
+  {% include 'domain/pro_bono/bootstrap5/page_content.html' %}
+{% endblock %}
diff --git a/corehq/apps/domain/views/pro_bono.py b/corehq/apps/domain/views/pro_bono.py
index d00c8d03139b..c3c5092b655c 100644
--- a/corehq/apps/domain/views/pro_bono.py
+++ b/corehq/apps/domain/views/pro_bono.py
@@ -47,7 +47,7 @@ def post(self, request, *args, **kwargs):
 
 
 class ProBonoStaticView(ProBonoMixin, BasePageView):
-    template_name = 'domain/pro_bono/static.html'
+    template_name = 'domain/pro_bono/bootstrap3/static.html'
     urlname = 'pro_bono_static'
     use_domain_field = True
 

From 135b940ca7ab2a0687efbb225b302e8ef993ff3b Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 19:01:41 +0000
Subject: [PATCH 051/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/internal_settings.html, splitting templates"

---
 .../{ => bootstrap3}/internal_settings.html   |  0
 .../domain/bootstrap5/internal_settings.html  | 24 +++++++++++++++++++
 corehq/apps/domain/views/internal.py          |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/{ => bootstrap3}/internal_settings.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/bootstrap5/internal_settings.html

diff --git a/corehq/apps/domain/templates/domain/internal_settings.html b/corehq/apps/domain/templates/domain/bootstrap3/internal_settings.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/internal_settings.html
rename to corehq/apps/domain/templates/domain/bootstrap3/internal_settings.html
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/internal_settings.html b/corehq/apps/domain/templates/domain/bootstrap5/internal_settings.html
new file mode 100644
index 000000000000..fc1cc9fba803
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/bootstrap5/internal_settings.html
@@ -0,0 +1,24 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load hq_shared_tags %}
+{% load crispy_forms_tags %}
+{% load i18n %}
+
+{% requirejs_main_b5 'domain/js/internal_settings' %}
+
+{% block stylesheets %}
+  {{ block.super }}
+
+  <style>
+    #hq-sidebar {
+      min-height: 1470px;
+    }
+  </style>
+{% endblock %}
+
+{% block page_content %}
+  {% initial_page_data 'areas' areas %}
+  {% initial_page_data 'current_values' form.current_values %}
+  <form id="update-project-info" class="form-horizontal disable-on-submit" method="post">
+    {% crispy form %}  {# todo B5: crispy #}
+  </form>
+{% endblock %}
diff --git a/corehq/apps/domain/views/internal.py b/corehq/apps/domain/views/internal.py
index 4683db4c5365..d4044a973a2b 100644
--- a/corehq/apps/domain/views/internal.py
+++ b/corehq/apps/domain/views/internal.py
@@ -75,7 +75,7 @@ def page_name(self):
 class EditInternalDomainInfoView(BaseInternalDomainSettingsView):
     urlname = 'domain_internal_settings'
     page_title = gettext_lazy("Project Information")
-    template_name = 'domain/internal_settings.html'
+    template_name = 'domain/bootstrap3/internal_settings.html'
     strict_domain_fetching = True
 
     @method_decorator(always_allow_project_access)

From c0548f07b441258111265110cc3d69fb3995b52c Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 19:02:40 +0000
Subject: [PATCH 052/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/my_project_settings.html, splitting templates"

---
 .../{ => bootstrap3}/my_project_settings.html |  0
 .../admin/bootstrap5/my_project_settings.html | 21 +++++++++++++++++++
 corehq/apps/domain/views/settings.py          |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/my_project_settings.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/my_project_settings.html

diff --git a/corehq/apps/domain/templates/domain/admin/my_project_settings.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/my_project_settings.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/my_project_settings.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/my_project_settings.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/my_project_settings.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/my_project_settings.html
new file mode 100644
index 000000000000..ef1b81b1f3a7
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/my_project_settings.html
@@ -0,0 +1,21 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load hq_shared_tags %}
+{% load crispy_forms_tags %}
+{% load i18n %}
+
+{% requirejs_main_b5 'domain/js/my_project_settings' %}
+
+{% block stylesheets %}
+  <style>
+    #id_user_timezone {
+      width: 50%;
+      display: inline;
+    }
+  </style>
+{% endblock %}
+
+{% block page_content %}
+  {% initial_page_data "override_global_tz" override_global_tz %}
+  {% initial_page_data "no_domain_membership" no_domain_membership %}
+  {% crispy my_project_settings_form %}  {# todo B5: crispy #}
+{% endblock %}
diff --git a/corehq/apps/domain/views/settings.py b/corehq/apps/domain/views/settings.py
index b71ba4d819ef..bd09d997d8ee 100644
--- a/corehq/apps/domain/views/settings.py
+++ b/corehq/apps/domain/views/settings.py
@@ -220,7 +220,7 @@ def post(self, request, *args, **kwargs):
 
 
 class EditMyProjectSettingsView(BaseProjectSettingsView):
-    template_name = 'domain/admin/my_project_settings.html'
+    template_name = 'domain/admin/bootstrap3/my_project_settings.html'
     urlname = 'my_project_settings'
     page_title = gettext_lazy("My Timezone")
 

From 139b9798c2a7f451b0477bc2f7a46d4d3f37d0e6 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 19:05:04 +0000
Subject: [PATCH 053/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/js/toggles.js, splitting templates"

---
 .../domain/js/{ => bootstrap3}/toggles.js     |  2 +-
 .../static/domain/js/bootstrap5/toggles.js    | 70 +++++++++++++++++++
 .../bootstrap3/flags_and_privileges.html      |  2 +-
 .../bootstrap5/flags_and_privileges.html      |  2 +-
 4 files changed, 73 insertions(+), 3 deletions(-)
 rename corehq/apps/domain/static/domain/js/{ => bootstrap3}/toggles.js (98%)
 create mode 100644 corehq/apps/domain/static/domain/js/bootstrap5/toggles.js

diff --git a/corehq/apps/domain/static/domain/js/toggles.js b/corehq/apps/domain/static/domain/js/bootstrap3/toggles.js
similarity index 98%
rename from corehq/apps/domain/static/domain/js/toggles.js
rename to corehq/apps/domain/static/domain/js/bootstrap3/toggles.js
index a175b09bfbdd..982325848da7 100644
--- a/corehq/apps/domain/static/domain/js/toggles.js
+++ b/corehq/apps/domain/static/domain/js/bootstrap3/toggles.js
@@ -1,4 +1,4 @@
-hqDefine('domain/js/toggles', [
+hqDefine('domain/js/bootstrap3/toggles', [
     'jquery',
     'knockout',
     'underscore',
diff --git a/corehq/apps/domain/static/domain/js/bootstrap5/toggles.js b/corehq/apps/domain/static/domain/js/bootstrap5/toggles.js
new file mode 100644
index 000000000000..b66e2735fb00
--- /dev/null
+++ b/corehq/apps/domain/static/domain/js/bootstrap5/toggles.js
@@ -0,0 +1,70 @@
+hqDefine('domain/js/bootstrap5/toggles', [
+    'jquery',
+    'knockout',
+    'underscore',
+    'hqwebapp/js/initial_page_data',
+    'hqwebapp/js/bootstrap5/alert_user',
+    'hqwebapp/js/assert_properties',
+    'hqwebapp/js/bootstrap5/knockout_bindings.ko',  // for slideVisible
+    'hqwebapp/js/bootstrap5/main',
+    'commcarehq',
+], function (
+    $,
+    ko,
+    _,
+    initialPageData,
+    alertUser,
+    assertProperties
+) {
+
+    var Toggle = function (data) {
+        assertProperties.assert(data, [
+            'slug', 'label', 'description', 'help_link', 'tag', 'tag_index',
+            'tag_css_class', 'tag_description', 'domain_enabled',
+            'user_enabled', 'has_domain_namespace',
+        ]);
+
+        var self = {};
+        self.slug = data['slug'];
+        self.label = data['label'];
+        self.description = data['description'];
+        self.helpLink = data['help_link'];
+        self.tag = data['tag'];
+        self.tagCssClass = data['tag_css_class'];
+        self.tagDescription = data['tag_description'];
+        self.domainEnabled = ko.observable(data['domain_enabled']);
+        self.userEnabled = ko.observable(data['user_enabled']);
+        self.hasDomainNamespace = data['has_domain_namespace'];
+        self.editLink = initialPageData.reverse('edit_toggle', self.slug);
+
+        self.expanded = ko.observable(false);
+        self.showHideDescription = function () { self.expanded(!self.expanded()); };
+
+        self.isEnabled = ko.computed(function () {
+            return self.domainEnabled() || self.userEnabled();
+        });
+
+        self.setTogglePending = ko.observable(false);
+        self.toggleEnabledState = function () {
+            self.setTogglePending(true);
+            var newState = !self.domainEnabled();
+            $.ajax({
+                method: 'POST',
+                url: initialPageData.reverse('set_toggle', self.slug),
+                data: {
+                    item: initialPageData.get('domain'),
+                    enabled: newState,
+                    namespace: 'domain',
+                },
+                success: function () { self.domainEnabled(newState); },
+                error: function () { alertUser.alert_user("Something went wrong", 'danger'); },
+                complete: function () { self.setTogglePending(false); },
+            });
+        };
+
+        return self;
+    };
+
+    var allToggles = _.map(initialPageData.get('toggles'), Toggle);
+    $("#toggles-table").koApplyBindings({"toggles": allToggles});
+});
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap3/flags_and_privileges.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/flags_and_privileges.html
index d50b32601e6a..f34c193e157c 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap3/flags_and_privileges.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap3/flags_and_privileges.html
@@ -2,7 +2,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% js_entry_b3 'domain/js/toggles' %}
+{% js_entry_b3 'domain/js/bootstrap3/toggles' %}
 
 {% block page_content %}
 
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/flags_and_privileges.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/flags_and_privileges.html
index 16abbae24638..c4ec5fa2d393 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap5/flags_and_privileges.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/flags_and_privileges.html
@@ -2,7 +2,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% js_entry_b3 'domain/js/toggles' %}
+{% js_entry_b3 'domain/js/bootstrap5/toggles' %}
 
 {% block page_content %}
 

From 1fb0917af19ea9695e8097608a46812735fc30ba Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 19:06:37 +0000
Subject: [PATCH 054/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/js/internal_subscription_management.js, splitting templates"

---
 .../internal_subscription_management.js       |  2 +-
 .../internal_subscription_management.js       | 22 +++++++++++++++++++
 .../internal_subscription_management.html     |  2 +-
 .../internal_subscription_management.html     |  2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)
 rename corehq/apps/domain/static/domain/js/{ => bootstrap3}/internal_subscription_management.js (90%)
 create mode 100644 corehq/apps/domain/static/domain/js/bootstrap5/internal_subscription_management.js

diff --git a/corehq/apps/domain/static/domain/js/internal_subscription_management.js b/corehq/apps/domain/static/domain/js/bootstrap3/internal_subscription_management.js
similarity index 90%
rename from corehq/apps/domain/static/domain/js/internal_subscription_management.js
rename to corehq/apps/domain/static/domain/js/bootstrap3/internal_subscription_management.js
index c8a70ecb5269..7b8604f49db1 100644
--- a/corehq/apps/domain/static/domain/js/internal_subscription_management.js
+++ b/corehq/apps/domain/static/domain/js/bootstrap3/internal_subscription_management.js
@@ -1,4 +1,4 @@
-hqDefine('domain/js/internal_subscription_management', [
+hqDefine('domain/js/bootstrap3/internal_subscription_management', [
     'jquery',
     'knockout',
     'hqwebapp/js/bootstrap3/widgets',
diff --git a/corehq/apps/domain/static/domain/js/bootstrap5/internal_subscription_management.js b/corehq/apps/domain/static/domain/js/bootstrap5/internal_subscription_management.js
new file mode 100644
index 000000000000..d1c5d4f6ff57
--- /dev/null
+++ b/corehq/apps/domain/static/domain/js/bootstrap5/internal_subscription_management.js
@@ -0,0 +1,22 @@
+hqDefine('domain/js/bootstrap5/internal_subscription_management', [
+    'jquery',
+    'knockout',
+    'hqwebapp/js/bootstrap5/widgets',
+], function (
+    $,
+    ko
+) {
+    $(function () {
+        var viewModel = {
+            subscriptionType: ko.observable($('#id_subscription_type').val() || null),
+            trialLength: ko.observable(90),
+        };
+        viewModel.end_date = ko.computed(function () {
+            var date = new Date();
+            date.setHours(0, 0, 0, 0);
+            date.setDate(date.getDate() + parseInt(viewModel.trialLength()));
+            return date.toJSON().slice(0, 10);
+        });
+        $('#subscription_management').koApplyBindings(viewModel);
+    });
+});
diff --git a/corehq/apps/domain/templates/domain/bootstrap3/internal_subscription_management.html b/corehq/apps/domain/templates/domain/bootstrap3/internal_subscription_management.html
index 26d4824481fd..41c0b730d92f 100644
--- a/corehq/apps/domain/templates/domain/bootstrap3/internal_subscription_management.html
+++ b/corehq/apps/domain/templates/domain/bootstrap3/internal_subscription_management.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load hq_shared_tags %}
 
-{% requirejs_main 'domain/js/internal_subscription_management' %}
+{% requirejs_main 'domain/js/bootstrap3/internal_subscription_management' %}
 
 {% block page_content %}
   {% blocktrans %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/internal_subscription_management.html b/corehq/apps/domain/templates/domain/bootstrap5/internal_subscription_management.html
index c1d457031c38..7e518d29499a 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/internal_subscription_management.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/internal_subscription_management.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load hq_shared_tags %}
 
-{% requirejs_main_b5 'domain/js/internal_subscription_management' %}
+{% requirejs_main_b5 'domain/js/bootstrap5/internal_subscription_management' %}
 
 {% block page_content %}
   {% blocktrans %}

From 1259232f76f872fbec131261dd3f347644092b54 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 19:06:59 +0000
Subject: [PATCH 055/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/js/info_basic.js, splitting templates"

---
 .../domain/js/{ => bootstrap3}/info_basic.js  |  2 +-
 .../static/domain/js/bootstrap5/info_basic.js | 34 +++++++++++++++++++
 .../domain/admin/bootstrap3/info_basic.html   |  2 +-
 .../domain/admin/bootstrap5/info_basic.html   |  2 +-
 4 files changed, 37 insertions(+), 3 deletions(-)
 rename corehq/apps/domain/static/domain/js/{ => bootstrap3}/info_basic.js (96%)
 create mode 100644 corehq/apps/domain/static/domain/js/bootstrap5/info_basic.js

diff --git a/corehq/apps/domain/static/domain/js/info_basic.js b/corehq/apps/domain/static/domain/js/bootstrap3/info_basic.js
similarity index 96%
rename from corehq/apps/domain/static/domain/js/info_basic.js
rename to corehq/apps/domain/static/domain/js/bootstrap3/info_basic.js
index a1c9626a92e7..99d14a4bd19c 100644
--- a/corehq/apps/domain/static/domain/js/info_basic.js
+++ b/corehq/apps/domain/static/domain/js/bootstrap3/info_basic.js
@@ -1,4 +1,4 @@
-hqDefine("domain/js/info_basic", [
+hqDefine("domain/js/bootstrap3/info_basic", [
     'jquery',
     'hqwebapp/js/select_2_ajax_widget', // for call center case owner
     'select2/dist/js/select2.full.min',
diff --git a/corehq/apps/domain/static/domain/js/bootstrap5/info_basic.js b/corehq/apps/domain/static/domain/js/bootstrap5/info_basic.js
new file mode 100644
index 000000000000..b8eb3a10a82c
--- /dev/null
+++ b/corehq/apps/domain/static/domain/js/bootstrap5/info_basic.js
@@ -0,0 +1,34 @@
+hqDefine("domain/js/bootstrap5/info_basic", [
+    'jquery',
+    'hqwebapp/js/select_2_ajax_widget', // for call center case owner
+    'select2/dist/js/select2.full.min',
+    'hqwebapp/js/bootstrap5/widgets',
+], function (
+    $
+) {
+    $(function () {
+        $('#id_default_timezone').select2({
+            placeholder: gettext('Select a Timezone...'),
+        });
+
+        $('#id_call_center_enabled').change(function () {
+            var type = $('#id_call_center_type').closest('.control-group');
+            var caseOwner = $('#id_call_center_case_owner').closest(
+                '.control-group'
+            );
+            var caseType = $('#id_call_center_case_type').closest(
+                '.control-group'
+            );
+            if ($(this).is(':checked')) {
+                type.removeClass('hide');
+                caseOwner.removeClass('hide');
+                caseType.removeClass('hide');
+            } else {
+                type.addClass('hide');
+                caseOwner.addClass('hide');
+                caseType.addClass('hide');
+            }
+        });
+        $('#id_call_center_enabled').trigger('change');
+    });
+});
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap3/info_basic.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/info_basic.html
index f73830c0832e..40485e12afac 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap3/info_basic.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap3/info_basic.html
@@ -3,7 +3,7 @@
 {% load hq_shared_tags %}
 
 
-{% requirejs_main 'domain/js/info_basic' %}
+{% requirejs_main 'domain/js/bootstrap3/info_basic' %}
 
 {% block stylesheets %}{{ block.super }}
    <link rel="stylesheet" href="{% static '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.css' %}" type="text/css" />
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/info_basic.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/info_basic.html
index fb9122791bb2..876641f83e85 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap5/info_basic.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/info_basic.html
@@ -3,7 +3,7 @@
 {% load hq_shared_tags %}
 
 
-{% requirejs_main_b5 'domain/js/info_basic' %}
+{% requirejs_main_b5 'domain/js/bootstrap5/info_basic' %}
 
 {% block stylesheets %}{{ block.super }}
    <link rel="stylesheet" href="{% static '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.css' %}" type="text/css" />

From 925c5e4cf6feeafda936b03efbd096cabe303a64 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 19:07:43 +0000
Subject: [PATCH 056/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/js/billing_statements.js, splitting templates"

---
 .../js/{ => bootstrap3}/billing_statements.js |   2 +-
 .../js/bootstrap5/billing_statements.js       | 138 ++++++++++++++++++
 .../domain/bootstrap3/billing_statements.html |   2 +-
 .../domain/bootstrap5/billing_statements.html |   2 +-
 4 files changed, 141 insertions(+), 3 deletions(-)
 rename corehq/apps/domain/static/domain/js/{ => bootstrap3}/billing_statements.js (98%)
 create mode 100644 corehq/apps/domain/static/domain/js/bootstrap5/billing_statements.js

diff --git a/corehq/apps/domain/static/domain/js/billing_statements.js b/corehq/apps/domain/static/domain/js/bootstrap3/billing_statements.js
similarity index 98%
rename from corehq/apps/domain/static/domain/js/billing_statements.js
rename to corehq/apps/domain/static/domain/js/bootstrap3/billing_statements.js
index 78f69f3f4c1b..c1b4e753fdd8 100644
--- a/corehq/apps/domain/static/domain/js/billing_statements.js
+++ b/corehq/apps/domain/static/domain/js/bootstrap3/billing_statements.js
@@ -1,5 +1,5 @@
 'use strict';
-hqDefine("domain/js/billing_statements", [
+hqDefine("domain/js/bootstrap3/billing_statements", [
     'jquery',
     'underscore',
     'knockout',
diff --git a/corehq/apps/domain/static/domain/js/bootstrap5/billing_statements.js b/corehq/apps/domain/static/domain/js/bootstrap5/billing_statements.js
new file mode 100644
index 000000000000..20769c46ad02
--- /dev/null
+++ b/corehq/apps/domain/static/domain/js/bootstrap5/billing_statements.js
@@ -0,0 +1,138 @@
+'use strict';
+hqDefine("domain/js/bootstrap5/billing_statements", [
+    'jquery',
+    'underscore',
+    'knockout',
+    'hqwebapp/js/initial_page_data',
+    'accounting/js/payment_method_handler',
+    'hqwebapp/js/bootstrap5/crud_paginated_list',
+    'stripe',
+], function (
+    $,
+    _,
+    ko,
+    initialPageData,
+    paymentMethodHandlers,
+    CRUDPaginatedList,
+    Stripe
+) {
+    Stripe.setPublishableKey(initialPageData.get("stripe_options").stripe_public_key);
+    var wireInvoiceHandler = paymentMethodHandlers.wireInvoiceHandler;
+    var paymentMethodHandler = paymentMethodHandlers.paymentMethodHandler;
+    var invoice = paymentMethodHandlers.invoice;
+    var totalCostItem = paymentMethodHandlers.totalCostItem;
+    var pagination = initialPageData.get("pagination");
+    var paginatedListModel = new CRUDPaginatedList.CRUDPaginatedListModel(
+        pagination.total,
+        pagination.limit,
+        pagination.page,
+        {
+            statusCodeText: pagination.status_codes,
+            allowItemCreation: initialPageData.get('item_creation_allowed'),
+            createItemForm: pagination.create_item_form,
+        }
+    );
+
+    $(function () {
+        $('#editable-paginated-list').koApplyBindings(paginatedListModel);
+    });
+
+    var bulkPaymentHandler = paymentMethodHandler(
+        "bulk-payment-form",
+        {
+            submitBtnText: gettext("Submit Payment"),
+            errorMessages: initialPageData.get("payment_error_messages"),
+            submitURL: initialPageData.get("payment_urls").process_bulk_payment_url,
+        }
+    );
+
+    var bulkWirePaymentHandler = wireInvoiceHandler(
+        "bulk-wire-payment-form",
+        {
+            submitBtnText: gettext("Submit Invoice Request"),
+            isWire: true,
+            errorMessages: initialPageData.get("payment_error_messages"),
+            submitURL: initialPageData.get("payment_urls").process_wire_invoice_url,
+        }
+    );
+
+    var paymentHandler = paymentMethodHandler(
+        "payment-form",
+        {
+            submitBtnText: gettext("Submit Payment"),
+            errorMessages: initialPageData.get("payment_error_messages"),
+            submitURL: initialPageData.get("payment_urls").process_invoice_payment_url,
+        }
+    );
+
+    // A sign that the data model isn't exactly right - credit cards are shared data.
+    // Consider refactoring at some point.
+    var handlers = [bulkPaymentHandler, paymentHandler];
+    for (var i = 0; i < handlers.length; i++) {
+        handlers[i].handlers = handlers;
+    }
+    var stripeCards = initialPageData.get("stripe_options").stripe_cards;
+    if (stripeCards) {
+        bulkPaymentHandler.loadCards(stripeCards);
+        paymentHandler.loadCards(stripeCards);
+    }
+
+    $(function () {
+        $('#bulkPaymentModal').koApplyBindings(bulkPaymentHandler);
+        $('#bulkWirePaymentModal').koApplyBindings(bulkWirePaymentHandler);
+        $('#paymentModal').koApplyBindings(paymentHandler);
+    });
+
+    $('#bulkPaymentBtn').click(function () {
+        bulkPaymentHandler.costItem(totalCostItem({
+            totalBalance: paginatedListModel.totalDue(),
+            paginatedListModel: paginatedListModel,
+        }));
+        bulkPaymentHandler.reset();
+    });
+    $('#bulkWirePaymentBtn').click(function () {
+        bulkWirePaymentHandler.costItem(totalCostItem({
+            totalBalance: paginatedListModel.totalDue(),
+            paginatedListModel: paginatedListModel,
+        }));
+    });
+
+    paginatedListModel.totalDue = ko.observable(parseFloat(initialPageData.get("total_balance")));
+
+    paginatedListModel.displayTotalDue = ko.computed(function () {
+        return "$" + paginatedListModel.totalDue().toFixed(2);
+    });
+    paginatedListModel.showUnpaidBills = ko.observable(true);
+    paginatedListModel.showAllBills = ko.computed(function () {
+        return !paginatedListModel.showUnpaidBills();
+    });
+    paginatedListModel.toggleUnpaidBills = function () {
+        paginatedListModel.showUnpaidBills(!paginatedListModel.showUnpaidBills());
+        paginatedListModel.currentPage(1);
+        paginatedListModel.refreshList();
+    };
+
+    paginatedListModel.getAdditionalData = function () {
+        var additionalData = {
+            'show_unpaid': paginatedListModel.showUnpaidBills(),
+        };
+        if (window.location.href.split('?').length > 2) {
+            additionalData['show_hidden'] = _(window.location.href.split('?')[1].split('&')).contains('show_hidden=true');
+        }
+        return additionalData;
+    };
+    paginatedListModel.initRow = function (rowElems, paginatedItem) {
+        var paymentButton = $(rowElems).find('.payment-button');
+        if (paymentButton) {
+            paymentButton.click(function (e) {
+                paymentHandler.costItem(invoice({
+                    paginatedItem: paginatedItem,
+                    paginatedList: paginatedListModel,
+                }));
+                paymentHandler.reset();
+                e.preventDefault();
+            });
+        }
+    };
+    paginatedListModel.init();
+});
diff --git a/corehq/apps/domain/templates/domain/bootstrap3/billing_statements.html b/corehq/apps/domain/templates/domain/bootstrap3/billing_statements.html
index 72cd885d37d8..5e6fcb4d4ff5 100644
--- a/corehq/apps/domain/templates/domain/bootstrap3/billing_statements.html
+++ b/corehq/apps/domain/templates/domain/bootstrap3/billing_statements.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 
-{% requirejs_main 'domain/js/billing_statements' %}
+{% requirejs_main 'domain/js/bootstrap3/billing_statements' %}
 
 {% block paginated_list_top %}
   {% initial_page_data 'pagination' pagination %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/billing_statements.html b/corehq/apps/domain/templates/domain/bootstrap5/billing_statements.html
index a431bab6e886..91148af83299 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/billing_statements.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/billing_statements.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 
-{% requirejs_main_b5 'domain/js/billing_statements' %}
+{% requirejs_main_b5 'domain/js/bootstrap5/billing_statements' %}
 
 {% block paginated_list_top %}
   {% initial_page_data 'pagination' pagination %}  {# todo B5: css-pagination #}

From b80e7b0a7af7602cf01848d5ab795508186a8cdc Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 19:08:42 +0000
Subject: [PATCH 057/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/js/case_search.js, splitting templates"

---
 .../domain/js/{ => bootstrap3}/case_search.js |   2 +-
 .../domain/js/bootstrap5/case_search.js       | 144 ++++++++++++++++++
 .../static/domain/js/case_search_main.js      |   2 +-
 3 files changed, 146 insertions(+), 2 deletions(-)
 rename corehq/apps/domain/static/domain/js/{ => bootstrap3}/case_search.js (99%)
 create mode 100644 corehq/apps/domain/static/domain/js/bootstrap5/case_search.js

diff --git a/corehq/apps/domain/static/domain/js/case_search.js b/corehq/apps/domain/static/domain/js/bootstrap3/case_search.js
similarity index 99%
rename from corehq/apps/domain/static/domain/js/case_search.js
rename to corehq/apps/domain/static/domain/js/bootstrap3/case_search.js
index 07c5893ff82a..4b37ac10fb98 100644
--- a/corehq/apps/domain/static/domain/js/case_search.js
+++ b/corehq/apps/domain/static/domain/js/bootstrap3/case_search.js
@@ -1,4 +1,4 @@
-hqDefine('domain/js/case_search', [
+hqDefine('domain/js/bootstrap3/case_search', [
     'jquery',
     'knockout',
     'underscore',
diff --git a/corehq/apps/domain/static/domain/js/bootstrap5/case_search.js b/corehq/apps/domain/static/domain/js/bootstrap5/case_search.js
new file mode 100644
index 000000000000..ed9e6a87a241
--- /dev/null
+++ b/corehq/apps/domain/static/domain/js/bootstrap5/case_search.js
@@ -0,0 +1,144 @@
+hqDefine('domain/js/bootstrap5/case_search', [
+    'jquery',
+    'knockout',
+    'underscore',
+    'hqwebapp/js/initial_page_data',
+    'hqwebapp/js/bootstrap5/main',
+], function (
+    $,
+    ko,
+    _,
+    initialPageData,
+    hqMain
+) {
+    var module = {};
+
+    var propertyModel = function (name) {
+        var self = {};
+        self.name = ko.observable(name);
+        return self;
+    };
+
+    var caseTypeProps = function (caseType, properties) {
+        var self = {};
+
+        self.caseType = ko.observable(caseType);
+        self.properties = ko.observableArray(
+            _.map(properties, function (name) { return propertyModel(name); })
+        );
+
+        self.addProperty = function () {
+            self.properties.push(propertyModel(''));
+        };
+        self.removeProperty = function (property) {
+            self.properties.remove(property);
+        };
+
+        return self;
+    };
+
+    var ignorePatterns = function (caseType, caseProperty, regex) {
+        var self = {};
+
+        self.caseType = ko.observable(caseType);
+        self.caseProperty = ko.observable(caseProperty);
+        self.regex = ko.observable(regex);
+
+        return self;
+    };
+
+    /**
+     * Returns a viewModel for domain/admin/case_search.html
+     */
+    module.caseSearchConfig = function (options) {
+        var self = {};
+        var initialValues = options.values;
+
+        self.caseTypes = options.caseTypes;
+        self.toggleEnabled = ko.observable(initialValues.enabled);
+        self.synchronousWebApps = ko.observable(initialValues.synchronous_web_apps);
+        self.syncCaseOnFormEntry = ko.observable(initialValues.sync_cases_on_form_entry);
+        self.fuzzyProperties = ko.observableArray();
+        for (var caseType in initialValues.fuzzy_properties) {
+            self.fuzzyProperties.push(caseTypeProps(
+                caseType,
+                initialValues.fuzzy_properties[caseType]
+            ));
+        }
+        self.ignorePatterns = ko.observableArray();
+        for (var i = 0; i < initialValues.ignore_patterns.length; i++) {
+            self.ignorePatterns.push(ignorePatterns(
+                initialValues.ignore_patterns[i].case_type,
+                initialValues.ignore_patterns[i].case_property,
+                initialValues.ignore_patterns[i].regex
+            ));
+        }
+        self.change = function () {
+            self.saveButton.fire('change');
+        };
+        self.fuzzyProperties.subscribe(self.change);
+        self.synchronousWebApps.subscribe(self.change);
+        self.syncCaseOnFormEntry.subscribe(self.change);
+
+        self.addCaseType = function () {
+            self.fuzzyProperties.push(caseTypeProps('', ['']));
+            self.change();
+        };
+        self.removeCaseType = function (caseType) {
+            self.fuzzyProperties.remove(caseType);
+            self.change();
+        };
+
+        self.addIgnorePatterns = function () {
+            self.ignorePatterns.push(ignorePatterns('', '', ''));
+            self.change();
+        };
+        self.removeIgnorePatterns = function (r) {
+            self.ignorePatterns.remove(r);
+            self.change();
+        };
+
+        self.saveButton = hqMain.initSaveButton({
+            unsavedMessage: gettext("You have unchanged settings"),
+            save: function () {
+                self.saveButton.ajax({
+                    type: 'post',
+                    url: initialPageData.reverse("case_search_config"),
+                    data: JSON.stringify(self.serialize()),
+                    dataType: 'json',
+                    contentType: "application/json; charset=utf-8",
+                });
+            },
+        });
+
+        self.serialize = function () {
+            var fuzzyProperties = {};
+            for (var i = 0; i < self.fuzzyProperties().length; i++) {
+                var caseType = self.fuzzyProperties()[i].caseType(),
+                    properties = _.map(
+                        self.fuzzyProperties()[i].properties(),
+                        function (property) { return property.name(); }
+                    );
+
+                fuzzyProperties[caseType] = (fuzzyProperties[caseType] || []).concat(properties);
+            }
+            return {
+                'enable': self.toggleEnabled(),
+                'synchronous_web_apps': self.synchronousWebApps(),
+                'sync_cases_on_form_entry': self.syncCaseOnFormEntry(),
+                'fuzzy_properties': fuzzyProperties,
+                'ignore_patterns': _.map(self.ignorePatterns(), function (rc) {
+                    return {
+                        'case_type': rc.caseType(),
+                        'case_property': rc.caseProperty(),
+                        'regex': rc.regex(),
+                    };
+                }),
+            };
+        };
+
+        return self;
+    };
+
+    return module;
+});
diff --git a/corehq/apps/domain/static/domain/js/case_search_main.js b/corehq/apps/domain/static/domain/js/case_search_main.js
index b32e7be96658..5e33b941dba6 100644
--- a/corehq/apps/domain/static/domain/js/case_search_main.js
+++ b/corehq/apps/domain/static/domain/js/case_search_main.js
@@ -1,7 +1,7 @@
 hqDefine('domain/js/case_search_main', [
     'jquery',
     'hqwebapp/js/initial_page_data',
-    'domain/js/case_search',
+    'domain/js/bootstrap3/case_search',
     'hqwebapp/js/bootstrap3/knockout_bindings.ko',     // save button
 ], function (
     $,

From 8605930d8c98d68842180594183f369bf305fb1c Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 19:09:03 +0000
Subject: [PATCH 058/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/js/update_billing_contact_info.js, splitting templates"

---
 .../update_billing_contact_info.js            |  2 +-
 .../bootstrap5/update_billing_contact_info.js | 28 +++++++++++++++++++
 .../update_billing_contact_info.html          |  2 +-
 .../update_billing_contact_info.html          |  2 +-
 4 files changed, 31 insertions(+), 3 deletions(-)
 rename corehq/apps/domain/static/domain/js/{ => bootstrap3}/update_billing_contact_info.js (92%)
 create mode 100644 corehq/apps/domain/static/domain/js/bootstrap5/update_billing_contact_info.js

diff --git a/corehq/apps/domain/static/domain/js/update_billing_contact_info.js b/corehq/apps/domain/static/domain/js/bootstrap3/update_billing_contact_info.js
similarity index 92%
rename from corehq/apps/domain/static/domain/js/update_billing_contact_info.js
rename to corehq/apps/domain/static/domain/js/bootstrap3/update_billing_contact_info.js
index b17d6f9c6f94..f4f14970b551 100644
--- a/corehq/apps/domain/static/domain/js/update_billing_contact_info.js
+++ b/corehq/apps/domain/static/domain/js/bootstrap3/update_billing_contact_info.js
@@ -1,5 +1,5 @@
 'use strict';
-hqDefine('domain/js/update_billing_contact_info', [
+hqDefine('domain/js/bootstrap3/update_billing_contact_info', [
     'jquery',
     'hqwebapp/js/initial_page_data',
     'accounting/js/stripe_card_manager',
diff --git a/corehq/apps/domain/static/domain/js/bootstrap5/update_billing_contact_info.js b/corehq/apps/domain/static/domain/js/bootstrap5/update_billing_contact_info.js
new file mode 100644
index 000000000000..579eb236f26e
--- /dev/null
+++ b/corehq/apps/domain/static/domain/js/bootstrap5/update_billing_contact_info.js
@@ -0,0 +1,28 @@
+'use strict';
+hqDefine('domain/js/bootstrap5/update_billing_contact_info', [
+    'jquery',
+    'hqwebapp/js/initial_page_data',
+    'accounting/js/stripe_card_manager',
+    'stripe',
+    'accounting/js/widgets',
+    'hqwebapp/js/bootstrap5/knockout_bindings.ko', // openModal
+], function (
+    $,
+    initialPageData,
+    stripeCardManager,
+    Stripe
+) {
+    $(function () {
+        Stripe.setPublishableKey(initialPageData.get("stripe_public_key"));
+        var cardManager = stripeCardManager.stripeCardManager({
+            cards: initialPageData.get("cards"),
+            url: initialPageData.reverse("cards_view"),
+        });
+        $("#card-manager").koApplyBindings(cardManager);
+
+        $("#show_emails").click(function () {
+            $('#emails-text').show();
+            $(this).parent().hide();
+        });
+    });
+});
diff --git a/corehq/apps/domain/templates/domain/bootstrap3/update_billing_contact_info.html b/corehq/apps/domain/templates/domain/bootstrap3/update_billing_contact_info.html
index 46dda5d2d669..c92b5980bd1b 100644
--- a/corehq/apps/domain/templates/domain/bootstrap3/update_billing_contact_info.html
+++ b/corehq/apps/domain/templates/domain/bootstrap3/update_billing_contact_info.html
@@ -3,7 +3,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main 'domain/js/update_billing_contact_info' %}
+{% requirejs_main 'domain/js/bootstrap3/update_billing_contact_info' %}
 
 {% block additional_initial_page_data %}{{ block.super }}
   {% initial_page_data "stripe_public_key" stripe_public_key %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/update_billing_contact_info.html b/corehq/apps/domain/templates/domain/bootstrap5/update_billing_contact_info.html
index 17b0b76d97fd..2d9de6f75841 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/update_billing_contact_info.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/update_billing_contact_info.html
@@ -3,7 +3,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main_b5 'domain/js/update_billing_contact_info' %}
+{% requirejs_main_b5 'domain/js/bootstrap5/update_billing_contact_info' %}
 
 {% block additional_initial_page_data %}{{ block.super }}
   {% initial_page_data "stripe_public_key" stripe_public_key %}

From 2192caec22778cc9b99e62095b409b9da891001f Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 19:09:16 +0000
Subject: [PATCH 059/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/js/case_search_main.js, splitting templates"

---
 .../js/{ => bootstrap3}/case_search_main.js   |  2 +-
 .../domain/js/bootstrap5/case_search_main.js  | 19 +++++++++++++++++++
 .../domain/admin/bootstrap3/case_search.html  |  2 +-
 .../domain/admin/bootstrap5/case_search.html  |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)
 rename corehq/apps/domain/static/domain/js/{ => bootstrap3}/case_search_main.js (91%)
 create mode 100644 corehq/apps/domain/static/domain/js/bootstrap5/case_search_main.js

diff --git a/corehq/apps/domain/static/domain/js/case_search_main.js b/corehq/apps/domain/static/domain/js/bootstrap3/case_search_main.js
similarity index 91%
rename from corehq/apps/domain/static/domain/js/case_search_main.js
rename to corehq/apps/domain/static/domain/js/bootstrap3/case_search_main.js
index 5e33b941dba6..fad553c002a5 100644
--- a/corehq/apps/domain/static/domain/js/case_search_main.js
+++ b/corehq/apps/domain/static/domain/js/bootstrap3/case_search_main.js
@@ -1,4 +1,4 @@
-hqDefine('domain/js/case_search_main', [
+hqDefine('domain/js/bootstrap3/case_search_main', [
     'jquery',
     'hqwebapp/js/initial_page_data',
     'domain/js/bootstrap3/case_search',
diff --git a/corehq/apps/domain/static/domain/js/bootstrap5/case_search_main.js b/corehq/apps/domain/static/domain/js/bootstrap5/case_search_main.js
new file mode 100644
index 000000000000..b835de74e613
--- /dev/null
+++ b/corehq/apps/domain/static/domain/js/bootstrap5/case_search_main.js
@@ -0,0 +1,19 @@
+hqDefine('domain/js/bootstrap5/case_search_main', [
+    'jquery',
+    'hqwebapp/js/initial_page_data',
+    'domain/js/bootstrap5/case_search',
+    'hqwebapp/js/bootstrap5/knockout_bindings.ko',     // save button
+], function (
+    $,
+    initialPageData,
+    caseSearch
+) {
+    $(function () {
+        var viewModel = caseSearch.caseSearchConfig({
+            values: initialPageData.get('values'),
+            caseTypes: initialPageData.get('case_types'),
+        });
+        $('#case-search-config').koApplyBindings(viewModel);
+        $('#case-search-config').on('change', viewModel.change).on('click', ':button', viewModel.change);
+    });
+});
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap3/case_search.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/case_search.html
index 2717a7e75b83..adf55b63cb34 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap3/case_search.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap3/case_search.html
@@ -2,7 +2,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main 'domain/js/case_search_main' %}
+{% requirejs_main 'domain/js/bootstrap3/case_search_main' %}
 
 {% block page_content %}
   {% include 'domain/admin/partials/bootstrap3/case_search_templates.html' %}
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html
index 95c1036be5a9..10a0f5bb9f7b 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html
@@ -2,7 +2,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main_b5 'domain/js/case_search_main' %}
+{% requirejs_main_b5 'domain/js/bootstrap5/case_search_main' %}
 
 {% block page_content %}
   {% include 'domain/admin/partials/bootstrap5/case_search_templates.html' %}

From b1846ccfec1059eb548c531247f4cb59a4c20b22 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 19:23:02 +0000
Subject: [PATCH 060/159] "Bootstrap 5 Migration - initial auto-migration for
 domain/admin/sms_settings.html, splitting templates"

---
 corehq/apps/commtrack/views.py                |  2 +-
 .../admin/{ => bootstrap3}/sms_settings.html  |  0
 .../domain/admin/bootstrap5/sms_settings.html | 28 +++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/domain/admin/{ => bootstrap3}/sms_settings.html (100%)
 create mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/sms_settings.html

diff --git a/corehq/apps/commtrack/views.py b/corehq/apps/commtrack/views.py
index b1652032b397..c0dcd6dada9b 100644
--- a/corehq/apps/commtrack/views.py
+++ b/corehq/apps/commtrack/views.py
@@ -185,7 +185,7 @@ def post(self, request, *args, **kwargs):
 class SMSSettingsView(BaseCommTrackManageView):
     urlname = 'commtrack_sms_settings'
     page_title = gettext_noop("SMS")
-    template_name = 'domain/admin/sms_settings.html'
+    template_name = 'domain/admin/bootstrap3/sms_settings.html'
 
     @property
     def page_context(self):
diff --git a/corehq/apps/domain/templates/domain/admin/sms_settings.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/sms_settings.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/sms_settings.html
rename to corehq/apps/domain/templates/domain/admin/bootstrap3/sms_settings.html
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/sms_settings.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/sms_settings.html
new file mode 100644
index 000000000000..c6918a1c5467
--- /dev/null
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/sms_settings.html
@@ -0,0 +1,28 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{% requirejs_main_b5 'commtrack/js/sms' %}
+
+{% block page_content %}
+  {% initial_page_data "settings" settings %}
+  {% initial_page_data "other_sms_codes" other_sms_codes %}
+  <form id="settings" method="post">
+    {% csrf_token %}
+    <fieldset>
+      <legend>{% trans 'Stock Actions' %}</legend>
+      <div class="{% css_field_class %}">
+        {% include "domain/admin/bootstrap5/commtrack_action_table.html" %}
+        <button type="button" class="btn btn-outline-primary float-end" data-bind="click: new_action">
+          <i class="fa fa-plus"></i> {% trans "New Action" %}
+        </button>
+      </div>
+    </fieldset>
+
+    <button type="submit" class="btn btn-primary">
+      {% trans "Save Settings" %}
+    </button>
+
+    <input name="json" type="hidden" data-bind="value: json_payload" />
+  </form>
+{% endblock %}

From da256b8273e8eb59e9fa13d5ec84bc84f67aea86 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Tue, 5 Nov 2024 19:25:24 +0000
Subject: [PATCH 061/159] "Bootstrap 5 Migration - Updated diff config for
 'domain'"

---
 .../tests/data/bootstrap5_diff_config.json    | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json b/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json
index 92d1baba6bd8..c8f941f89412 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json
@@ -684,5 +684,72 @@
       "label": "javascript/repeaters/js",
       "compare_all_files": true
     }
+  ],
+  "apps/domain/templates/domain": [
+    {
+      "directories": [
+        "bootstrap3",
+        "bootstrap5"
+      ],
+      "file_type": "template",
+      "label": "domain",
+      "compare_all_files": true
+    },
+    {
+      "directories": [
+        "admin/bootstrap3",
+        "admin/bootstrap5"
+      ],
+      "file_type": "template",
+      "label": "domain/admin",
+      "compare_all_files": true
+    },
+    {
+      "directories": [
+        "admin/partials/bootstrap3",
+        "admin/partials/bootstrap5"
+      ],
+      "file_type": "template",
+      "label": "domain/admin/partials",
+      "compare_all_files": true
+    },
+    {
+      "directories": [
+        "email/bootstrap3",
+        "email/bootstrap5"
+      ],
+      "file_type": "template",
+      "label": "domain/email",
+      "compare_all_files": true
+    },
+    {
+      "directories": [
+        "partials/bootstrap3",
+        "partials/bootstrap5"
+      ],
+      "file_type": "template",
+      "label": "domain/partials",
+      "compare_all_files": true
+    },
+    {
+      "directories": [
+        "pro_bono/bootstrap3",
+        "pro_bono/bootstrap5"
+      ],
+      "file_type": "template",
+      "label": "domain/pro_bono",
+      "compare_all_files": true
+    }
+  ],
+  "apps/domain/static/domain/js": [
+    {
+      "directories": [
+        "bootstrap3",
+        "bootstrap5"
+      ],
+      "file_type": "javascript",
+      "label": "javascript/domain/js",
+      "compare_all_files": true
+    }
   ]
 }

From b677f724957d399a412169c8ff1dd083a791ec44 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Thu, 7 Nov 2024 12:06:26 -0500
Subject: [PATCH 062/159] Replaced form-control with form-select

This is a standard automated replacement, but I skipped it when running the tool because it was grouped with
changing optionsText from 'label' to 'badge' which is incorrect.
---
 .../domain/admin/bootstrap5/commtrack_action_table.html         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/commtrack_action_table.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/commtrack_action_table.html
index 5cc795aae177..4d297a95e7cc 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap5/commtrack_action_table.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/commtrack_action_table.html
@@ -20,7 +20,7 @@
         <div class="help-inline" data-bind="text: keywordError"></div>
       </td>
       <td class="form-group">  {# todo B5: css-form-group #}
-        <select class="form-control" data-bind="value: type, options: $parent.action_types, optionsText: 'label', optionsValue: 'value'"></select>
+        <select class="form-select" data-bind="value: type, options: $parent.action_types, optionsText: 'label', optionsValue: 'value'"></select>
       </td>
       <td>
         <button type="button" class="btn btn-outline-danger" data-bind="click: $parent.remove_action"><i class="fa fa-remove"></i> {% trans "Remove" %}</button>

From a339c9b26878d806f988dff41e980d83121d6239 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 20:30:44 +0000
Subject: [PATCH 063/159] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../activate_transfer_domain.html.diff.txt    |  38 +++
 .../admin/calendar_fixture.html.diff.txt      |  12 +
 .../domain/admin/case_search.html.diff.txt    |  70 +++++
 .../commtrack_action_table.html.diff.txt      |  34 +++
 .../admin/commtrack_settings.html.diff.txt    |   9 +
 .../domain/admin/edit_alert.html.diff.txt     |  17 ++
 .../admin/feature_previews.html.diff.txt      |  42 +++
 .../admin/flags_and_privileges.html.diff.txt  | 100 +++++++
 .../admin/global_sms_rates.html.diff.txt      |  40 +++
 .../domain/admin/info_basic.html.diff.txt     |  21 ++
 .../admin/location_fixture.html.diff.txt      |  12 +
 .../domain/admin/manage_alerts.html.diff.txt  |  53 ++++
 .../admin/my_project_settings.html.diff.txt   |  21 ++
 .../case_search_templates.html.diff.txt       |  42 +++
 .../project_limits_table.html.diff.txt        |  22 ++
 .../domain/admin/project_limits.html.diff.txt |  15 +
 .../admin/project_privacy.html.diff.txt       |  11 +
 .../recovery_measures_history.html.diff.txt   |  24 ++
 .../domain/admin/sms_rates.html.diff.txt      |  27 ++
 .../domain/admin/sms_settings.html.diff.txt   |  11 +
 .../admin/transfer_domain.html.diff.txt       |  23 ++
 .../transfer_domain_pending.html.diff.txt     |  38 +++
 .../domain/base_change_plan.html.diff.txt     |  17 ++
 .../domain/billing_statements.html.diff.txt   | 132 +++++++++
 .../domain/confirm_billing_info.html.diff.txt |  36 +++
 .../domain/confirm_plan.html.diff.txt         |  66 +++++
 ...confirm_subscription_renewal.html.diff.txt |  27 ++
 .../domain/current_subscription.html.diff.txt | 271 ++++++++++++++++++
 .../data_migration_in_progress.html.diff.txt  |   8 +
 .../domain/email/domain_invite.html.diff.txt  |  11 +
 ...cient_privilege_notification.html.diff.txt |  23 ++
 .../internal_calculations.html.diff.txt       |  32 +++
 .../domain/internal_settings.html.diff.txt    |  22 ++
 ...rnal_subscription_management.html.diff.txt |  28 ++
 ...nage_releases_by_app_profile.html.diff.txt |  75 +++++
 .../manage_releases_by_location.html.diff.txt |  64 +++++
 .../license_explanations.html.diff.txt        |  29 ++
 .../partials/payment_modal.html.diff.txt      |  53 ++++
 .../domain/pro_bono/domain.html.diff.txt      |  14 +
 .../pro_bono/page_content.html.diff.txt       |  10 +
 .../domain/pro_bono/static.html.diff.txt      |  14 +
 .../domain/renew_plan.html.diff.txt           |  24 ++
 .../domain/select.html.diff.txt               |  69 +++++
 .../domain/select_plan.html.diff.txt          |  70 +++++
 .../selected_plan_contact.html.diff.txt       |  21 ++
 .../domain/stripe_cards.html.diff.txt         |  82 ++++++
 .../domain/tombstone_management.html.diff.txt |  32 +++
 .../update_billing_contact_info.html.diff.txt |  27 ++
 .../domain/js/billing_statements.js.diff.txt  |  16 ++
 .../domain/js/case_search.js.diff.txt         |  14 +
 .../domain/js/case_search_main.js.diff.txt    |  14 +
 .../domain/js/info_basic.js.diff.txt          |  13 +
 ...ternal_subscription_management.js.diff.txt |  12 +
 .../javascript/domain/js/toggles.js.diff.txt  |  19 ++
 .../update_billing_contact_info.js.diff.txt   |  16 ++
 55 files changed, 2043 insertions(+)
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/activate_transfer_domain.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/calendar_fixture.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/case_search.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/commtrack_action_table.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/commtrack_settings.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/edit_alert.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/feature_previews.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/flags_and_privileges.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/global_sms_rates.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/info_basic.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/location_fixture.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/manage_alerts.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/my_project_settings.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/partials/case_search_templates.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/partials/project_limits_table.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/project_limits.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/project_privacy.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/recovery_measures_history.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_rates.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_settings.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/transfer_domain.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/transfer_domain_pending.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/base_change_plan.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/billing_statements.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_billing_info.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_plan.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_subscription_renewal.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/current_subscription.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/data_migration_in_progress.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/email/domain_invite.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/insufficient_privilege_notification.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_calculations.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_settings.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_subscription_management.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/manage_releases_by_app_profile.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/manage_releases_by_location.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/partials/license_explanations.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/partials/payment_modal.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/domain.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/page_content.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/static.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/renew_plan.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/select.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/select_plan.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/selected_plan_contact.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/stripe_cards.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/tombstone_management.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/update_billing_contact_info.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/billing_statements.js.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/case_search.js.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/case_search_main.js.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/info_basic.js.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/internal_subscription_management.js.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/toggles.js.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/update_billing_contact_info.js.diff.txt

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/activate_transfer_domain.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/activate_transfer_domain.html.diff.txt
new file mode 100644
index 000000000000..6de4bc6a522b
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/activate_transfer_domain.html.diff.txt
@@ -0,0 +1,38 @@
+--- 
++++ 
+@@ -1,14 +1,14 @@
+-{% extends 'hqwebapp/bootstrap3/base_navigation.html' %}
++{% extends 'hqwebapp/bootstrap5/base_navigation.html' %}
+ {% load hq_shared_tags %}
+ {% load i18n %}
+ 
+ {% block content %}
+   <div class="container" id="hq-content">
+     <div class="row">
+-      <div class="page-header">
++      <div class="page-header">  {# todo B5: css-page-header #}
+         <h1>{% trans "Transfer project ownership" %}</h1>
+       </div>
+-      <div class="col-md-8 col-xs-12">
++      <div class="col-lg-8 col-sm-12">
+         {% if transfer %}
+           <p class="lead">
+             {% blocktrans with domain=transfer.domain%}
+@@ -18,14 +18,14 @@
+             {% endblocktrans %}
+           </p>
+           <div class="row">
+-            <div class="col-md-2">
++            <div class="col-lg-2">
+               <form action="{{ transfer.activate_url }}" method="POST">{% csrf_token %}
+                 <input type="submit" value="{% trans "Accept" %}" class="btn btn-primary"/>
+               </form>
+             </div>
+-            <div class="col-md-2">
++            <div class="col-lg-2">
+               <form action="{{ transfer.deactivate_url }}" method="POST">{% csrf_token %}
+-                <input type="submit" value="{% trans "Decline" %}" class="btn btn-danger"/>
++                <input type="submit" value="{% trans "Decline" %}" class="btn btn-outline-danger"/>
+               </form>
+             </div>
+           </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/calendar_fixture.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/calendar_fixture.html.diff.txt
new file mode 100644
index 000000000000..ecf3c8875f84
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/calendar_fixture.html.diff.txt
@@ -0,0 +1,12 @@
+--- 
++++ 
+@@ -1,7 +1,7 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load crispy_forms_tags %}
+ {% load i18n %}
+ {% block page_content %}
+   <h1>{% trans "Calendar Fixture Settings" %}</h1>
+-  {% crispy form %}
++  {% crispy form %}  {# todo B5: crispy #}
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/case_search.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/case_search.html.diff.txt
new file mode 100644
index 000000000000..98e35dc5442d
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/case_search.html.diff.txt
@@ -0,0 +1,70 @@
+--- 
++++ 
+@@ -1,18 +1,18 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load hq_shared_tags %}
+ {% load i18n %}
+ 
+-{% requirejs_main 'domain/js/bootstrap3/case_search_main' %}
++{% requirejs_main_b5 'domain/js/bootstrap5/case_search_main' %}
+ 
+ {% block page_content %}
+-  {% include 'domain/admin/partials/bootstrap3/case_search_templates.html' %}
++  {% include 'domain/admin/partials/bootstrap5/case_search_templates.html' %}
+   {% initial_page_data 'case_types' case_types %}
+   {% initial_page_data 'values' values %}
+   {% registerurl 'case_search_config' request.domain %}
+   <h1>{% trans "Enable Case Search" %}</h1>
+ 
+   <div class="row">
+-    <div class="col-sm-6">
++    <div class="col-md-6">
+       <form id="case-search-config">
+         {% csrf_token %}
+         <div data-bind="saveButton: saveButton"></div>
+@@ -31,7 +31,7 @@
+         </p>
+ 
+         <p>
+-          <input id="enable" type="checkbox" data-bind="checked: toggleEnabled"/>
++          <input id="enable" type="checkbox" data-bind="checked: toggleEnabled"/>  {# todo B5: css-checkbox #}
+           <label for="enable">{% trans "Enable Case Search" %}</label>
+         </p>
+ 
+@@ -70,7 +70,7 @@
+         <div data-bind="visible: toggleEnabled">
+           <h2>{% trans "Synchronous Web Apps Submissions" %}</h2>
+           <p>
+-            <input id="sync-web-apps" type="checkbox" data-bind="checked: synchronousWebApps"/>
++            <input id="sync-web-apps" type="checkbox" data-bind="checked: synchronousWebApps"/>  {# todo B5: css-checkbox #}
+             <label for="sync-web-apps">
+               {% blocktrans %}
+                 Update case search data immediately on web apps form submission.
+@@ -87,7 +87,7 @@
+         <div data-bind="visible: toggleEnabled">
+           <h2>{% trans "Sync Cases On Form Entry" %}</h2>
+           <p>
+-            <input id="sync-case-on-form-entry" type="checkbox" data-bind="checked: syncCaseOnFormEntry"/>
++            <input id="sync-case-on-form-entry" type="checkbox" data-bind="checked: syncCaseOnFormEntry"/>  {# todo B5: css-checkbox #}
+             <label for="sync-case-on-form-entry">
+               {% blocktrans %}
+                 Update local case data immediately before entering a web apps form.
+@@ -124,7 +124,7 @@
+             <tbody data-bind="foreach: ignorePatterns">
+             <tr>
+               <td>
+-                <select class="form-control" data-bind="options: $root.caseTypes, value: caseType"></select>
++                <select class="form-select" data-bind="options: $root.caseTypes, value: caseType"></select>
+               </td>
+               <td>
+                 <input type="text" class="form-control" data-bind="value: caseProperty" placeholder="e.g. name" />
+@@ -134,7 +134,7 @@
+               </td>
+               <td>
+                 <button type="button"
+-                        class="btn btn-danger pull-right"
++                        class="btn btn-outline-danger float-end"
+                         data-bind="click: function(){$parent.removeIgnorePatterns($data); $parent.change();}">
+                   <i class="fa-regular fa-trash-can"></i>
+                 </button>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/commtrack_action_table.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/commtrack_action_table.html.diff.txt
new file mode 100644
index 000000000000..9800de029a63
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/commtrack_action_table.html.diff.txt
@@ -0,0 +1,34 @@
+--- 
++++ 
+@@ -1,5 +1,5 @@
+ {% load i18n %}
+-<div class="panel panel-default">
++<div class="card ">  {# todo B5: css-panel #}
+   <table class="table table-striped table-bordered">
+     <thead>
+     <tr>
+@@ -11,19 +11,19 @@
+     </thead>
+     <tbody data-bind="foreach: actions">
+     <tr>
+-      <td class="form-group" data-bind="css: { 'has-error': captionError }">
++      <td class="form-group" data-bind="css: { 'has-error': captionError }">  {# todo B5: css-form-group, css-has-error #}
+         <input class="form-control" data-bind="value: caption" type="text" />
+         <div class="help-inline" data-bind="text: captionError"></div>
+       </td>
+-      <td class="form-group" data-bind="css: { 'has-error': keywordError }">
++      <td class="form-group" data-bind="css: { 'has-error': keywordError }">  {# todo B5: css-form-group, css-has-error #}
+         <input class="form-control" data-bind="value: keyword" type="text" />
+         <div class="help-inline" data-bind="text: keywordError"></div>
+       </td>
+-      <td class="form-group">
+-        <select class="form-control" data-bind="value: type, options: $parent.action_types, optionsText: 'label', optionsValue: 'value'"></select>
++      <td class="form-group">  {# todo B5: css-form-group #}
++        <select class="form-select" data-bind="value: type, options: $parent.action_types, optionsText: 'label', optionsValue: 'value'"></select>
+       </td>
+       <td>
+-        <button type="button" class="btn btn-danger" data-bind="click: $parent.remove_action"><i class="fa fa-remove"></i> {% trans "Remove" %}</button>
++        <button type="button" class="btn btn-outline-danger" data-bind="click: $parent.remove_action"><i class="fa fa-remove"></i> {% trans "Remove" %}</button>
+       </td>
+     </tr>
+     </tbody>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/commtrack_settings.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/commtrack_settings.html.diff.txt
new file mode 100644
index 000000000000..19eef577baaa
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/commtrack_settings.html.diff.txt
@@ -0,0 +1,9 @@
+--- 
++++ 
+@@ -6,5 +6,5 @@
+ {% requirejs_main_b5 "domain/js/commtrack_settings" %}
+ 
+ {% block page_content %}
+-  {% crispy form %}
++  {% crispy form %}  {# todo B5: crispy #}
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/edit_alert.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/edit_alert.html.diff.txt
new file mode 100644
index 000000000000..ea0af96d96eb
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/edit_alert.html.diff.txt
@@ -0,0 +1,17 @@
+--- 
++++ 
+@@ -1,4 +1,4 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load crispy_forms_tags %}
+ {% load i18n %}
+ 
+@@ -6,7 +6,7 @@
+   <form class="form form-horizontal" method="post">
+     <fieldset>
+       <legend>{% trans 'Edit Alert' %}</legend>
+-      {% crispy form %}
++      {% crispy form %}  {# todo B5: crispy #}
+     </fieldset>
+   </form>
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/feature_previews.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/feature_previews.html.diff.txt
new file mode 100644
index 000000000000..151324aaa2e3
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/feature_previews.html.diff.txt
@@ -0,0 +1,42 @@
+--- 
++++ 
+@@ -1,4 +1,4 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load i18n %}
+ {% load hq_shared_tags %}
+ 
+@@ -7,7 +7,7 @@
+     {% trans "Feature Previews" %}
+   </p>
+   <div class="row">
+-    <div class="col-md-6">
++    <div class="col-lg-6">
+       <p class="help-block">
+         <strong>
+           {% trans "What are Feature Previews?" %}
+@@ -107,13 +107,13 @@
+   </div>
+ 
+   <div class="row">
+-    <div class="col-sm-10">
++    <div class="col-md-10">
+       <form action="" method="post">
+         {% csrf_token %}
+         <button type="submit" class="btn btn-primary">{% trans "Update previews" %}</button>
+         <table class="table table-striped">
+           <thead>
+-          <th class="col-sm-3">{% trans "Feature Name" %}</th>
++          <th class="col-md-3">{% trans "Feature Name" %}</th>
+           <th>{% trans "Description" %}</th>
+           <th>{% trans "Enable" %}</th>
+           </thead>
+@@ -128,7 +128,7 @@
+                 {% endif %}
+               </td>
+               <td>
+-                <input type="checkbox" name="{{ feature.slug }}" {% if enabled %}checked{% endif %}/>
++                <input type="checkbox" name="{{ feature.slug }}" {% if enabled %}checked{% endif %}/>  {# todo B5: css-checkbox #}
+               </td>
+             </tr>
+           {% endfor %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/flags_and_privileges.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/flags_and_privileges.html.diff.txt
new file mode 100644
index 000000000000..3697c9a5e34f
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/flags_and_privileges.html.diff.txt
@@ -0,0 +1,100 @@
+--- 
++++ 
+@@ -1,8 +1,8 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load hq_shared_tags %}
+ {% load i18n %}
+ 
+-{% js_entry_b3 'domain/js/bootstrap3/toggles' %}
++{% js_entry_b3 'domain/js/bootstrap5/toggles' %}
+ 
+ {% block page_content %}
+ 
+@@ -12,7 +12,7 @@
+   {% registerurl 'edit_toggle' '---' %}
+ 
+   <div class="row">
+-    <div class="col-sm-10">
++    <div class="col-md-10">
+       <p>
+         Features can be enabled or disabled based on feature flags or privileges. This page
+         is intended to provide a list of what features a domain has access to.
+@@ -21,7 +21,7 @@
+   </div>
+ 
+   <div class="row">
+-    <div class="col-sm-10">
++    <div class="col-md-10">
+       <h1>Privileges</h1>
+       <p>
+         {% url "domain_subscription_view" domain as software_plan_url %}
+@@ -30,7 +30,7 @@
+         <a href="{{ software_plan_url }}">Current Subscription</a>
+       </p>
+     </div>
+-    <div class="col-sm-10">
++    <div class="col-md-10">
+       <table class="table table-striped">
+         <thead>
+         <th>Privilege</th>
+@@ -55,7 +55,7 @@
+   </div>
+ 
+   <div class="row">
+-    <div class="col-sm-10">
++    <div class="col-md-10">
+       <h1>Feature Flags</h1>
+       <p>
+         {% url 'toggle_list' as toggle_url %}
+@@ -68,7 +68,7 @@
+         This does not include any flags set for other users in this domain.
+       </p>
+     </div>
+-    <div class="col-sm-10">
++    <div class="col-md-10">
+       <table class="table table-striped ko-template" id="toggles-table">
+         <thead>
+         <th>Tag</th>
+@@ -82,16 +82,16 @@
+           <td>
+                             <span data-bind="css: ('label-' + tagCssClass),
+                                              text: tag"
+-                                  class="label"></span>
++                                  class="badge"></span>
+           </td>
+ 
+           <td>
+             <i class="fa fa-flag" data-bind="visible: isEnabled"></i>
+           </td>
+ 
+-          <td data-bind="css: {'text-muted': !isEnabled()}" >
++          <td data-bind="css: {'text-body-secondary': !isEnabled()}" >
+             <div class="row clickable" data-bind="click: showHideDescription">
+-              <!--ko text: label --><!--/ko-->
++              <!--ko text: badge --><!--/ko-->
+ 
+               <span data-bind="visible: description || helpLink">&hellip;</span>
+             </div>
+@@ -107,10 +107,10 @@
+ 
+               <span data-bind="css: ('label-' + tagCssClass),
+                                                     text: tag"
+-                    class="label"></span>
++                    class="badge"></span>
+               <span data-bind="html: tagDescription"></span>
+ 
+-              <div class="text-right">
++              <div class="text-end">
+                 <small><a class="text-uppercase" data-bind="attr: {href: editLink}, text: slug"></a></small>
+               </div>
+             </div>
+@@ -123,7 +123,7 @@
+           <td class="text-center">
+             <div data-bind="visible: hasDomainNamespace">
+               <button type="button"
+-                      class="btn btn-default"
++                      class="btn btn-outline-primary"
+                       data-bind="click: toggleEnabledState,
+                                  disable: setTogglePending,
+                                  css: {
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/global_sms_rates.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/global_sms_rates.html.diff.txt
new file mode 100644
index 000000000000..e12d49307352
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/global_sms_rates.html.diff.txt
@@ -0,0 +1,40 @@
+--- 
++++ 
+@@ -1,16 +1,16 @@
+-{% extends "hqwebapp/bootstrap3/two_column.html" %}
++{% extends "hqwebapp/bootstrap5/two_column.html" %}
+ {% load hq_shared_tags %}
+ {% load crispy_forms_tags %}
+ {% load i18n %}
+ 
+-{% requirejs_main 'smsbillables/js/smsbillables.rate_calc' %}
++{% requirejs_main_b5 'smsbillables/js/smsbillables.rate_calc' %}
+ 
+ {% block title %}{% trans "SMS Pricing" %}{% endblock %}
+ 
+ {% block page_title %}{% trans "SMS Pricing" %}{% endblock page_title %}
+ 
+ {% block page_breadcrumbs %}
+-  <ol id="hq-breadcrumbs" class="breadcrumb breadcrumb-hq-section">
++  <ol id="hq-breadcrumbs" class="breadcrumb breadcrumb-hq-section">  {# todo B5: css-breadcrumb #}
+     <li>
+       <a href="/pricing/"><strong>{% trans "Pricing" %}</strong></a>
+     </li>
+@@ -33,7 +33,7 @@
+   </p>
+   <hr />
+   <div class="ko-public-sms-rate-calculator">
+-    {% crispy rate_calc_form %}
++    {% crispy rate_calc_form %}  {# todo B5: crispy #}
+     <div class="alert alert-info" data-bind="visible: calculatingRate">
+       {% blocktrans %}
+         Calculating SMS Rate...
+@@ -43,7 +43,7 @@
+          data-bind="text: rateErrorText,
+                         css: { 'alert-danger': hasError, 'alert-info': noError },
+                         visible: showRateInfo"></div>
+-    <table class="table table-striped table-bordered" style="margin-bottom:0"
++    <table class="table table-striped table-bordered" style="margin-bottom:0"  {# todo B5: inline-style #}
+            data-bind="visible: showTable">
+       <thead>
+       <tr>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/info_basic.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/info_basic.html.diff.txt
new file mode 100644
index 000000000000..f95046a08f05
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/info_basic.html.diff.txt
@@ -0,0 +1,21 @@
+--- 
++++ 
+@@ -1,9 +1,9 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load crispy_forms_tags %}
+ {% load hq_shared_tags %}
+ 
+ 
+-{% requirejs_main 'domain/js/bootstrap3/info_basic' %}
++{% requirejs_main_b5 'domain/js/bootstrap5/info_basic' %}
+ 
+ {% block stylesheets %}{{ block.super }}
+    <link rel="stylesheet" href="{% static '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.css' %}" type="text/css" />
+@@ -11,5 +11,5 @@
+ 
+ {% block page_content %}
+     {% initial_page_data 'mapbox_access_token' mapbox_access_token %}
+-  {% crispy basic_info_form %}
++  {% crispy basic_info_form %}  {# todo B5: crispy #}
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/location_fixture.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/location_fixture.html.diff.txt
new file mode 100644
index 000000000000..e1eca8ee4530
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/location_fixture.html.diff.txt
@@ -0,0 +1,12 @@
+--- 
++++ 
+@@ -1,7 +1,7 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load crispy_forms_tags %}
+ {% load i18n %}
+ {% block page_content %}
+   <h1>{% trans "Location Fixture Settings" %}</h1>
+-  {% crispy form %}
++  {% crispy form %}  {# todo B5: crispy #}
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/manage_alerts.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/manage_alerts.html.diff.txt
new file mode 100644
index 000000000000..580a2d9fe710
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/manage_alerts.html.diff.txt
@@ -0,0 +1,53 @@
+--- 
++++ 
+@@ -1,9 +1,9 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load crispy_forms_tags %}
+ {% load hq_shared_tags %}
+ {% load i18n %}
+ 
+-{% requirejs_main "domain/js/manage_alerts" %}
++{% requirejs_main_b5 "domain/js/manage_alerts" %}
+ 
+ {% block page_content %}
+     {% initial_page_data 'alerts' alerts %}
+@@ -12,7 +12,7 @@
+     <form class="form form-horizontal" method="post">
+       <fieldset>
+         <legend>{% trans 'Add New Alert' %}</legend>
+-        {% crispy form %}
++        {% crispy form %}  {# todo B5: crispy #}
+       </fieldset>
+     </form>
+     <div id="ko-alert-container">
+@@ -54,7 +54,7 @@
+             <td data-bind="text: created_by_user">
+             </td>
+             <td>
+-              <form action="{% url 'update_domain_alert_status' domain %}" method="post" style="float: left; margin-right: 5px;">
++              <form action="{% url 'update_domain_alert_status' domain %}" method="post" style="float: left; margin-right: 5px;">  {# todo B5: inline-style #}
+                 {% csrf_token %}
+                 <input name="alert_id"
+                        type="hidden"
+@@ -74,17 +74,17 @@
+                   {% trans "De-activate Alert" %}
+                 </button>
+               </form>
+-              <a class="btn btn-default" data-bind="attr: {href: editUrl}" style="float: left; margin-right: 5px;">
++              <a class="btn btn-outline-primary" data-bind="attr: {href: editUrl}" style="float: left; margin-right: 5px;">  {# todo B5: inline-style #}
+                 <i class="fa fa-edit"></i>
+                 {% trans "Edit" %}
+               </a>
+-              <form action="{% url 'delete_domain_alert' domain %}" method="post" style="float: left">
++              <form action="{% url 'delete_domain_alert' domain %}" method="post" style="float: left">  {# todo B5: inline-style #}
+                 {% csrf_token %}
+                 <input name="alert_id"
+                        type="hidden"
+                        data-bind="value: id">
+                 <button type="submit"
+-                      class="btn btn-danger">
++                      class="btn btn-outline-danger">
+                   <i class="fa fa-trash"></i>
+                   {% trans "Delete" %}
+                 </button>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/my_project_settings.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/my_project_settings.html.diff.txt
new file mode 100644
index 000000000000..224ca76d73a8
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/my_project_settings.html.diff.txt
@@ -0,0 +1,21 @@
+--- 
++++ 
+@@ -1,9 +1,9 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load hq_shared_tags %}
+ {% load crispy_forms_tags %}
+ {% load i18n %}
+ 
+-{% requirejs_main 'domain/js/my_project_settings' %}
++{% requirejs_main_b5 'domain/js/my_project_settings' %}
+ 
+ {% block stylesheets %}
+   <style>
+@@ -17,5 +17,5 @@
+ {% block page_content %}
+   {% initial_page_data "override_global_tz" override_global_tz %}
+   {% initial_page_data "no_domain_membership" no_domain_membership %}
+-  {% crispy my_project_settings_form %}
++  {% crispy my_project_settings_form %}  {# todo B5: crispy #}
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/partials/case_search_templates.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/partials/case_search_templates.html.diff.txt
new file mode 100644
index 000000000000..b61f1a5c61fd
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/partials/case_search_templates.html.diff.txt
@@ -0,0 +1,42 @@
+--- 
++++ 
+@@ -1,30 +1,30 @@
+ {% load i18n %}
+ 
+-<div id="property_template" class="hide">
+-  <div class="form-group form-inline clearfix">
++<div id="property_template" class="d-none">
++  <div class="form-group form-inline clearfix">  {# todo B5: css-form-group, css-form-inline #}
+     <label>{% trans "Case property" %}
+       <input type="text" class="form-control" data-bind="value: property.name" placeholder="e.g. name" />
+     </label>
+     <button type="button"
+-            class="btn btn-danger pull-right"
++            class="btn btn-outline-danger float-end"
+             data-bind="click: function(){$parent.removeProperty($data); $root.change();}">
+       <i class="fa-regular fa-trash-can"></i>
+     </button>
+   </div>
+ </div>
+ 
+-<div id="case_type_template" class="hide">
+-  <div class="panel panel-default">
+-    <div class="panel-heading clearfix form-inline">
++<div id="case_type_template" class="d-none">
++  <div class="card ">  {# todo B5: css-panel #}
++    <div class="card-header clearfix form-inline">  {# todo B5: css-form-inline #}
+       <strong>{% trans "Case type" %}</strong>
+-      <select class="form-control" data-bind="options: $root.caseTypes, value: caseType"></select>
++      <select class="form-select" data-bind="options: $root.caseTypes, value: caseType"></select>
+       <button type="button"
+-              class="btn btn-danger pull-right"
++              class="btn btn-outline-danger float-end"
+               data-bind="click: $root.removeCaseType">
+         <i class="fa-regular fa-trash-can"></i>
+       </button>
+     </div>
+-    <div class="panel-body">
++    <div class="card-body">
+       <div data-bind="template: { name: 'property_template', foreach: properties, as: 'property' }"></div>
+       <button type="button"
+               class="btn btn-primary"
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/partials/project_limits_table.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/partials/project_limits_table.html.diff.txt
new file mode 100644
index 000000000000..47b3f6b62c59
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/partials/project_limits_table.html.diff.txt
@@ -0,0 +1,22 @@
+--- 
++++ 
+@@ -5,7 +5,7 @@
+ {% endcomment %}
+ 
+ <div class="row">
+-  <div class="col-sm-10">
++  <div class="col-md-10">
+     {% for header, rate_infos in project_limits %}
+     <h1>{{ header }}</h1>
+     <table class="table table-striped">
+@@ -23,8 +23,8 @@
+           <td>{{ rate_info.key }}</td>
+           <td>
+             {{ rate_info.percent_usage }}%
+-            <div class="progress">
+-              <div class="progress-bar progress-bar-striped" style="width: {{ rate_info.percent_usage }}%"></div>
++            <div class="progress">  {# todo B5: css-progress #}
++              <div class="progress-bar progress-bar-striped" style="width: {{ rate_info.percent_usage }}%"></div>  {# todo B5: inline-style #}
+             </div>
+           </td>
+           <td>{{ rate_info.current_usage }}</td>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/project_limits.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/project_limits.html.diff.txt
new file mode 100644
index 000000000000..4409c60d9cae
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/project_limits.html.diff.txt
@@ -0,0 +1,15 @@
+--- 
++++ 
+@@ -1,10 +1,10 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load hq_shared_tags %}
+ 
+ {% block page_content %}
+ 
+   {% initial_page_data 'domain' domain %}
+ 
+-  {% include "domain/admin/partials/bootstrap3/project_limits_table.html" %}
++  {% include "domain/admin/partials/bootstrap5/project_limits_table.html" %}
+ 
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/project_privacy.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/project_privacy.html.diff.txt
new file mode 100644
index 000000000000..dd747e12b90c
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/project_privacy.html.diff.txt
@@ -0,0 +1,11 @@
+--- 
++++ 
+@@ -1,6 +1,6 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load crispy_forms_tags %}
+ 
+ {% block page_content %}
+-  {% crispy privacy_form %}
++  {% crispy privacy_form %}  {# todo B5: crispy #}
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/recovery_measures_history.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/recovery_measures_history.html.diff.txt
new file mode 100644
index 000000000000..ea03261d2fe0
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/recovery_measures_history.html.diff.txt
@@ -0,0 +1,24 @@
+--- 
++++ 
+@@ -1,10 +1,10 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load i18n %}
+ {% load hq_shared_tags %}
+ 
+ {% block page_content %}
+   <div class="row">
+-    <div class="col-sm-10">
++    <div class="col-md-10">
+ 
+       {% for app_name, measures in measures_by_app %}
+         <table class="table table-striped">
+@@ -17,7 +17,7 @@
+           <th>{% trans "CC Versions" %}</th>
+           <th>{% trans "Created On" %}</th>
+           <th>{% trans "User" %}</th>
+-          <th class="col-sm-4">{% trans "Notes" %}</th>
++          <th class="col-md-4">{% trans "Notes" %}</th>
+           </thead>
+ 
+           <tbody>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_rates.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_rates.html.diff.txt
new file mode 100644
index 000000000000..81b11895e924
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_rates.html.diff.txt
@@ -0,0 +1,27 @@
+--- 
++++ 
+@@ -1,12 +1,12 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load hq_shared_tags %}
+ {% load crispy_forms_tags %}
+ {% load i18n %}
+ 
+-{% requirejs_main 'smsbillables/js/smsbillables.rate_calc' %}
++{% requirejs_main_b5 'smsbillables/js/smsbillables.rate_calc' %}
+ 
+ {% block page_content %}
+-  <div class="well">
++  <div class="card">  {# todo B5: css-well #}
+     <p class="lead">
+       {% blocktrans %}
+         Use this form to get a cost estimation per 160 character SMS,
+@@ -30,7 +30,7 @@
+   </div>
+   <hr />
+   <div class="ko-sms-rate-calculator">
+-    {% crispy rate_calc_form %}
++    {% crispy rate_calc_form %}  {# todo B5: crispy #}
+     <div class="alert alert-success" data-bind="visible: calculatingRate">
+       {% blocktrans %}
+         Calculating SMS Rate...
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_settings.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_settings.html.diff.txt
new file mode 100644
index 000000000000..474d9b403401
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_settings.html.diff.txt
@@ -0,0 +1,11 @@
+--- 
++++ 
+@@ -12,7 +12,7 @@
+     <fieldset>
+       <legend>{% trans 'Stock Actions' %}</legend>
+       <div class="{% css_field_class %}">
+-        {% include "domain/admin/bootstrap3/commtrack_action_table.html" %}
++        {% include "domain/admin/bootstrap5/commtrack_action_table.html" %}
+         <button type="button" class="btn btn-outline-primary float-end" data-bind="click: new_action">
+           <i class="fa fa-plus"></i> {% trans "New Action" %}
+         </button>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/transfer_domain.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/transfer_domain.html.diff.txt
new file mode 100644
index 000000000000..fa3eb59d0714
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/transfer_domain.html.diff.txt
@@ -0,0 +1,23 @@
+--- 
++++ 
+@@ -1,17 +1,17 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load hq_shared_tags %}
+ {% load crispy_forms_tags %}
+ {% load i18n %}
+ 
+ 
+ {% block page_content %}
+-  <div class="page-header">
++  <div class="page-header">  {# todo B5: css-page-header #}
+     <h3>
+       {% blocktrans %}
+         Use this to transfer your project to another user.
+       {% endblocktrans %}
+     </h3>
+   </div>
+-  {% crispy form %}
++  {% crispy form %}  {# todo B5: crispy #}
+ {% endblock %}
+ 
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/transfer_domain_pending.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/transfer_domain_pending.html.diff.txt
new file mode 100644
index 000000000000..7f757e419f0e
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/transfer_domain_pending.html.diff.txt
@@ -0,0 +1,38 @@
+--- 
++++ 
+@@ -1,4 +1,4 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load hq_shared_tags %}
+ {% load crispy_forms_tags %}
+ {% load i18n %}
+@@ -6,7 +6,7 @@
+ 
+ {% block page_content %}
+   <div class="row">
+-    <div class="col-sm-12">
++    <div class="col-md-12">
+       <h4>
+         {% blocktrans with username=transfer.to_username %}
+           You have a pending transfer with {{ username }}
+@@ -15,17 +15,17 @@
+     </div>
+   </div>
+   <div class="row">
+-    <div class="col-sm-2">
++    <div class="col-md-2">
+       <a href="{% url 'transfer_domain_view' domain %}?resend=true" class="btn btn-primary">
+         {% blocktrans %}
+           Resend Transfer Request
+         {% endblocktrans %}
+       </a>
+     </div>
+-    <div class="col-sm-2">
++    <div class="col-md-2">
+       <form action="{{ transfer.deactivate_url }}" method="POST">
+         {% csrf_token %}
+-        <input class="btn btn-danger" type="submit" value="{% trans "Cancel Transfer" %}" />
++        <input class="btn btn-outline-danger" type="submit" value="{% trans "Cancel Transfer" %}" />
+       </form>
+     </div>
+   </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/base_change_plan.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/base_change_plan.html.diff.txt
new file mode 100644
index 000000000000..a55b0d004aa3
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/base_change_plan.html.diff.txt
@@ -0,0 +1,17 @@
+--- 
++++ 
+@@ -1,4 +1,4 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load i18n %}
+ {% load hq_shared_tags %}
+ {% load compress %}
+@@ -14,7 +14,7 @@
+ 
+ {% block page_content %}
+   {% block plan_breadcrumbs %}
+-  <ol class="breadcrumb">
++  <ol class="breadcrumb">  {# todo B5: css-breadcrumb #}
+     {% for step in steps %}
+       <li>
+         <a href="{{ step.url }}" class="breadcrumb-{{ forloop.counter }}">{{ step.title }}</a>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/billing_statements.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/billing_statements.html.diff.txt
new file mode 100644
index 000000000000..30697208ea70
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/billing_statements.html.diff.txt
@@ -0,0 +1,132 @@
+--- 
++++ 
+@@ -1,11 +1,11 @@
+-{% extends 'hqwebapp/bootstrap3/base_paginated_crud.html' %}
++{% extends 'hqwebapp/bootstrap5/base_paginated_crud.html' %}
+ {% load i18n %}
+ {% load hq_shared_tags %}
+ 
+-{% requirejs_main 'domain/js/bootstrap3/billing_statements' %}
++{% requirejs_main_b5 'domain/js/bootstrap5/billing_statements' %}
+ 
+ {% block paginated_list_top %}
+-  {% initial_page_data 'pagination' pagination %}
++  {% initial_page_data 'pagination' pagination %}  {# todo B5: css-pagination #}
+   {% initial_page_data 'stripe_options' stripe_options %}
+   {% initial_page_data 'payment_urls' payment_urls %}
+   {% initial_page_data 'payment_error_messages' payment_error_messages %}
+@@ -21,8 +21,8 @@
+       <p data-bind="visible: hasInitialLoadFinished() && totalDue()">
+         <button type="button"
+                 class="btn btn-primary"
+-                data-toggle="modal"
+-                data-target="#bulkPaymentModal"
++                data-bs-toggle="modal"
++                data-bs-target="#bulkPaymentModal"
+                 id="bulkPaymentBtn">
+           {% trans 'Pay by Credit Card' %}
+         </button>
+@@ -30,14 +30,14 @@
+       <p data-bind="visible: hasInitialLoadFinished() && totalDue()">
+         <button type="button"
+                 class="btn btn-primary"
+-                data-toggle="modal"
+-                data-target="#bulkWirePaymentModal"
++                data-bs-toggle="modal"
++                data-bs-target="#bulkWirePaymentModal"
+                 id="bulkWirePaymentBtn">
+           {% trans 'Pay by Wire' %}
+         </button>
+       </p>
+     {% else %}
+-      <span class="label label-default">
++      <span class="badge text-bg-secondary">
+             <i class="fa fa-info-circle"></i>
+             {% trans "Not Billing Admin, Can't Make Payment" %}
+         </span>
+@@ -62,33 +62,33 @@
+ 
+ {% block pagination_templates %}
+   <script type="text/html" id="statement-row-template">
+-    <td class="col-sm-2" data-bind="text: invoice_number"></td>
++    <td class="col-md-2" data-bind="text: invoice_number"></td>
+     {% if show_plan %}
+-      <td class="col-sm-2" data-bind="text: plan.name"></td>
++      <td class="col-md-2" data-bind="text: plan.name"></td>
+     {% endif %}
+-    <td class="col-sm-3">
++    <td class="col-md-3">
+       <span data-bind="text: start"></span> - <span data-bind="text: end"></span>
+     </td>
+-    <td class="col-sm-1" data-bind="text: date_due"></td>
+-    <td class="col-sm-2">
++    <td class="col-md-1" data-bind="text: date_due"></td>
++    <td class="col-md-2">
+       <span data-bind="text: payment_status, attr: {class: payment_class}"></span>
+       <!-- ko if: canMakePayment -->
+       {% if not is_ops_user_but_not_admin %}
+         <button type="button"
+                 class="btn btn-primary payment-button"
+-                data-toggle="modal"
+-                data-target="#paymentModal">
++                data-bs-toggle="modal"
++                data-bs-target="#paymentModal">
+           {% trans 'Make Payment' %}
+         </button>
+       {% else %}
+-        <span class="label label-default">
++        <span class="badge text-bg-secondary">
+                     <i class="fa fa-info-circle"></i>
+                     {% trans "Not Billing Admin, Can't Make Payment" %}
+                 </span>
+       {% endif %}
+       <!-- /ko -->
+     </td>
+-    <td class="col-sm-2">
++    <td class="col-md-2">
+       <a class="btn btn-primary"
+          data-bind="attr: { href: pdfUrl }"
+          target="_blank">{% trans 'Download' %}</a>
+@@ -98,14 +98,14 @@
+   {% include 'accounting/partials/stripe_card_ko_template.html' %}
+ 
+   <script type="text/html" id="cost-item-template">
+-    <div class="form-group">
++    <div class="form-group">  {# todo B5: css-form-group #}
+       <input type="hidden"
+              name="invoice_id"
+              data-bind="value: id" />
+-      <label class="control-label col-sm-3">
++      <label class="form-label col-md-3">
+         {% trans 'Payment Amount' %}
+       </label>
+-      <div class="col-sm-9">
++      <div class="col-md-9">
+         <div class="radio">
+           <label>
+             <input type="radio"
+@@ -129,7 +129,7 @@
+               Pay a portion of the balance:
+             {% endblocktrans %}
+             <div class="input-group">
+-              <span class="input-group-addon">$</span>
++              <span class="input-group-addon">$</span>  {# todo B5: css-input-group-addon #}
+               <input type="text"
+                      class="form-control"
+                      name="customPaymentAmount"
+@@ -187,12 +187,12 @@
+ 
+ {% block modals %}{{ block.super }}
+   {% with process_invoice_payment_url as process_payment_url %}
+-    {% include 'domain/partials/bootstrap3/payment_modal.html' with payment_modal_id="paymentModal" title_template="payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment_complete_template_simple" %}
++    {% include 'domain/partials/bootstrap5/payment_modal.html' with payment_modal_id="paymentModal" title_template="payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment_complete_template_simple" %}
+   {% endwith %}
+   {% with process_bulk_payment_url as process_payment_url %}
+-    {% include 'domain/partials/bootstrap3/payment_modal.html' with payment_modal_id="bulkPaymentModal" title_template="bulk-payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment_complete_template_simple" %}
++    {% include 'domain/partials/bootstrap5/payment_modal.html' with payment_modal_id="bulkPaymentModal" title_template="bulk-payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment_complete_template_simple" %}
+   {% endwith %}
+   {% with process_wire_invoice_url as process_payment_url %}
+-    {% include 'domain/partials/bootstrap3/payment_modal.html' with payment_modal_id="bulkWirePaymentModal" title_template="bulk-wire-payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment_complete_template_wire" %}
++    {% include 'domain/partials/bootstrap5/payment_modal.html' with payment_modal_id="bulkWirePaymentModal" title_template="bulk-wire-payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment_complete_template_wire" %}
+   {% endwith %}
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_billing_info.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_billing_info.html.diff.txt
new file mode 100644
index 000000000000..6c50ad7532d0
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_billing_info.html.diff.txt
@@ -0,0 +1,36 @@
+--- 
++++ 
+@@ -1,9 +1,9 @@
+-{% extends "domain/bootstrap3/base_change_plan.html" %}
++{% extends "domain/bootstrap5/base_change_plan.html" %}
+ {% load crispy_forms_tags %}
+ {% load hq_shared_tags %}
+ {% load i18n %}
+ 
+-{% requirejs_main 'domain/js/confirm_billing_info' %}
++{% requirejs_main_b5 'domain/js/confirm_billing_info' %}
+ 
+ {% block form_content %}
+   {% initial_page_data "plan" plan %}
+@@ -18,15 +18,15 @@
+     {% endblocktrans %}
+   </p>
+ 
+-  <div class="panel panel-modern-gray panel-form-only" id="billing-info">
+-    <div class="panel-body">
+-      {% crispy billing_account_info_form %}
++  <div class="card card-modern-gray card-form-only" id="billing-info">  {# todo B5: css-panel #}
++    <div class="card-body">
++      {% crispy billing_account_info_form %}  {# todo B5: crispy #}
+     </div>
+   </div>
+ 
+-  <div class="panel panel-modern-gray panel-form-only" id="card-manager">
+-    <div class="panel-body">
+-      {% include 'domain/bootstrap3/stripe_cards.html' %}
++  <div class="card card-modern-gray card-form-only" id="card-manager">  {# todo B5: css-panel #}
++    <div class="card-body">
++      {% include 'domain/bootstrap5/stripe_cards.html' %}
+     </div>
+   </div>
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_plan.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_plan.html.diff.txt
new file mode 100644
index 000000000000..ebc642839abb
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_plan.html.diff.txt
@@ -0,0 +1,66 @@
+--- 
++++ 
+@@ -1,7 +1,7 @@
+-{% extends "domain/bootstrap3/base_change_plan.html" %}
++{% extends "domain/bootstrap5/base_change_plan.html" %}
+ {% load i18n %}
+ {% load hq_shared_tags %}
+-{% requirejs_main 'accounting/js/confirm_plan' %}
++{% requirejs_main_b5 'accounting/js/confirm_plan' %}
+ 
+ {% block form_content %}
+   {% initial_page_data 'is_upgrade' is_upgrade %}
+@@ -42,7 +42,7 @@
+         </p>
+       {% endif %}
+       <div class="text-center plan-next">
+-        <a href="{% url 'domain_select_plan' domain %}" class="btn btn-default btn-lg">
++        <a href="{% url 'domain_select_plan' domain %}" class="btn btn-outline-primary btn-lg">
+           {% if is_paused %}
+             {% trans 'Select different option' %}
+           {% else %}
+@@ -68,7 +68,7 @@
+     <div class="modal-dialog">
+       <div class="modal-content">
+         <div class="modal-header">
+-          <button type="button" class="close" data-dismiss="modal">
++          <button type="button" class="btn-close" data-bs-dismiss="modal">  {# todo B5: css-close #}
+             <span aria-hidden="true">&times;</span>
+             <span class="sr-only">{% trans "Close" %}</span>
+           </button>
+@@ -98,7 +98,7 @@
+                 Why are you downgrading your subscription today?
+               {% endblocktrans %}
+             {% endif %}
+-            <select multiple="multiple"
++            <select multiple="multiple"  {# todo B5: css-select-form-control #}
+                     class="form-control"
+                     data-bind="selectedOptions: oDowngradeReason,
+                                options: downgradeReasonList"></select>
+@@ -109,7 +109,7 @@
+               {% blocktrans %}
+                 Do you think your project may start again?
+               {% endblocktrans %}
+-              <select class="form-control"
++              <select class="form-select"
+                       data-bind="value: oWillProjectRestart">
+                 <option value="yes">
+                   {% trans "Yes" %}
+@@ -134,7 +134,7 @@
+               {% blocktrans %}
+                 Why are you switching to a new tool?
+               {% endblocktrans %}
+-              <select multiple="multiple"
++              <select multiple="multiple"  {# todo B5: css-select-form-control #}
+                       class="form-control"
+                       data-bind="selectedOptions: oNewToolReason,
+                                  options: newToolReasonList"></select>
+@@ -171,7 +171,7 @@
+           <!-- ko ifnot: oRequiredQuestionsAnswered -->
+             <button type="button"
+                     disabled="disabled"
+-                    class="btn btn-default">
++                    class="btn btn-outline-primary">
+               {% trans "Continue" %}
+             </button>
+           <!-- /ko -->
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_subscription_renewal.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_subscription_renewal.html.diff.txt
new file mode 100644
index 000000000000..7f72069b129a
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_subscription_renewal.html.diff.txt
@@ -0,0 +1,27 @@
+--- 
++++ 
+@@ -1,9 +1,9 @@
+-{% extends "domain/bootstrap3/base_change_plan.html" %}
++{% extends "domain/bootstrap5/base_change_plan.html" %}
+ {% load crispy_forms_tags %}
+ {% load hq_shared_tags %}
+ {% load i18n %}
+ 
+-{% requirejs_main 'accounting/js/widgets' %}
++{% requirejs_main_b5 'accounting/js/widgets' %}
+ 
+ {% block plan_breadcrumbs %}{% endblock %}
+ 
+@@ -28,9 +28,9 @@
+       {% endblocktrans %}
+     </div>
+   {% endif %}
+-  <div class="panel panel-modern-gray panel-form-only" id="billing-info">
+-    <div class="panel-body">
+-      {% crispy confirm_form %}
++  <div class="card card-modern-gray card-form-only" id="billing-info">  {# todo B5: css-panel #}
++    <div class="card-body">
++      {% crispy confirm_form %}  {# todo B5: crispy #}
+     </div>
+   </div>
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/current_subscription.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/current_subscription.html.diff.txt
new file mode 100644
index 000000000000..f94da7d7186d
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/current_subscription.html.diff.txt
@@ -0,0 +1,271 @@
+--- 
++++ 
+@@ -1,8 +1,8 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load hq_shared_tags %}
+ {% load i18n %}
+ 
+-{% requirejs_main 'domain/js/current_subscription' %}
++{% requirejs_main_b5 'domain/js/current_subscription' %}
+ 
+ {% block page_content %}
+   {% initial_page_data "stripe_public_key" stripe_public_key %}
+@@ -15,12 +15,12 @@
+   {% registerurl "domain_wire_payment" domain %}
+ 
+   <div class="row">
+-    <div class="col-sm-12">
++    <div class="col-md-12">
+       <article id="subscriptionSummary" class="form-horizontal">
+         <legend>{% trans 'Current Subscription' %}</legend>
+-        <div class="form-group">
+-          <label class="control-label col-sm-2">{% trans 'Plan' %}</label>
+-          <div class="col-sm-10">
++        <div class="form-group">  {# todo B5: css-form-group #}
++          <label class="form-label col-md-2">{% trans 'Plan' %}</label>
++          <div class="col-md-10">
+             <div class="{{ plan.css_class }}">
+               <h4>
+                 {% if plan.is_paused %}
+@@ -55,8 +55,8 @@
+             {% if can_change_subscription %}
+               {% if plan.is_annual_plan %}
+                 <form action="{% url 'annual_plan_request_quote' domain %}">
+-                  <div style="margin-top:10px;">
+-                    <label class="control-label">{% trans "Got questions about your plan?" %}</label>
++                  <div style="margin-top:10px;">  {# todo B5: inline-style #}
++                    <label class="form-label">{% trans "Got questions about your plan?" %}</label>
+                     <button class="btn btn-primary btn-lg">
+                       {% trans 'Talk to Sales' %}
+                     </button>
+@@ -64,7 +64,7 @@
+                 </form>
+               {% else %}
+                 <p>
+-                  <a class="btn btn-primary" style="margin-top:10px;" href="{{ change_plan_url }}">
++                  <a class="btn btn-primary" style="margin-top:10px;" href="{{ change_plan_url }}">  {# todo B5: inline-style #}
+                     {% if plan.is_paused %}
+                       {% trans "Subscribe to Plan" %}
+                     {% else %}
+@@ -95,17 +95,17 @@
+         </div>
+         {% if not plan.is_trial and not plan.is_paused %}
+           {% if plan.date_start %}
+-            <div class="form-group">
+-              <label class="control-label col-sm-2">{% trans 'Date Started' %}</label>
+-              <div class="col-sm-10">
++            <div class="form-group">  {# todo B5: css-form-group #}
++              <label class="form-label col-md-2">{% trans 'Date Started' %}</label>
++              <div class="col-md-10">
+                 <p class="form-control-text">{{ plan.date_start }}</p>
+               </div>
+             </div>
+           {% endif %}
+           {% if plan.date_end %}
+-            <div class="form-group">
+-              <label class="control-label col-sm-2">{% trans 'Date Ending' %}</label>
+-              <div class="col-sm-10">
++            <div class="form-group">  {# todo B5: css-form-group #}
++              <label class="form-label col-md-2">{% trans 'Date Ending' %}</label>
++              <div class="col-md-10">
+                 <p class="form-control-text">{{ plan.date_end }}</p>
+                 {% if plan.next_subscription.can_renew %}
+                   <a href="{{ plan.next_subscription.renew_url }}"
+@@ -117,9 +117,9 @@
+             </div>
+           {% endif %}
+           <div data-bind="foreach: products">
+-            <div class="form-group">
+-              <label class="control-label col-sm-2">{% trans 'Current Price' %}</label>
+-              <div class="col-sm-10">
++            <div class="form-group">  {# todo B5: css-form-group #}
++              <label class="form-label col-md-2">{% trans 'Current Price' %}</label>
++              <div class="col-md-10">
+                 <p class="form-control-text"
+                    data-bind="text: monthlyFee"></p>
+               </div>
+@@ -127,31 +127,31 @@
+           </div>
+         {% endif %}
+         {% if plan.next_subscription.exists and not plan.next_subscription.is_paused %}
+-          <div class="form-group">
+-            <label class="control-label col-sm-2">
++          <div class="form-group">  {# todo B5: css-form-group #}
++            <label class="form-label col-md-2">
+               {% trans "Next Subscription Begins" %}
+             </label>
+-            <div class="col-sm-10">
++            <div class="col-md-10">
+               <p class="form-control-text">
+                 {{ plan.next_subscription.date_start }}
+               </p>
+             </div>
+           </div>
+-          <div class="form-group">
+-            <label class="control-label col-sm-2">
++          <div class="form-group">  {# todo B5: css-form-group #}
++            <label class="form-label col-md-2">
+               {% trans "Next Subscription Plan" %}
+             </label>
+-            <div class="col-sm-10">
++            <div class="col-md-10">
+               <p class="form-control-text">
+                 {{ plan.next_subscription.name }}
+               </p>
+             </div>
+           </div>
+-          <div class="form-group">
+-            <label class="control-label col-sm-2">
++          <div class="form-group">  {# todo B5: css-form-group #}
++            <label class="form-label col-md-2">
+               {% trans "Next Subscription Price" %}
+             </label>
+-            <div class="col-sm-10">
++            <div class="col-md-10">
+               <p class="form-control-text">
+                 {{ plan.next_subscription.price }}
+               </p>
+@@ -164,50 +164,50 @@
+         <div class="form form-horizontal">
+           {% if plan.has_credits_in_non_general_credit_line %}
+             <div data-bind="foreach: products">
+-              <div class="form-group">
+-                <label class="control-label col-sm-2">
++              <div class="form-group">  {# todo B5: css-form-group #}
++                <label class="form-label col-md-2">
+                   {% trans 'Plan Credit' %}
+                 </label>
+-                <div class="col-sm-10">
++                <div class="col-md-10">
+                   <p class="form-control-text" data-bind="text: amount"></p>
+                 </div>
+               </div>
+             </div>
+           {% endif %}
+           {% if plan.general_credit and plan.general_credit.is_visible or not plan.has_credits_in_non_general_credit_line %}
+-            <div class="form-group">
+-              <label class="control-label col-sm-2">
++            <div class="form-group">  {# todo B5: css-form-group #}
++              <label class="form-label col-md-2">
+                 {% if plan.has_credits_in_non_general_credit_line %}
+                   {% trans 'General Credit' %}
+                 {% else %}
+                   {% trans 'Credits Remaining' %}
+                 {% endif %}
+               </label>
+-              <div class="col-sm-10">
++              <div class="col-md-10">
+                 <p class="form-control-text js-general-credit">{{ plan.general_credit.amount }}</p>
+               </div>
+             </div>
+           {% endif %}
+           <div data-bind="with: prepayments">
+-            <div class="form-group">
+-              <div class="col-sm-10 col-sm-offset-2">
++            <div class="form-group">  {# todo B5: css-form-group #}
++              <div class="col-md-10 offset-md-2">
+                 {% if can_purchase_credits %}
+                   <button type="button"
+                           class="btn btn-primary"
+-                          data-toggle="modal"
+-                          data-target="#paymentModal"
++                          data-bs-toggle="modal"
++                          data-bs-target="#paymentModal"
+                           data-bind="click: function(){triggerPayment($root.paymentHandler.CREDIT_CARD)}">
+                     {% trans 'Prepay by Credit Card' %}
+                   </button>
+                   <button type="button"
+-                          class="btn btn-default"
+-                          data-toggle="modal"
+-                          data-target="#paymentModal"
++                          class="btn btn-outline-primary"
++                          data-bs-toggle="modal"
++                          data-bs-target="#paymentModal"
+                           data-bind="click: function(){triggerPayment($root.paymentHandler.WIRE)}">
+                     {% trans 'Generate Prepayment Invoice' %}
+                   </button>
+                 {% else %}
+-                  <span class="label label-default">
++                  <span class="badge text-bg-secondary">
+                                         <i class="fa fa-info-circle"></i>
+                                         {% trans "Not Billing Admin, Can't Add Credit" %}
+                                     </span>
+@@ -220,8 +220,8 @@
+           <legend>{% trans 'Account Credit' %}</legend>
+           <div class="form form-horizontal">
+             <div data-bind="foreach: products">
+-              <div class="form-group" data-bind="visible: isAccountVisible">
+-                <label class="control-label col-sm-2">
++              <div class="form-group" data-bind="visible: isAccountVisible">  {# todo B5: css-form-group #}
++                <label class="form-label col-md-2">
+                   {% trans 'Plan Credit' %}
+                   <div class="hq-help">
+                     <a href="#"
+@@ -234,14 +234,14 @@
+                     </a>
+                   </div>
+                 </label>
+-                <div class="col-sm-10">
++                <div class="col-md-10">
+                   <p class="form-control-text" data-bind="text: accountAmount"></p>
+                 </div>
+               </div>
+             </div>
+             {% if plan.account_general_credit and plan.account_general_credit.is_visible %}
+-              <div class="form-group">
+-                <label class="control-label col-sm-2">
++              <div class="form-group">  {# todo B5: css-form-group #}
++                <label class="form-label col-md-2">
+                   {% trans 'General Credit' %}
+                   <div class="hq-help">
+                     <a href="#"
+@@ -255,7 +255,7 @@
+                     </a>
+                   </div>
+                 </label>
+-                <div class="col-sm-10">
++                <div class="col-md-10">
+                   <p class="form-control-text">{{ plan.account_general_credit.amount }}</p>
+                 </div>
+               </div>
+@@ -331,13 +331,13 @@
+       </div>
+ 
+       <div data-bind="with: general_credit">
+-        <div class="form-group">
+-          <label class="control-label col-sm-2">
++        <div class="form-group">  {# todo B5: css-form-group #}
++          <label class="form-label col-md-2">
+             <span data-bind="text: name"></span>
+           </label>
+-          <div class="col-sm-10">
++          <div class="col-md-10">
+             <div class="input-group">
+-              <span class="input-group-addon">$</span>
++              <span class="input-group-addon">$</span>  {# todo B5: css-input-group-addon #}
+               <input type="text"
+                      class="form-control"
+                      data-bind="
+@@ -355,11 +355,11 @@
+         </div>
+       </div>
+ 
+-      <div class="form-group">
+-        <label class="control-label col-sm-2">
++      <div class="form-group">  {# todo B5: css-form-group #}
++        <label class="form-label col-md-2">
+           {% trans 'Total Credits' %}
+         </label>
+-        <div class="col-sm-10">
++        <div class="col-md-10">
+           <p class="form-control-text" data-bind="text: ('$ ' + amount())"></p>
+         </div>
+       </div>
+@@ -391,5 +391,5 @@
+ {% endblock %}
+ 
+ {% block modals %}{{ block.super }}
+-  {% include 'domain/partials/bootstrap3/payment_modal.html' with payment_modal_id="paymentModal" title_template="payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment-complete-template" %}
++  {% include 'domain/partials/bootstrap5/payment_modal.html' with payment_modal_id="paymentModal" title_template="payment-method-modal-title" cost_item_template="cost-item-template" payment_complete_template="payment-complete-template" %}
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/data_migration_in_progress.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/data_migration_in_progress.html.diff.txt
new file mode 100644
index 000000000000..e2eb653cf98a
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/data_migration_in_progress.html.diff.txt
@@ -0,0 +1,8 @@
+--- 
++++ 
+@@ -1,4 +1,4 @@
+-{% extends "hqwebapp/bootstrap3/base_page.html" %}
++{% extends "hqwebapp/bootstrap5/base_page.html" %}
+ {% load i18n %}
+ 
+ {% block page_content %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/email/domain_invite.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/email/domain_invite.html.diff.txt
new file mode 100644
index 000000000000..efd2316eacb0
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/email/domain_invite.html.diff.txt
@@ -0,0 +1,11 @@
+--- 
++++ 
+@@ -32,7 +32,7 @@
+   {% blocktrans %}
+     CommCare HQ is a data management tool used by over 500 organizations
+     to help frontline workers around the world.
+-    <a href="https://dimagi.com/commcare/" style="color: #bcdeff;">Learn more about CommCare</a>.
++    <a href="https://dimagi.com/commcare/" style="color: #bcdeff;">Learn more about CommCare</a>.  {# todo B5: inline-style #}
+   {% endblocktrans %}
+ {% endblock %}
+ 
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/insufficient_privilege_notification.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/insufficient_privilege_notification.html.diff.txt
new file mode 100644
index 000000000000..78a7e3124f45
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/insufficient_privilege_notification.html.diff.txt
@@ -0,0 +1,23 @@
+--- 
++++ 
+@@ -1,9 +1,9 @@
+-{% extends 'hqwebapp/bootstrap3/base_page.html' %}
++{% extends 'hqwebapp/bootstrap5/base_page.html' %}
+ {% load i18n %}
+ 
+ {% block page_content %}
+   {% if is_paused %}
+-    {% include 'hqwebapp/partials/bootstrap3/paused_plan_notice.html' %}
++    {% include 'hqwebapp/partials/bootstrap5/paused_plan_notice.html' %}
+   {% else %}
+     <p class="lead">
+       {% blocktrans %}
+@@ -23,7 +23,7 @@
+     {% endif %}
+     <div class="btn-toolbar">
+       <a href="https://wiki.commcarehq.org/display/commcarepublic/CommCare+Plan+Details"
+-         class="btn btn-default" target="_blank">{% trans 'Read more about our plans' %}</a>
++         class="btn btn-outline-primary" target="_blank">{% trans 'Read more about our plans' %}</a>
+       {% if is_domain_admin %}
+         <a href="{{ change_subscription_url }}" class="btn btn-primary">{% trans 'Change My Plan' %}</a>
+       {% endif %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_calculations.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_calculations.html.diff.txt
new file mode 100644
index 000000000000..e74663146bc7
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_calculations.html.diff.txt
@@ -0,0 +1,32 @@
+--- 
++++ 
+@@ -1,8 +1,8 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load hq_shared_tags %}
+ {% load i18n %}
+ 
+-{% requirejs_main "domain/js/internal_calculations" %}
++{% requirejs_main_b5 "domain/js/internal_calculations" %}
+ 
+ {% block page_content %}
+   {% registerurl 'calculated_properties' domain %}
+@@ -10,13 +10,13 @@
+     <p><button type="button" id="load-all-btn" class="btn btn-primary">{% trans 'Load EVERYTHING' %}</button></p>
+     <hr />
+     {% for calc_tag in order %}
+-      <div class="form-group calc-group">
+-        <label class="control-label col-sm-2">{{ calcs|dict_lookup:calc_tag }}</label>
+-        <div class="col-sm-8">
++      <div class="form-group calc-group">  {# todo B5: css-form-group #}
++        <label class="form-label col-md-2">{{ calcs|dict_lookup:calc_tag }}</label>
++        <div class="col-md-8">
+           <div id="calc-{{ calc_tag }}"
+-               class="well well-small calc-display"></div>
++               class="card well-small calc-display"></div>  {# todo B5: css-well #}
+         </div>
+-        <div class="col-sm-2">
++        <div class="col-md-2">
+           <button class="btn btn-primary load-calc-btn" data-calc-tag="{{ calc_tag }}">
+             {% trans "Load Property" %}
+           </button>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_settings.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_settings.html.diff.txt
new file mode 100644
index 000000000000..ff00626f7835
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_settings.html.diff.txt
@@ -0,0 +1,22 @@
+--- 
++++ 
+@@ -1,9 +1,9 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load hq_shared_tags %}
+ {% load crispy_forms_tags %}
+ {% load i18n %}
+ 
+-{% requirejs_main 'domain/js/internal_settings' %}
++{% requirejs_main_b5 'domain/js/internal_settings' %}
+ 
+ {% block stylesheets %}
+   {{ block.super }}
+@@ -19,6 +19,6 @@
+   {% initial_page_data 'areas' areas %}
+   {% initial_page_data 'current_values' form.current_values %}
+   <form id="update-project-info" class="form-horizontal disable-on-submit" method="post">
+-    {% crispy form %}
++    {% crispy form %}  {# todo B5: crispy #}
+   </form>
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_subscription_management.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_subscription_management.html.diff.txt
new file mode 100644
index 000000000000..cd248e504334
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_subscription_management.html.diff.txt
@@ -0,0 +1,28 @@
+--- 
++++ 
+@@ -1,9 +1,9 @@
+-{% extends 'hqwebapp/bootstrap3/base_section.html' %}
++{% extends 'hqwebapp/bootstrap5/base_section.html' %}
+ {% load i18n %}
+ {% load crispy_forms_tags %}
+ {% load hq_shared_tags %}
+ 
+-{% requirejs_main 'domain/js/bootstrap3/internal_subscription_management' %}
++{% requirejs_main_b5 'domain/js/bootstrap5/internal_subscription_management' %}
+ 
+ {% block page_content %}
+   {% blocktrans %}
+@@ -25,11 +25,11 @@
+   {% endblocktrans %}
+ 
+   <div id="subscription_management">
+-    {% crispy select_subscription_type_form %}
++    {% crispy select_subscription_type_form %}  {# todo B5: crispy #}
+ 
+     {% for form in subscription_management_forms %}
+       <div data-bind="visible: subscriptionType() == '{{ form.slug }}'">
+-        {% crispy form %}
++        {% crispy form %}  {# todo B5: crispy #}
+       </div>
+     {% endfor %}
+   </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/manage_releases_by_app_profile.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/manage_releases_by_app_profile.html.diff.txt
new file mode 100644
index 000000000000..e8626e780a50
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/manage_releases_by_app_profile.html.diff.txt
@@ -0,0 +1,75 @@
+--- 
++++ 
+@@ -1,9 +1,9 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load hq_shared_tags %}
+ {% load crispy_forms_tags %}
+ {% load i18n %}
+ 
+-{% requirejs_main 'app_manager/js/manage_releases_by_app_profile' %}
++{% requirejs_main_b5 'app_manager/js/manage_releases_by_app_profile' %}
+ 
+ {% block page_content %}
+   {% initial_page_data 'app_releases_by_app_profile' app_releases_by_app_profile %}
+@@ -13,20 +13,20 @@
+   {% initial_page_data 'buildProfilesPerApp' build_profiles_per_app %}
+   {% registerurl 'toggle_release_restriction_by_app_profile' domain '---'%}
+   {% registerurl "paginate_releases" domain '---' %}
+-    <ul class="nav nav-tabs sticky-tabs">
+-      <li><a data-toggle="tab" href="#search-form" id="search-tab">{% trans "Search" %}</a></li>
+-      <li><a data-toggle="tab" href="#creation-form" id="create-tab">{% trans "Add" %}</a></li>
++    <ul class="nav nav-tabs sticky-tabs">  {# todo B5: css-nav #}
++      <li><a data-bs-toggle="tab" href="#search-form" id="search-tab">{% trans "Search" %}</a></li>
++      <li><a data-bs-toggle="tab" href="#creation-form" id="create-tab">{% trans "Add" %}</a></li>
+     </ul>
+     <div class="spacer"></div>
+     <div class="tab-content">
+       <div id="search-form" class="tab-pane">
+         <form class="form form-horizontal" method="post" id="search-manage-app-releases">
+-          {% crispy search_form %}
++          {% crispy search_form %}  {# todo B5: crispy #}
+         </form>
+       </div>
+       <div id="creation-form" class="tab-pane">
+         <form class="form form-horizontal disable-on-submit" method="post" id="create-manage-app-releases">
+-          {% crispy creation_form %}
++          {% crispy creation_form %}  {# todo B5: crispy #}
+         </form>
+       </div>
+     </div>
+@@ -35,11 +35,11 @@
+       <table id="managed-releases" class="table">
+         <thead>
+         <tr>
+-          <th class="col-sm-2">{% trans 'Application' %}</th>
+-          <th class="col-sm-2">{% trans 'Profile' %}</th>
+-          <th class="col-sm-2">{% trans 'Version' %}</th>
+-          <th class="col-sm-2">{% trans 'Status' %}</th>
+-          <th class="col-sm-2">{% trans 'Action' %}</th>
++          <th class="col-md-2">{% trans 'Application' %}</th>
++          <th class="col-md-2">{% trans 'Profile' %}</th>
++          <th class="col-md-2">{% trans 'Version' %}</th>
++          <th class="col-md-2">{% trans 'Status' %}</th>
++          <th class="col-md-2">{% trans 'Action' %}</th>
+         </tr>
+         </thead>
+         <tbody data-bind="foreach: appReleasesByAppProfile, visible: appReleasesByAppProfile">
+@@ -49,7 +49,7 @@
+           <td data-bind="text: version"></td>
+           <td data-bind="text: status"></td>
+           <td>
+-            <button type="button" class="btn btn-default"
++            <button type="button" class="btn btn-outline-primary"
+                     data-bind="click: toggleRestriction, css: buttonClass,
+                                       disable: ajaxInProgress">
+               <span data-bind="text: actionText"></span>
+@@ -57,7 +57,7 @@
+                  data-bind="visible: ajaxInProgress"></i>
+             </button>
+             <br/>
+-            <span class="error-message label label-danger" data-bind="visible: error">
++            <span class="error-message badge text-bg-danger" data-bind="visible: error">
+               {% trans 'Could not update!' %}
+               <span data-bind="text: errorMessage"></span>
+             </span>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/manage_releases_by_location.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/manage_releases_by_location.html.diff.txt
new file mode 100644
index 000000000000..6d1969628f6f
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/manage_releases_by_location.html.diff.txt
@@ -0,0 +1,64 @@
+--- 
++++ 
+@@ -1,9 +1,9 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load hq_shared_tags %}
+ {% load crispy_forms_tags %}
+ {% load i18n %}
+ 
+-{% requirejs_main 'app_manager/js/manage_releases_by_location' %}
++{% requirejs_main_b5 'app_manager/js/manage_releases_by_location' %}
+ 
+ {% block page_content %}
+   {% initial_page_data 'app_releases_by_location' app_releases_by_location %}
+@@ -16,22 +16,22 @@
+   {% registerurl 'location_search' domain %}
+ 
+   <div class="row">
+-    <div class="col-sm-12">
+-      <div class="panel panel-modern-gray panel-form-only">
+-        <div class="panel-body">
++    <div class="col-md-12">
++      <div class="card card-modern-gray card-form-only">  {# todo B5: css-panel #}
++        <div class="card-body">
+           <form class="form-horizontal disable-on-submit" id="manage-app-releases" action=""
+                 method='post'>
+-            {% crispy manage_releases_by_location_form %}
++            {% crispy manage_releases_by_location_form %}  {# todo B5: crispy #}
+           </form>
+           {% if app_releases_by_location %}
+             <table id="managed-releases" class="table">
+               <thead>
+               <tr>
+-                <th class="col-sm-2">{% trans 'Application' %}</th>
+-                <th class="col-sm-2">{% trans 'Location' %}</th>
+-                <th class="col-sm-2">{% trans 'Version' %}</th>
+-                <th class="col-sm-4">{% trans 'Last Activity' %}</th>
+-                <th class="col-sm-2">{% trans 'Action' %}</th>
++                <th class="col-md-2">{% trans 'Application' %}</th>
++                <th class="col-md-2">{% trans 'Location' %}</th>
++                <th class="col-md-2">{% trans 'Version' %}</th>
++                <th class="col-md-4">{% trans 'Last Activity' %}</th>
++                <th class="col-md-2">{% trans 'Action' %}</th>
+               </tr>
+               </thead>
+               <tbody data-bind="foreach: appReleasesByLocation, visible: appReleasesByLocation">
+@@ -50,7 +50,7 @@
+                   </div>
+                 </td>
+                 <td>
+-                  <button type="button" class="btn btn-default"
++                  <button type="button" class="btn btn-outline-primary"
+                           data-bind="click: toggleRestriction, css: buttonClass,
+                                             disable: ajaxInProgress">
+                     <span data-bind="text: actionText"></span>
+@@ -58,7 +58,7 @@
+                        data-bind="visible: ajaxInProgress"></i>
+                   </button>
+                   <br/>
+-                  <span class="error-message label label-danger" data-bind="visible: error">
++                  <span class="error-message badge text-bg-danger" data-bind="visible: error">
+                     {% trans 'Could not update!' %}
+                     <span data-bind="text: errorMessage"></span>
+                   </span>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/partials/license_explanations.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/partials/license_explanations.html.diff.txt
new file mode 100644
index 000000000000..ad38c2db02ff
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/partials/license_explanations.html.diff.txt
@@ -0,0 +1,29 @@
+--- 
++++ 
+@@ -1,10 +1,10 @@
+ {% load i18n %}
+-<a data-toggle="modal" href="#license-explanations">More information about licenses...</a>
++<a data-bs-toggle="modal" href="#license-explanations">More information about licenses...</a>
+ <div class="modal fade" id="license-explanations">
+   <div class="modal-dialog">
+     <div class="modal-content">
+       <div class="modal-header">
+-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
++        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>  {# todo B5: css-close #}
+         <h3 class="modal-title">About available licenses for shared media and projects</h3>
+       </div>
+       <div class="modal-body">
+@@ -22,11 +22,11 @@
+         </p>
+       </div>
+       <div class="modal-footer">
+-        <a href="#" class="btn btn-default" data-dismiss="modal">Close</a>
++        <a href="#" class="btn btn-outline-primary" data-bs-dismiss="modal">Close</a>
+       </div>
+     </div>
+   </div>
+ </div>
+ {% if extra %}
+-  <div style="margin-top: .5em">{{ extra }}</div>
++  <div style="margin-top: .5em">{{ extra }}</div>  {# todo B5: inline-style #}
+ {% endif %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/partials/payment_modal.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/partials/payment_modal.html.diff.txt
new file mode 100644
index 000000000000..ae478b06b691
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/partials/payment_modal.html.diff.txt
@@ -0,0 +1,53 @@
+--- 
++++ 
+@@ -4,7 +4,7 @@
+   <div class="modal-dialog">
+     <div class="modal-content">
+       <div class="modal-header">
+-        <button type="button" class="close" data-dismiss="modal"
++        <button type="button" class="btn-close" data-bs-dismiss="modal"  {# todo B5: css-close #}
+                 aria-label="Close">
+           <span aria-hidden="true">&times;</span>
+         </button>
+@@ -43,11 +43,11 @@
+                 <a href="https://confluence.dimagi.com/display/commcarepublic/How+to+Pay+by+Credit+Card+or+Wire+Payment" target="_blank">More information...</a>
+               {% endblocktrans %}
+             </p>
+-            <div class="form-group">
+-              <label class="control-label col-sm-3">
++            <div class="form-group">  {# todo B5: css-form-group #}
++              <label class="form-label col-md-3">
+                 {% trans 'Invoice Recipients' %}
+               </label>
+-              <div class="col-sm-9">
++              <div class="col-md-9">
+                 <input type="text"
+                        data-bind="value: wireEmails"
+                        size="20"
+@@ -80,8 +80,8 @@
+         <div class="modal-footer">
+           <button type="button"
+                   data-bind="visible: paymentIsNotComplete"
+-                  class="btn btn-default"
+-                  data-dismiss="modal">
++                  class="btn btn-outline-primary"
++                  data-bs-dismiss="modal">
+             {% trans "Cancel" %}
+           </button>
+           <!-- ko if: hasAgreedToPrivacy || isSavedCard -->
+@@ -101,12 +101,12 @@
+                                 text: submitBtnText"
+                   disabled="disabled">
+           </button>
+-          <span class="label label-info">{% trans 'Please agree to the Privacy Policy.' %}</span>
++          <span class="badge text-bg-info">{% trans 'Please agree to the Privacy Policy.' %}</span>
+           <!-- /ko -->
+           <button type="button"
+                   data-bind="visible: paymentIsComplete"
+-                  class="btn btn-default"
+-                  data-dismiss="modal">
++                  class="btn btn-outline-primary"
++                  data-bs-dismiss="modal">
+             {% trans "Close" %}
+           </button>
+         </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/domain.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/domain.html.diff.txt
new file mode 100644
index 000000000000..512e11b46777
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/domain.html.diff.txt
@@ -0,0 +1,14 @@
+--- 
++++ 
+@@ -1,8 +1,8 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load hq_shared_tags %}
+ 
+-{% requirejs_main 'domain/js/pro-bono' %}
++{% requirejs_main_b5 'domain/js/pro-bono' %}
+ 
+ {% block page_content %}
+-  {% include 'domain/pro_bono/bootstrap3/page_content.html' %}
++  {% include 'domain/pro_bono/bootstrap5/page_content.html' %}
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/page_content.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/page_content.html.diff.txt
new file mode 100644
index 000000000000..b43f3c060798
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/page_content.html.diff.txt
@@ -0,0 +1,10 @@
+--- 
++++ 
+@@ -16,6 +16,6 @@
+     <p><strong>Number of expected users:</strong> {{ pro_bono_form.num_expected_users.value }}</p>
+     <p><strong>Dimagi contact:</strong> {{ pro_bono_form.dimagi_contact.value }}</p>
+   {% else %}
+-    {% crispy pro_bono_form %}
++    {% crispy pro_bono_form %}  {# todo B5: crispy #}
+   {% endif %}
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/static.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/static.html.diff.txt
new file mode 100644
index 000000000000..a685c85e2dde
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/static.html.diff.txt
@@ -0,0 +1,14 @@
+--- 
++++ 
+@@ -1,8 +1,8 @@
+-{% extends 'hqwebapp/bootstrap3/base_page.html' %}
++{% extends 'hqwebapp/bootstrap5/base_page.html' %}
+ {% load hq_shared_tags %}
+ 
+-{% requirejs_main 'domain/js/pro-bono' %}
++{% requirejs_main_b5 'domain/js/pro-bono' %}
+ 
+ {% block page_content %}
+-  {% include 'domain/pro_bono/bootstrap3/page_content.html' %}
++  {% include 'domain/pro_bono/bootstrap5/page_content.html' %}
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/renew_plan.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/renew_plan.html.diff.txt
new file mode 100644
index 000000000000..5f02d14d4a64
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/renew_plan.html.diff.txt
@@ -0,0 +1,24 @@
+--- 
++++ 
+@@ -1,10 +1,10 @@
+-{% extends "domain/bootstrap3/base_change_plan.html" %}
++{% extends "domain/bootstrap5/base_change_plan.html" %}
+ {% load hq_shared_tags %}
+ {% load i18n %}
+ {% load compress %}
+ {% load menu_tags %}
+ 
+-{% requirejs_main 'accounting/js/renew_plan_selection' %}
++{% requirejs_main_b5 'accounting/js/renew_plan_selection' %}
+ 
+ {% block plan_breadcrumbs %}{% endblock %}
+ 
+@@ -35,7 +35,7 @@
+ 
+     <div class="text-center plan-next">
+       {% if downgrade_messages %}
+-        <a class="btn btn-default btn-lg"
++        <a class="btn btn-outline-primary btn-lg"
+           href="{% url 'custom_plan_request_quote' domain %}">
+           {% trans 'Talk to Sales' %}
+         </a>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/select.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/select.html.diff.txt
new file mode 100644
index 000000000000..f8a5af8eced1
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/select.html.diff.txt
@@ -0,0 +1,69 @@
+--- 
++++ 
+@@ -1,10 +1,10 @@
+-{% extends "hqwebapp/bootstrap3/base_page.html"  %}
++{% extends "hqwebapp/bootstrap5/base_page.html"  %}
+ {% load hq_shared_tags %}
+ {% load i18n %}
+ 
+ {% block title %}{% trans "My Projects" %}{% endblock title %}
+ 
+-{% requirejs_main 'domain/js/select' %}
++{% requirejs_main_b5 'domain/js/select' %}
+ 
+ {% block page_content %}
+   {% initial_page_data 'invitation_links' invitation_links %}
+@@ -20,16 +20,16 @@
+   </div>
+   <div class="spacer"></div>
+ 
+-  <div class="panel panel-info" data-bind="visible: invitationLinks().length">
+-    <div class="panel-heading ">
+-      <h3 class="panel-title">
++  <div class="card text-bg-info" data-bind="visible: invitationLinks().length">  {# todo B5: css-panel #}
++    <div class="card-header ">
++      <h3 class="card-title">
+         {% trans 'My Invitations' %}
+       </h3>
+     </div>
+-    <div class="panel-body">
++    <div class="card-body">
+       <ul class="list-invitations" data-bind="foreach: invitationLinks">
+         <li>
+-          <a data-bind="attr: {href: url}" class="btn btn-default btn-xs">
++          <a data-bind="attr: {href: url}" class="btn btn-outline-primary btn-sm">
+             <i class='fa fa-envelope'>
+             </i>
+             {% trans "Accept" %}
+@@ -40,15 +40,15 @@
+       </ul>
+     </div>
+   </div>
+-  <div class="panel panel-default">
+-    <div class="panel-heading ">
++  <div class="card ">  {# todo B5: css-panel #}
++    <div class="card-header ">
+       <div class="row">
+-        <div class="col-sm-6">
+-          <h3 class="panel-title" style="padding-top: 7px;">
++        <div class="col-md-6">
++          <h3 class="card-title" style="padding-top: 7px;">  {# todo B5: inline-style #}
+             {% trans 'My Projects' %}
+           </h3>
+         </div>
+-        <div class="col-sm-6">
++        <div class="col-md-6">
+           <search-box data-apply-bindings="false"
+                       params="value: query,
+                               action: search,
+@@ -58,8 +58,8 @@
+         </div>
+       </div>
+     </div>
+-    <div class="panel-body">
+-      <ul class="nav nav-pills nav-stacked" data-bind="foreach: domainLinks">
++    <div class="card-body">
++      <ul class="nav nav-pills nav-stacked" data-bind="foreach: domainLinks">  {# todo B5: css-nav #}
+         <li>
+           <a data-bind="attr: {href: url}, text: display_name"></a>
+         </li>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/select_plan.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/select_plan.html.diff.txt
new file mode 100644
index 000000000000..c069c32c0c0a
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/select_plan.html.diff.txt
@@ -0,0 +1,70 @@
+--- 
++++ 
+@@ -1,9 +1,9 @@
+-{% extends "domain/bootstrap3/base_change_plan.html" %}
++{% extends "domain/bootstrap5/base_change_plan.html" %}
+ {% load hq_shared_tags %}
+ {% load i18n %}
+ {% load menu_tags %}
+ 
+-{% requirejs_main 'accounting/js/pricing_table' %}
++{% requirejs_main_b5 'accounting/js/pricing_table' %}
+ 
+ {% block form_content %}
+   {% initial_page_data 'editions' editions %}
+@@ -30,7 +30,7 @@
+     <p class="switch-label text-center">
+       {% trans "Pay Monthly" %}
+       <label class="switch">
+-        <input type="checkbox" id="pricing-toggle" data-bind="{checked: oShowAnnualPricing}">
++        <input type="checkbox" id="pricing-toggle" data-bind="{checked: oShowAnnualPricing}">  {# todo B5: css-checkbox #}
+         <span class="slider round slider-blue slider-blue-on"></span>
+       </label>
+       {% trans "Pay Annually" %}
+@@ -38,7 +38,7 @@
+ 
+     <p class="text-center">
+       {% blocktrans %}
+-        Save close to 20% when you pay annually.
++        Save close to 20% when you pay annually.  {# todo B5: css-close #}
+       {% endblocktrans %}
+     </p>
+ 
+@@ -166,7 +166,7 @@
+     </div>
+ 
+     <div class="alert alert-warning text-center"
+-         style="margin-top: 20px;"
++         style="margin-top: 20px;"  {# todo B5: inline-style #}
+          data-bind="visible: oIsNextPlanDowngrade">
+       <i class="fa fa-warning"></i>
+       {% blocktrans %}
+@@ -196,7 +196,7 @@
+         id="select-plan-form"
+         method="post"
+         data-bind="visible: oShowNext"
+-        style="display: none;"
++        style="display: none;"  {# todo B5: inline-style #}
+         action="{% url 'confirm_selected_plan' domain %}">
+       {% csrf_token %}
+       {% if is_renewal %}
+@@ -242,7 +242,7 @@
+     <div class="modal-dialog">
+       <div class="modal-content">
+         <div class="modal-header">
+-          <button type="button" class="close" data-dismiss="modal">
++          <button type="button" class="btn-close" data-bs-dismiss="modal">  {# todo B5: css-close #}
+             <span aria-hidden="true">&times;</span>
+             <span class="sr-only">{% trans "Close" %}</span>
+           </button>
+@@ -252,8 +252,8 @@
+           <br><br>
+         </div>
+         <div class="modal-footer">
+-          <button type="button" class="btn btn-primary" data-dismiss="modal">{% trans "Dismiss" %}</button>
+-          <button type="button" class="btn btn-danger" data-bind="click: submitDowngradeForm">{% trans "Continue" %}</button>
++          <button type="button" class="btn btn-primary" data-bs-dismiss="modal">{% trans "Dismiss" %}</button>
++          <button type="button" class="btn btn-outline-danger" data-bind="click: submitDowngradeForm">{% trans "Continue" %}</button>
+         </div>
+       </div>
+     </div>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/selected_plan_contact.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/selected_plan_contact.html.diff.txt
new file mode 100644
index 000000000000..dd783dc19747
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/selected_plan_contact.html.diff.txt
@@ -0,0 +1,21 @@
+--- 
++++ 
+@@ -1,4 +1,4 @@
+-{% extends "domain/bootstrap3/base_change_plan.html" %}
++{% extends "domain/bootstrap5/base_change_plan.html" %}
+ {% load crispy_forms_tags %}
+ {% load i18n %}
+ 
+@@ -7,9 +7,9 @@
+     {{ lead_text }}
+   </p>
+ 
+-  <div class="panel panel-modern-gray panel-form-only">
+-    <div class="panel-body">
+-      {% crispy contact_form %}
++  <div class="card card-modern-gray card-form-only">  {# todo B5: css-panel #}
++    <div class="card-body">
++      {% crispy contact_form %}  {# todo B5: crispy #}
+     </div>
+   </div>
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/stripe_cards.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/stripe_cards.html.diff.txt
new file mode 100644
index 000000000000..6fbb2a47a646
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/stripe_cards.html.diff.txt
@@ -0,0 +1,82 @@
+--- 
++++ 
+@@ -8,7 +8,7 @@
+   </table>
+ 
+   <!-- ko with: newCard -->
+-    <button type='button' class="btn btn-primary new-card" data-toggle="modal" href="#card-modal">
++    <button type='button' class="btn btn-primary new-card" data-bs-toggle="modal" href="#card-modal">
+       <i class='fa fa-plus'></i> {% trans 'Add Card' %}
+     </button>
+     <div data-bind="template: {name: 'new-stripe-card-template'}"></div>
+@@ -20,7 +20,7 @@
+   <div class="modal-dialog">
+     <div class="modal-content">
+       <div class="modal-header">
+-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
++        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>  {# todo B5: css-close #}
+         <h4 class="modal-title">{% trans "Credit Card" %}</h4>
+       </div>
+       <div class="modal-body">
+@@ -29,7 +29,7 @@
+         </div>
+       </div>
+       <div class="modal-footer">
+-        <button style="" type="button" class="btn btn-default" data-dismiss="modal">
++        <button style="" type="button" class="btn btn-outline-primary" data-bs-dismiss="modal">  {# todo B5: inline-style #}
+           {% trans 'Close' %}
+         </button>
+       </div>
+@@ -41,7 +41,7 @@
+   <div class="modal-dialog">
+     <div class="modal-content">
+       <div class="modal-header">
+-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
++        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>  {# todo B5: css-close #}
+         <h4 class="modal-title">{% trans "Delete Card" %}</h4>
+       </div>
+       <div class="modal-body">
+@@ -59,10 +59,10 @@
+         {% endblocktrans %}
+       </div>
+       <div class="modal-footer">
+-        <button type="button" class="btn btn-default" data-dismiss="modal">
++        <button type="button" class="btn btn-outline-primary" data-bs-dismiss="modal">
+           {% trans 'Cancel' %}
+         </button>
+-        <button type="button" class="btn btn-danger"
++        <button type="button" class="btn btn-outline-danger"
+                 data-bind="click: deleteCard,
+                                enable: !isDeleting()">
+           {% trans 'Delete' %}
+@@ -76,7 +76,7 @@
+   <tr>
+     <td>
+       <i class="fa-regular fa-credit-card"></i> <strong><span data-bind="text: brand"></span></strong>
+-      <span class="label label-success"
++      <span class="badge text-bg-success"
+             data-bind="visible: is_autopay">
+                 {% trans 'Autopay card' %}
+             </span>
+@@ -89,18 +89,18 @@
+       <button data-bind="visible: is_autopay,
+                                click: unSetAutopay,
+                                enable: $parent.autoPayButtonEnabled"
+-              class='btn btn-default autopay-button'>
++              class='btn btn-outline-primary autopay-button'>
+         {% trans 'Remove Autopay' %}
+       </button>
+       <button data-bind="visible: !is_autopay(),
+                                click: setAutopay,
+                                enable: $parent.autoPayButtonEnabled"
+-              class='btn btn-default autopay-button'>
++              class='btn btn-outline-primary autopay-button'>
+         {% trans 'Set as autopay card' %}
+       </button>
+     </td>
+     <td>
+-      <button class="btn btn-danger" href="#" data-bind="openModal: 'delete-card-modal'">
++      <button class="btn btn-outline-danger" href="#" data-bind="openModal: 'delete-card-modal'">
+         <i class="fa fa-remove"></i> {% trans 'Delete Card' %}
+       </button>
+     </td>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/tombstone_management.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/tombstone_management.html.diff.txt
new file mode 100644
index 000000000000..89834f26d362
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/tombstone_management.html.diff.txt
@@ -0,0 +1,32 @@
+--- 
++++ 
+@@ -1,16 +1,16 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load crispy_forms_tags %}
+ 
+ {% block page_content %}
+   <div class="row">
+-    <div class="col-xs-12">
++    <div class="col-sm-12">
+       <h2>{{ current_page.title }}</h2>
+       <p class="help-block">
+           Please type comma-separated domain names of to check tombstones of.
+       </p>
+-      {% crispy form %}
++      {% crispy form %}  {# todo B5: crispy #}
+     </div>
+-    <div class="col-xs-12">
++    <div class="col-sm-12">
+       <table class="table">
+         <tr><th>Name</th><th>Status</th><th></th></tr>
+         {% for name, projects in domains %}
+@@ -49,7 +49,7 @@
+             <form method="post" action="{% url "create_tombstone" %}">
+             {% csrf_token %}
+             <input type="hidden" name="domain" value="{{ name }}">
+-            {% if not projects|length %}<button class="btn btn-danger" type="submit">Create Tombstone</button>{% endif %}
++            {% if not projects|length %}<button class="btn btn-outline-danger" type="submit">Create Tombstone</button>{% endif %}
+             </form>
+           </td>
+         </tr>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/update_billing_contact_info.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/update_billing_contact_info.html.diff.txt
new file mode 100644
index 000000000000..a2cd53d0d7d3
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/update_billing_contact_info.html.diff.txt
@@ -0,0 +1,27 @@
+--- 
++++ 
+@@ -1,9 +1,9 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load crispy_forms_tags %}
+ {% load hq_shared_tags %}
+ {% load i18n %}
+ 
+-{% requirejs_main 'domain/js/bootstrap3/update_billing_contact_info' %}
++{% requirejs_main_b5 'domain/js/bootstrap5/update_billing_contact_info' %}
+ 
+ {% block additional_initial_page_data %}{{ block.super }}
+   {% initial_page_data "stripe_public_key" stripe_public_key %}
+@@ -13,9 +13,9 @@
+ 
+ {% block page_content %}
+   <div id="billing-info">
+-    {% crispy billing_account_info_form %}
++    {% crispy billing_account_info_form %}  {# todo B5: crispy #}
+   </div>
+-  <div id="card-manager" style="margin-top:20px;">
+-    {% include 'domain/bootstrap3/stripe_cards.html' %}
++  <div id="card-manager" style="margin-top:20px;">  {# todo B5: inline-style #}
++    {% include 'domain/bootstrap5/stripe_cards.html' %}
+   </div>
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/billing_statements.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/billing_statements.js.diff.txt
new file mode 100644
index 000000000000..17a46738b0ae
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/billing_statements.js.diff.txt
@@ -0,0 +1,16 @@
+--- 
++++ 
+@@ -1,11 +1,11 @@
+ 'use strict';
+-hqDefine("domain/js/bootstrap3/billing_statements", [
++hqDefine("domain/js/bootstrap5/billing_statements", [
+     'jquery',
+     'underscore',
+     'knockout',
+     'hqwebapp/js/initial_page_data',
+     'accounting/js/payment_method_handler',
+-    'hqwebapp/js/bootstrap3/crud_paginated_list',
++    'hqwebapp/js/bootstrap5/crud_paginated_list',
+     'stripe',
+ ], function (
+     $,
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/case_search.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/case_search.js.diff.txt
new file mode 100644
index 000000000000..18a6ea1fd63d
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/case_search.js.diff.txt
@@ -0,0 +1,14 @@
+--- 
++++ 
+@@ -1,9 +1,9 @@
+-hqDefine('domain/js/bootstrap3/case_search', [
++hqDefine('domain/js/bootstrap5/case_search', [
+     'jquery',
+     'knockout',
+     'underscore',
+     'hqwebapp/js/initial_page_data',
+-    'hqwebapp/js/bootstrap3/main',
++    'hqwebapp/js/bootstrap5/main',
+ ], function (
+     $,
+     ko,
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/case_search_main.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/case_search_main.js.diff.txt
new file mode 100644
index 000000000000..c56e24e91a0e
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/case_search_main.js.diff.txt
@@ -0,0 +1,14 @@
+--- 
++++ 
+@@ -1,8 +1,8 @@
+-hqDefine('domain/js/bootstrap3/case_search_main', [
++hqDefine('domain/js/bootstrap5/case_search_main', [
+     'jquery',
+     'hqwebapp/js/initial_page_data',
+-    'domain/js/bootstrap3/case_search',
+-    'hqwebapp/js/bootstrap3/knockout_bindings.ko',     // save button
++    'domain/js/bootstrap5/case_search',
++    'hqwebapp/js/bootstrap5/knockout_bindings.ko',     // save button
+ ], function (
+     $,
+     initialPageData,
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/info_basic.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/info_basic.js.diff.txt
new file mode 100644
index 000000000000..51fa87df9960
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/info_basic.js.diff.txt
@@ -0,0 +1,13 @@
+--- 
++++ 
+@@ -1,8 +1,8 @@
+-hqDefine("domain/js/bootstrap3/info_basic", [
++hqDefine("domain/js/bootstrap5/info_basic", [
+     'jquery',
+     'hqwebapp/js/select_2_ajax_widget', // for call center case owner
+     'select2/dist/js/select2.full.min',
+-    'hqwebapp/js/bootstrap3/widgets',
++    'hqwebapp/js/bootstrap5/widgets',
+ ], function (
+     $
+ ) {
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/internal_subscription_management.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/internal_subscription_management.js.diff.txt
new file mode 100644
index 000000000000..9867b1fe1943
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/internal_subscription_management.js.diff.txt
@@ -0,0 +1,12 @@
+--- 
++++ 
+@@ -1,7 +1,7 @@
+-hqDefine('domain/js/bootstrap3/internal_subscription_management', [
++hqDefine('domain/js/bootstrap5/internal_subscription_management', [
+     'jquery',
+     'knockout',
+-    'hqwebapp/js/bootstrap3/widgets',
++    'hqwebapp/js/bootstrap5/widgets',
+ ], function (
+     $,
+     ko
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/toggles.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/toggles.js.diff.txt
new file mode 100644
index 000000000000..b044775e435f
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/toggles.js.diff.txt
@@ -0,0 +1,19 @@
+--- 
++++ 
+@@ -1,12 +1,12 @@
+-hqDefine('domain/js/bootstrap3/toggles', [
++hqDefine('domain/js/bootstrap5/toggles', [
+     'jquery',
+     'knockout',
+     'underscore',
+     'hqwebapp/js/initial_page_data',
+-    'hqwebapp/js/bootstrap3/alert_user',
++    'hqwebapp/js/bootstrap5/alert_user',
+     'hqwebapp/js/assert_properties',
+-    'hqwebapp/js/bootstrap3/knockout_bindings.ko',  // for slideVisible
+-    'hqwebapp/js/bootstrap3/main',
++    'hqwebapp/js/bootstrap5/knockout_bindings.ko',  // for slideVisible
++    'hqwebapp/js/bootstrap5/main',
+     'commcarehq',
+ ], function (
+     $,
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/update_billing_contact_info.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/update_billing_contact_info.js.diff.txt
new file mode 100644
index 000000000000..926b47a64267
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/update_billing_contact_info.js.diff.txt
@@ -0,0 +1,16 @@
+--- 
++++ 
+@@ -1,11 +1,11 @@
+ 'use strict';
+-hqDefine('domain/js/bootstrap3/update_billing_contact_info', [
++hqDefine('domain/js/bootstrap5/update_billing_contact_info', [
+     'jquery',
+     'hqwebapp/js/initial_page_data',
+     'accounting/js/stripe_card_manager',
+     'stripe',
+     'accounting/js/widgets',
+-    'hqwebapp/js/bootstrap3/knockout_bindings.ko', // openModal
++    'hqwebapp/js/bootstrap5/knockout_bindings.ko', // openModal
+ ], function (
+     $,
+     initialPageData,

From 36d0230f455741e295b0c4d5f90512c5524b659f Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 15:41:21 -0500
Subject: [PATCH 064/159] Fixed lint error

---
 corehq/apps/domain/middleware.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/corehq/apps/domain/middleware.py b/corehq/apps/domain/middleware.py
index 8b4b0eb90c05..ea608108cee4 100644
--- a/corehq/apps/domain/middleware.py
+++ b/corehq/apps/domain/middleware.py
@@ -5,7 +5,6 @@
 from django.utils.deprecation import MiddlewareMixin
 
 from corehq.apps.accounting.models import DefaultProductPlan, Subscription
-from corehq.apps.domain.models import DomainAuditRecordEntry
 from corehq.toggles import DATA_MIGRATION
 
 

From 1ec145d282ad98c127a10764a67f2c9de77ac144 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 21:32:14 +0000
Subject: [PATCH 065/159] "Bootstrap 5 Migration - initial auto-migration for
 login_and_password/password_reset_confirm.html, splitting templates"

---
 .../password_reset_confirm.html               |  0
 .../bootstrap5/password_reset_confirm.html    | 71 +++++++++++++++++++
 corehq/apps/domain/urls.py                    |  2 +-
 3 files changed, 72 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/login_and_password/{ => bootstrap3}/password_reset_confirm.html (100%)
 create mode 100644 corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_confirm.html

diff --git a/corehq/apps/domain/templates/login_and_password/password_reset_confirm.html b/corehq/apps/domain/templates/login_and_password/bootstrap3/password_reset_confirm.html
similarity index 100%
rename from corehq/apps/domain/templates/login_and_password/password_reset_confirm.html
rename to corehq/apps/domain/templates/login_and_password/bootstrap3/password_reset_confirm.html
diff --git a/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_confirm.html b/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_confirm.html
new file mode 100644
index 000000000000..db1b9fa6b58a
--- /dev/null
+++ b/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_confirm.html
@@ -0,0 +1,71 @@
+{% extends "registration/base.html" %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{% requirejs_main_b5 'registration/js/password_reset_confirm' %}
+
+{% block title %}{% trans "Password Reset Confirmation" %}{% endblock title %}
+
+{% block registration-content %}
+  {% if validlink %}
+    <form name="form" method="post" action="">
+      {% csrf_token %}
+      <h2 class="text-center">
+        {% trans "Reset Password" %}
+      </h2>
+      {% for global_error in form.non_field_errors %}
+        <div class="alert alert-danger">
+          {{ global_error }}
+        </div>
+      {% endfor %}
+      <fieldset class="check-password">
+        {% for field in form.visible_fields %}
+          <div class="form-group has-feedback{% if field.errors %} has-error{% endif %}">  {# todo B5: css-form-group, css-has-error #}
+            <label class="form-label" for="{{ field.id }}">{{ field.label }}</label>
+            <div>
+              {{ field }}
+              {% for error in field.errors %}
+                <p class="help-block">{{ error }}</p>
+              {% endfor %}
+              {% if field.help_text %}
+                <p class="help-block">
+                  {{ field.help_text }}
+                </p>
+              {% endif %}
+            </div>
+          </div>
+        {% endfor %}
+        <div class="form-bubble-actions">
+          <button type="submit" class="btn btn-lg btn-primary"
+                  data-bind="enable: passwordSufficient, click: submitCheck">
+            {% trans "Reset Password" %}
+          </button>
+        </div>
+      </fieldset>
+    </form>
+  {% else %}
+
+    <h2 class="text-center">
+      {% trans "Reset Password Unsuccessful" %}
+    </h2>
+    <p class="lead">
+      {% blocktrans %}
+        The password reset link was invalid, possibly because
+        it has already been used.
+      {% endblocktrans %}
+    </p>
+    <p class="lead">
+      {% blocktrans %}
+        Please request a new password reset.
+      {% endblocktrans %}
+    </p>
+    <div class="form-bubble-actions">
+      <a class="btn btn-lg btn-primary"
+         href="{% url "password_reset_email" %}">
+        {% blocktrans %}
+          Request Password Reset
+        {% endblocktrans %}
+      </a>
+    </div>
+  {% endif %}
+{% endblock %}
diff --git a/corehq/apps/domain/urls.py b/corehq/apps/domain/urls.py
index 904bc4cac3a0..0d84dc8d82f5 100644
--- a/corehq/apps/domain/urls.py
+++ b/corehq/apps/domain/urls.py
@@ -123,7 +123,7 @@
         name='password_reset_done'),
     url(r'^accounts/password_reset_confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$',
         CustomPasswordResetView.as_view(
-            template_name='login_and_password/password_reset_confirm.html',
+            template_name='login_and_password/bootstrap3/password_reset_confirm.html',
             form_class=HQSetPasswordForm,
             extra_context={'current_page': {'page_name': _('Password Reset Confirmation')}},
         ),

From a7bdcafc48e5e6799e9b5ee61cbbaee07b40afbe Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 21:32:35 +0000
Subject: [PATCH 066/159] "Bootstrap 5 Migration - initial auto-migration for
 login_and_password/two_factor/core/login_form.html, splitting templates"

---
 .../core/{ => bootstrap3}/login_form.html     |  0
 .../core/bootstrap5/login_form.html           | 35 +++++++++++++++++++
 .../two_factor/core/login.html                |  2 +-
 3 files changed, 36 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/login_and_password/two_factor/core/{ => bootstrap3}/login_form.html (100%)
 create mode 100644 corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/login_form.html

diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/core/login_form.html b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/login_form.html
similarity index 100%
rename from corehq/apps/domain/templates/login_and_password/two_factor/core/login_form.html
rename to corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/login_form.html
diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/login_form.html b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/login_form.html
new file mode 100644
index 000000000000..c8051696cf2e
--- /dev/null
+++ b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/login_form.html
@@ -0,0 +1,35 @@
+{% load i18n two_factor_tags %}
+<form action="" method="post">{% csrf_token %}
+  {% include "two_factor/_wizard_forms.html" %}
+
+  {# hidden submit button to enable [enter] key #}
+  <div style="display: none"><input type="submit" value=""/></div>  {# todo B5: inline-style #}
+
+  {% if device.name == "default" and other_devices %}
+    <p>{% trans "Or, alternatively, use one of your backup phones:" %}</p>
+    {% for other in other_devices %}
+      <p>
+        <button name="challenge_device"
+                value="{{ other.persistent_id }}"
+                class="btn btn-outline-primary" type="submit">
+          {{ other|as_action }}
+        </button>
+      </p>
+    {% endfor %}
+  {% endif %}
+  {% if backup_tokens %}
+    <p>{% trans "Please contact your domain administrator if you need a backup token." %}</p>
+    <p>
+      <button name="wizard_goto_step"
+              type="submit" value="backup"
+              class="btn btn-outline-primary">
+        {% trans "Use Backup Token" %}
+      </button>
+    </p>
+
+  {% endif %}
+
+  <div class="form-bubble-actions">
+    {% include "two_factor/_wizard_actions.html" %}
+  </div>
+</form>
diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/core/login.html b/corehq/apps/domain/templates/login_and_password/two_factor/core/login.html
index 102481acf529..6e0343e82a4b 100644
--- a/corehq/apps/domain/templates/login_and_password/two_factor/core/login.html
+++ b/corehq/apps/domain/templates/login_and_password/two_factor/core/login.html
@@ -68,5 +68,5 @@ <h2 class="text-center">
       {{ global_error }}
     </div>
   {% endfor %}
-  {% include "login_and_password/two_factor/core/login_form.html" %}
+  {% include "login_and_password/two_factor/core/bootstrap3/login_form.html" %}
 {% endblock %}

From 7bfae126454d125d124ff69cf7355284e52e567f Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 21:33:05 +0000
Subject: [PATCH 067/159] "Bootstrap 5 Migration - initial auto-migration for
 login_and_password/two_factor/profile/disable.html, splitting templates"

---
 .../profile/{ => bootstrap3}/disable.html          |  0
 .../two_factor/profile/bootstrap5/disable.html     | 14 ++++++++++++++
 2 files changed, 14 insertions(+)
 rename corehq/apps/domain/templates/login_and_password/two_factor/profile/{ => bootstrap3}/disable.html (100%)
 create mode 100644 corehq/apps/domain/templates/login_and_password/two_factor/profile/bootstrap5/disable.html

diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/profile/disable.html b/corehq/apps/domain/templates/login_and_password/two_factor/profile/bootstrap3/disable.html
similarity index 100%
rename from corehq/apps/domain/templates/login_and_password/two_factor/profile/disable.html
rename to corehq/apps/domain/templates/login_and_password/two_factor/profile/bootstrap3/disable.html
diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/profile/bootstrap5/disable.html b/corehq/apps/domain/templates/login_and_password/two_factor/profile/bootstrap5/disable.html
new file mode 100644
index 000000000000..e144a4e3763f
--- /dev/null
+++ b/corehq/apps/domain/templates/login_and_password/two_factor/profile/bootstrap5/disable.html
@@ -0,0 +1,14 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load i18n %}
+
+{% block page_content %}
+  <h1>{% block title %}{% trans "Remove Two-factor Authentication" %}{% endblock %}</h1>
+  <p>{% blocktrans %}You are about to <strong>remove</strong> two-factor authentication. This
+    compromises your account security, are you sure?{% endblocktrans %}</p>
+  <form method="post">
+    {% csrf_token %}
+    <table>{{ form }}</table>
+    <button class="btn btn-outline-danger"
+            type="submit">{% trans "Remove" %}</button>
+  </form>
+{% endblock %}

From a1c3fcd95db26288c9a1c73043e3dc08657f1309 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 21:33:27 +0000
Subject: [PATCH 068/159] "Bootstrap 5 Migration - initial auto-migration for
 login_and_password/two_factor/_wizard_actions.html, splitting templates"

---
 .../{ => bootstrap3}/_wizard_actions.html     |  0
 .../bootstrap5/_wizard_actions.html           | 29 +++++++++++++++++++
 2 files changed, 29 insertions(+)
 rename corehq/apps/domain/templates/login_and_password/two_factor/{ => bootstrap3}/_wizard_actions.html (100%)
 create mode 100644 corehq/apps/domain/templates/login_and_password/two_factor/bootstrap5/_wizard_actions.html

diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/_wizard_actions.html b/corehq/apps/domain/templates/login_and_password/two_factor/bootstrap3/_wizard_actions.html
similarity index 100%
rename from corehq/apps/domain/templates/login_and_password/two_factor/_wizard_actions.html
rename to corehq/apps/domain/templates/login_and_password/two_factor/bootstrap3/_wizard_actions.html
diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/bootstrap5/_wizard_actions.html b/corehq/apps/domain/templates/login_and_password/two_factor/bootstrap5/_wizard_actions.html
new file mode 100644
index 000000000000..59604f80ee76
--- /dev/null
+++ b/corehq/apps/domain/templates/login_and_password/two_factor/bootstrap5/_wizard_actions.html
@@ -0,0 +1,29 @@
+{% load i18n %}
+
+{% if wizard.steps.prev %}
+  <button name="wizard_goto_step" type="submit"
+          value="{{ wizard.steps.prev }}"
+          class="btn btn-outline-primary btn-lg">{% trans "Back" %}</button>
+{% endif %}
+{% if wizard.steps.current == 'auth' %}
+  {% if enforce_sso_login %}
+    <button type="button"
+            data-bind="visible: showContinueButton,
+                       click: proceedToNextStep,
+                       disable: isContinueDisabled"
+            class="btn btn-primary btn-lg">
+      <i class="fa fa-spinner fa-spin"
+         data-bind="visible:showContinueSpinner"></i>
+      <span data-bind="text:continueButtonText"></span>
+    </button>
+    <button type="submit"
+            data-bind="visible: showSignInButton"
+            class="btn btn-primary btn-lg">
+      {% trans "Sign In" %}
+    </button>
+  {% else %}
+    <button type="submit" class="btn btn-primary btn-lg">{% trans "Sign In" %}</button>
+  {% endif %}
+{% else %}
+  <button type="submit" class="btn btn-primary btn-lg">{% trans "Next" %}</button>
+{% endif %}

From 9f063d5fd4cf5389679b59e19f2c8eadfbc2447b Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 21:33:55 +0000
Subject: [PATCH 069/159] "Bootstrap 5 Migration - initial auto-migration for
 login_and_password/two_factor/core/backup_tokens.html, splitting templates"

---
 .../core/{ => bootstrap3}/backup_tokens.html  |  0
 .../core/bootstrap5/backup_tokens.html        | 31 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 rename corehq/apps/domain/templates/login_and_password/two_factor/core/{ => bootstrap3}/backup_tokens.html (100%)
 create mode 100644 corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/backup_tokens.html

diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/core/backup_tokens.html b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/backup_tokens.html
similarity index 100%
rename from corehq/apps/domain/templates/login_and_password/two_factor/core/backup_tokens.html
rename to corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/backup_tokens.html
diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/backup_tokens.html b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/backup_tokens.html
new file mode 100644
index 000000000000..95992de14a3d
--- /dev/null
+++ b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/backup_tokens.html
@@ -0,0 +1,31 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load i18n %}
+
+{% block page_content %}
+  <h1>{% block title %}{% trans "Backup Tokens" %}{% endblock %}</h1>
+  <p>{% blocktrans %}Backup tokens can be used when your primary and backup
+    phone numbers aren't available. The backup tokens below can be used
+    for login verification. If you've used up all your backup tokens, you
+    can generate a new set of backup tokens. Only the backup tokens shown
+    below will be valid.{% endblocktrans %}</p>
+
+  {% if device.token_set.count %}
+    <ul>
+      {% for token in device.token_set.all %}
+        <li>{{ token.token }}</li>
+      {% endfor %}
+    </ul>
+    <p>{% blocktrans %}Print these tokens and keep them somewhere safe.{% endblocktrans %}</p>
+  {% else %}
+    <p>{% trans "You don't have any backup codes yet." %}</p>
+  {% endif %}
+
+  <form method="post">{% csrf_token %}{{ form }}
+    {% if link_to_webapps %}
+      <a href="{% url 'homepage'%}" class="btn btn-primary">{% trans "Begin Using CommCare Now" %}</a>
+    {% endif %}
+    <a href="{% url 'two_factor:profile'%}"
+       class="float-end btn btn-link">{% trans "Back to Profile" %}</a>
+    <button class="btn btn-outline-primary" type="submit">{% trans "Generate Tokens" %}</button>
+  </form>
+{% endblock %}

From fff3b94925c8dea357599ff1b1cba15bb902566a Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 21:34:11 +0000
Subject: [PATCH 070/159] "Bootstrap 5 Migration - initial auto-migration for
 login_and_password/password_reset_form.html, splitting templates"

---
 .../{ => bootstrap3}/password_reset_form.html      |  0
 .../bootstrap5/password_reset_form.html            | 14 ++++++++++++++
 corehq/apps/domain/urls.py                         |  2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/login_and_password/{ => bootstrap3}/password_reset_form.html (100%)
 create mode 100644 corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_form.html

diff --git a/corehq/apps/domain/templates/login_and_password/password_reset_form.html b/corehq/apps/domain/templates/login_and_password/bootstrap3/password_reset_form.html
similarity index 100%
rename from corehq/apps/domain/templates/login_and_password/password_reset_form.html
rename to corehq/apps/domain/templates/login_and_password/bootstrap3/password_reset_form.html
diff --git a/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_form.html b/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_form.html
new file mode 100644
index 000000000000..ee4826920c9b
--- /dev/null
+++ b/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_form.html
@@ -0,0 +1,14 @@
+{% extends "registration/base.html" %}
+{% load hq_shared_tags %}
+{% load i18n %}
+
+{% requirejs_main_b5 'registration/js/password_reset_form' %}
+
+{% block title %}{% trans "Password Reset" %}{% endblock title %}
+
+{% block registration-content %}
+  <h2 class="text-center">
+    {% trans "Reset Password" %}
+  </h2>
+  {% include 'login_and_password/partials/password_reset_form_only.html' %}
+{% endblock %}
diff --git a/corehq/apps/domain/urls.py b/corehq/apps/domain/urls.py
index 0d84dc8d82f5..f161b5e88550 100644
--- a/corehq/apps/domain/urls.py
+++ b/corehq/apps/domain/urls.py
@@ -87,7 +87,7 @@
 )
 
 PASSWORD_RESET_KWARGS = {
-    'template_name': 'login_and_password/password_reset_form.html',
+    'template_name': 'login_and_password/bootstrap3/password_reset_form.html',
     'form_class': ConfidentialPasswordResetForm,
     'from_email': settings.DEFAULT_FROM_EMAIL,
     'extra_context': {'current_page': {'page_name': _('Password Reset')}}

From f867228546093ac0604377751f5fea3831c3eec1 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 21:34:30 +0000
Subject: [PATCH 071/159] "Bootstrap 5 Migration - initial auto-migration for
 login_and_password/partials/password_reset_form_only.html, splitting
 templates"

---
 .../bootstrap3/password_reset_form.html       |  2 +-
 .../bootstrap5/password_reset_form.html       |  2 +-
 .../password_reset_form_only.html             |  0
 .../bootstrap5/password_reset_form_only.html  | 41 +++++++++++++++++++
 4 files changed, 43 insertions(+), 2 deletions(-)
 rename corehq/apps/domain/templates/login_and_password/partials/{ => bootstrap3}/password_reset_form_only.html (100%)
 create mode 100644 corehq/apps/domain/templates/login_and_password/partials/bootstrap5/password_reset_form_only.html

diff --git a/corehq/apps/domain/templates/login_and_password/bootstrap3/password_reset_form.html b/corehq/apps/domain/templates/login_and_password/bootstrap3/password_reset_form.html
index d5be7cef14f4..eb9eab0e2911 100644
--- a/corehq/apps/domain/templates/login_and_password/bootstrap3/password_reset_form.html
+++ b/corehq/apps/domain/templates/login_and_password/bootstrap3/password_reset_form.html
@@ -10,5 +10,5 @@
   <h2 class="text-center">
     {% trans "Reset Password" %}
   </h2>
-  {% include 'login_and_password/partials/password_reset_form_only.html' %}
+  {% include 'login_and_password/partials/bootstrap3/password_reset_form_only.html' %}
 {% endblock %}
diff --git a/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_form.html b/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_form.html
index ee4826920c9b..78680b5369a9 100644
--- a/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_form.html
+++ b/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_form.html
@@ -10,5 +10,5 @@
   <h2 class="text-center">
     {% trans "Reset Password" %}
   </h2>
-  {% include 'login_and_password/partials/password_reset_form_only.html' %}
+  {% include 'login_and_password/partials/bootstrap5/password_reset_form_only.html' %}
 {% endblock %}
diff --git a/corehq/apps/domain/templates/login_and_password/partials/password_reset_form_only.html b/corehq/apps/domain/templates/login_and_password/partials/bootstrap3/password_reset_form_only.html
similarity index 100%
rename from corehq/apps/domain/templates/login_and_password/partials/password_reset_form_only.html
rename to corehq/apps/domain/templates/login_and_password/partials/bootstrap3/password_reset_form_only.html
diff --git a/corehq/apps/domain/templates/login_and_password/partials/bootstrap5/password_reset_form_only.html b/corehq/apps/domain/templates/login_and_password/partials/bootstrap5/password_reset_form_only.html
new file mode 100644
index 000000000000..0027a4e5933c
--- /dev/null
+++ b/corehq/apps/domain/templates/login_and_password/partials/bootstrap5/password_reset_form_only.html
@@ -0,0 +1,41 @@
+{% load hq_shared_tags %}
+{% load i18n %}
+{% url "password_reset_email" as default_form_submit_url %}
+<form name="form" method="post" action="{{ form_submit_url|default:default_form_submit_url }}">
+  {% csrf_token %}
+  {% for global_error in form.non_field_errors %}
+    <div class="alert alert-danger">
+      {{ global_error }}
+    </div>
+  {% endfor %}
+  <fieldset>
+    {% for field in form.visible_fields %}
+      <div class="form-group has-feedback{% if field.errors %} has-error{% endif %}">  {# todo B5: css-form-group, css-has-error #}
+        <label class="form-label" for="{{ field.id }}">{{ field.label }}</label>
+        <div>
+          {{ field }}
+          {% for error in field.errors %}
+            <div class="help-block">{{ error }}</div>
+          {% endfor %}
+          {% if forloop.counter0 == 0 %}
+            <div class="help-block">
+              {% blocktrans %}
+                We will email instructions to you for resetting your password.
+              {% endblocktrans %}
+            </div>
+          {% endif %}
+        </div>
+      </div>
+    {% endfor %}
+  </fieldset>
+  <div class="form-bubble-actions">
+    {% url "login" as default_login_url %}
+    <a href="{{ login_url|default:default_login_url }}"
+       class="btn btn-lg btn-outline-primary">
+      {% trans "Back" %}
+    </a>
+    <button type="submit" class="btn btn-lg btn-primary">
+      {% trans "Reset Password" %}
+    </button>
+  </div>
+</form>

From 0310ed480ccabc295c8d6b033072f038a665aa6c Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 21:34:54 +0000
Subject: [PATCH 072/159] "Bootstrap 5 Migration - initial auto-migration for
 login_and_password/two_factor/core/setup_complete.html, splitting templates"

---
 .../core/{ => bootstrap3}/setup_complete.html |  0
 .../core/bootstrap5/setup_complete.html       | 27 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 rename corehq/apps/domain/templates/login_and_password/two_factor/core/{ => bootstrap3}/setup_complete.html (100%)
 create mode 100644 corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/setup_complete.html

diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/core/setup_complete.html b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/setup_complete.html
similarity index 100%
rename from corehq/apps/domain/templates/login_and_password/two_factor/core/setup_complete.html
rename to corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/setup_complete.html
diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/setup_complete.html b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/setup_complete.html
new file mode 100644
index 000000000000..4e5e9d8b64a1
--- /dev/null
+++ b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/setup_complete.html
@@ -0,0 +1,27 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load i18n %}
+
+{% block page_content %}
+  <h1>{% block title %}{% trans "Enable Two-Factor Authentication" %}{% endblock %}</h1>
+
+  <p>{% blocktrans %}Congratulations, you've successfully enabled two-factor
+    authentication.{% endblocktrans %}
+
+    {% if not phone_methods %}
+      {% if link_to_webapps %}
+        <a href="{% url 'homepage'%}" class="btn btn-primary">{% trans "Begin Using CommCare Now" %}</a>
+      {% endif %}
+      <p><a href="{% url 'two_factor:profile' %}"
+            class="btn btn-block btn-outline-primary">{% trans "Back to Profile" %}</a></p>
+    {% else %}
+      <p>{% blocktrans %}To enable account recovery, generate backup tokens.{% endblocktrans %}</p>
+      {% if link_to_webapps %}
+        <a href="{% url 'homepage'%}" class="btn btn-primary">{% trans "Begin Using CommCare Now" %}</a>
+      {% endif %}
+      <p></p><a href="{% url 'two_factor:profile' %}"
+         class="float-end btn btn-link">{% trans "Back to Profile" %}</a></p>
+      <p><a href="{% url 'two_factor:backup_tokens' %}"
+            class="btn btn-outline-primary">{% trans "Generate Backup Tokens" %}</a></p>
+    {% endif %}
+
+{% endblock %}

From 8892d7517db67af2f00897085d5d92c262796fa0 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 21:35:03 +0000
Subject: [PATCH 073/159] "Bootstrap 5 Migration - initial auto-migration for
 login_and_password/two_factor/core/otp_required.html, splitting templates"

---
 .../core/{ => bootstrap3}/otp_required.html   |  0
 .../core/bootstrap5/otp_required.html         | 27 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 rename corehq/apps/domain/templates/login_and_password/two_factor/core/{ => bootstrap3}/otp_required.html (100%)
 create mode 100644 corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/otp_required.html

diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/core/otp_required.html b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/otp_required.html
similarity index 100%
rename from corehq/apps/domain/templates/login_and_password/two_factor/core/otp_required.html
rename to corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/otp_required.html
diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/otp_required.html b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/otp_required.html
new file mode 100644
index 000000000000..9d837326e194
--- /dev/null
+++ b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/otp_required.html
@@ -0,0 +1,27 @@
+{% extends "hqwebapp/bootstrap5/base_page.html" %}
+{% load i18n %}
+
+{% block page_content %}
+  <h1>{% block title %}{% trans "Please set up Two-Factor Authentication" %}{% endblock %}</h1>
+
+  <p>
+    {% blocktrans %}
+      For security purposes, your CommCare administrator has required that all users in your project set up
+      two-factor authentication.<br>This is an extra layer of protection used to ensure the security of your account
+      beyond a username and password. 
+    {% endblocktrans %}
+  </p>
+
+  <p>
+    {% blocktrans %}
+      To access your account, please enable two-factor authentication below.
+    {% endblocktrans %}
+  </p>
+
+  <p>
+    <a href="{% url "domain_select_redirect" %}"
+       class="float-end btn btn-link">{% trans "Go back" %}</a>
+    <a href="{% url 'two_factor:setup' %}" class="btn btn-primary">
+      {% trans "Enable Two-Factor Authentication" %}</a>
+  </p>
+{% endblock %}

From c7ad7eaceede1852f6eeda42890354dbca9e37a3 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 21:35:14 +0000
Subject: [PATCH 074/159] "Bootstrap 5 Migration - initial auto-migration for
 login_and_password/two_factor/core/login.html, splitting templates"

---
 .../partials/login_full.html                  |  2 +-
 .../core/{ => bootstrap3}/login.html          |  0
 .../two_factor/core/bootstrap5/login.html     | 72 +++++++++++++++++++
 3 files changed, 73 insertions(+), 1 deletion(-)
 rename corehq/apps/domain/templates/login_and_password/two_factor/core/{ => bootstrap3}/login.html (100%)
 create mode 100644 corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/login.html

diff --git a/corehq/apps/domain/templates/login_and_password/partials/login_full.html b/corehq/apps/domain/templates/login_and_password/partials/login_full.html
index 9f170d0d8631..3ae1ac9143b3 100644
--- a/corehq/apps/domain/templates/login_and_password/partials/login_full.html
+++ b/corehq/apps/domain/templates/login_and_password/partials/login_full.html
@@ -4,7 +4,7 @@
     <div class="col-xs-12">
       <div class="reg-form-container sign-in-container">
         <div class="form-bubble form-bubble-lg">
-          {% include "login_and_password/two_factor/core/login.html" %}
+          {% include "login_and_password/two_factor/core/bootstrap3/login.html" %}
         </div>
         {% if not restrict_domain_creation %}
           <div class="well sign-up-bubble form-bubble-purple">
diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/core/login.html b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/login.html
similarity index 100%
rename from corehq/apps/domain/templates/login_and_password/two_factor/core/login.html
rename to corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/login.html
diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/login.html b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/login.html
new file mode 100644
index 000000000000..1fd69e1b6d01
--- /dev/null
+++ b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/login.html
@@ -0,0 +1,72 @@
+{% load i18n phonenumber %}
+
+{% block focus-content %}
+  <h2 class="text-center">
+    {{ current_page.page_name }}
+  </h2>
+
+  {% if messages %}
+    {% for message in messages %}
+      <p class="alert text-center{% if message.tags %} {{ message.tags }}{% endif %}">
+        {% if 'html' in message.tags %}{{ message|safe }}{% else %}{{ message }}{% endif %}
+      </p>
+    {% endfor %}
+  {% endif %}
+
+  {% if wizard.steps.current == 'token' %}
+    {% if device.method == 'call' %}
+      <p class="alert alert-info text-center">
+        {% blocktrans %}
+          We are calling your phone right now, please enter the
+          digits you hear.
+        {% endblocktrans %}
+      </p>
+    {% elif device.method == 'sms' %}
+      <p class="alert alert-info text-center">
+        {% blocktrans %}
+          We sent you a text message, please enter the tokens we
+          sent.
+        {% endblocktrans %}
+      </p>
+    {% else %}
+      <p class="alert alert-info text-center">
+        {% blocktrans %}
+          Please enter the tokens generated by your token
+          generator.
+        {% endblocktrans %}
+      </p>
+    {% endif %}
+  {% elif wizard.steps.current == 'backup' %}
+    <p class="alert alert-info text-center">
+      {% blocktrans %}
+        Please enter the token given to you by your domain administrator.
+      {% endblocktrans %}
+    </p>
+  {% else %}
+    <p class="text-center">
+      {% if next %}
+        {% trans "Looks like your CommCare session has expired." %}<br />
+        {% trans "Please log in again to continue working." %}
+      {% else %}
+        {% if enforce_sso_login %}
+          {% trans "Please sign in below." %} {# removed "to continue" because of the two-part step involving a Continue button #}
+        {% else %}
+          {% trans "Please sign in below to continue." %}
+        {% endif %}
+      {% endif %}
+    </p>
+
+    {% if next %}
+      <p class="alert alert-info text-center">
+        {% trans "You will be transferred to your original destination after you sign in." %}
+      </p>
+    {% endif %}
+  {% endif %}
+
+  {% for global_error in form.non_field_errors %}
+    <div class="alert alert-danger">
+      {{ global_error }}
+    </div>
+  {% endfor %}
+  {% include "login_and_password/two_factor/core/bootstrap5/login_form.html" %}
+{% endblock %}

From a73c6e1a6669fe882f0cda7c627ba1c7c371a030 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 21:35:29 +0000
Subject: [PATCH 075/159] "Bootstrap 5 Migration - initial auto-migration for
 login_and_password/two_factor/core/setup.html, splitting templates"

---
 .../core/{ => bootstrap3}/setup.html          |  0
 .../two_factor/core/bootstrap5/setup.html     | 57 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 rename corehq/apps/domain/templates/login_and_password/two_factor/core/{ => bootstrap3}/setup.html (100%)
 create mode 100644 corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/setup.html

diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/core/setup.html b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/setup.html
similarity index 100%
rename from corehq/apps/domain/templates/login_and_password/two_factor/core/setup.html
rename to corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/setup.html
diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/setup.html b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/setup.html
new file mode 100644
index 000000000000..56594993bc6b
--- /dev/null
+++ b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/setup.html
@@ -0,0 +1,57 @@
+{# lightly modified version of two_factor/core/setup.html #}
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+{% block extra_media %}
+  {{ form.media }}
+{% endblock %}
+
+{% block page_content %}
+  <h1>{% block title %}{% trans "Enable Two-Factor Authentication" %}{% endblock %}</h1>
+  {% if wizard.steps.current == 'welcome' %}
+    <p>{% blocktrans trimmed %}Follow the steps in this wizard to enable two-factor
+        authentication.{% endblocktrans %}</p>
+  {% elif wizard.steps.current == 'method' %}
+    <p>{% blocktrans trimmed %}Please select which authentication method you would
+        like to use.{% endblocktrans %}</p>
+  {% elif wizard.steps.current == 'generator' %}
+    <p>{% blocktrans trimmed %}To start using a token generator, please use your
+        smartphone to scan the QR code below. For example, use Google
+        Authenticator. Then, enter the token generated by the app.{% endblocktrans %}</p>
+    <p><img src="{{ QR_URL }}" alt="QR Code" class="bg-white"/></p>
+
+  {% elif wizard.steps.current == 'sms' %}
+    <p>{% blocktrans trimmed %}Please enter the phone number you wish to receive the
+      text messages on. This number will be validated in the next step.
+      {% endblocktrans %}</p>
+  {% elif wizard.steps.current == 'call' %}
+    <p>{% blocktrans trimmed %}Please enter the phone number you wish to be called on.
+      This number will be validated in the next step. {% endblocktrans %}</p>
+  {% elif wizard.steps.current == 'validation' %}
+    {% if challenge_succeeded %}
+      {% if device.method == 'call' %}
+        <p>{% blocktrans trimmed %}We are calling your phone right now, please enter the
+          digits you hear.{% endblocktrans %}</p>
+      {% elif device.method == 'sms' %}
+        <p>{% blocktrans trimmed %}We sent you a text message, please enter the tokens we
+          sent.{% endblocktrans %}</p>
+      {% endif %}
+    {% else %}
+      <p class="alert alert-warning" role="alert">{% blocktrans trimmed %}We've
+        encountered an issue with the selected authentication method. Please
+        go back and verify that you entered your information correctly, try
+        again, or use a different authentication method instead. If the issue
+        persists, contact the site administrator.{% endblocktrans %}</p>
+    {% endif %}
+  {% elif wizard.steps.current == 'yubikey' %}
+    <p>{% blocktrans trimmed %}To identify and verify your YubiKey, please insert a
+      token in the field below. Your YubiKey will be linked to your
+      account.{% endblocktrans %}</p>
+  {% endif %}
+
+  <form action="" method="post" class="form-horizontal" >{% csrf_token %}
+    {{ wizard.management_form }}
+    {% crispy wizard.form %}  {# todo B5: crispy #}
+  </form>
+{% endblock %}

From a212e1ab767f2e2612006db2c2de9630eba16d9e Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 21:35:59 +0000
Subject: [PATCH 076/159] "Bootstrap 5 Migration - initial auto-migration for
 login_and_password/partials/login_full.html, splitting templates"

---
 .../templates/login_and_password/login.html   |  2 +-
 .../partials/{ => bootstrap3}/login_full.html |  0
 .../partials/bootstrap5/login_full.html       | 42 +++++++++++++++++++
 .../bootstrap3/iframe_domain_login.html       |  2 +-
 .../bootstrap5/iframe_domain_login.html       |  2 +-
 5 files changed, 45 insertions(+), 3 deletions(-)
 rename corehq/apps/domain/templates/login_and_password/partials/{ => bootstrap3}/login_full.html (100%)
 create mode 100644 corehq/apps/domain/templates/login_and_password/partials/bootstrap5/login_full.html

diff --git a/corehq/apps/domain/templates/login_and_password/login.html b/corehq/apps/domain/templates/login_and_password/login.html
index fe0325943dbd..b6f0fcd3294f 100644
--- a/corehq/apps/domain/templates/login_and_password/login.html
+++ b/corehq/apps/domain/templates/login_and_password/login.html
@@ -39,7 +39,7 @@
          id="user-login-form"
          class="ko-template"
          {% endif %}>
-      {% include "login_and_password/partials/login_full.html" %}
+      {% include "login_and_password/partials/bootstrap3/login_full.html" %}
     </div>
   {% endblock %}
 {% endblock content %}
diff --git a/corehq/apps/domain/templates/login_and_password/partials/login_full.html b/corehq/apps/domain/templates/login_and_password/partials/bootstrap3/login_full.html
similarity index 100%
rename from corehq/apps/domain/templates/login_and_password/partials/login_full.html
rename to corehq/apps/domain/templates/login_and_password/partials/bootstrap3/login_full.html
diff --git a/corehq/apps/domain/templates/login_and_password/partials/bootstrap5/login_full.html b/corehq/apps/domain/templates/login_and_password/partials/bootstrap5/login_full.html
new file mode 100644
index 000000000000..7604f71fec58
--- /dev/null
+++ b/corehq/apps/domain/templates/login_and_password/partials/bootstrap5/login_full.html
@@ -0,0 +1,42 @@
+{% load i18n %}
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-sm-12">
+      <div class="reg-form-container sign-in-container">
+        <div class="form-bubble form-bubble-lg">
+          {% include "login_and_password/two_factor/core/bootstrap5/login.html" %}
+        </div>
+        {% if not restrict_domain_creation %}
+          <div class="card sign-up-bubble form-bubble-purple">  {# todo B5: css-well #}
+            <h2>
+              {% blocktrans %}
+                No account? Sign up today, it's free!
+              {% endblocktrans %}
+            </h2>
+            {% if not allow_domain_requests %}
+              <p class="lead">
+                <strong><a href="http://www.dimagi.com/commcare/">{% trans "Learn more" %}</a></strong>
+                {% blocktrans %}about how CommCare HQ can be your mobile solution for your frontline workforce.{% endblocktrans %}
+              </p>
+            {% endif %}
+            <p class="text-center">
+              <a class="btn btn-purple btn-lg"
+                {% if allow_domain_requests %}
+                 href="{% url "domain_request" domain %}"
+                {% else %}
+                 href="{% url "register_user" %}"
+                {% endif %}
+              >
+                {% if allow_domain_requests %}
+                  {% blocktrans %}Request Access to {{ hr_name }}{% endblocktrans %}
+                {% else %}
+                  {% trans "Sign Up" %}
+                {% endif %}
+              </a>
+            </p>
+          </div>
+        {% endif %}
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap3/iframe_domain_login.html b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap3/iframe_domain_login.html
index b2ac7083f09d..3091a16e5921 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap3/iframe_domain_login.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap3/iframe_domain_login.html
@@ -48,7 +48,7 @@
          id="user-login-form"
          class="ko-template"
          {% endif %}>
-      {% include "login_and_password/partials/login_full.html" %}
+      {% include "login_and_password/partials/bootstrap3/login_full.html" %}
     </div>
   {% endblock %}
 {% endblock content %}
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/iframe_domain_login.html b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/iframe_domain_login.html
index d2f535141bf1..ccc018bcbd11 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/iframe_domain_login.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/iframe_domain_login.html
@@ -48,7 +48,7 @@
          id="user-login-form"
          class="ko-template"
          {% endif %}>
-      {% include "login_and_password/partials/login_full.html" %}
+      {% include "login_and_password/partials/bootstrap5/login_full.html" %}
     </div>
   {% endblock %}
 {% endblock content %}

From 4b271f55607ce33b0733b71062ce32819b56bc52 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 21:36:11 +0000
Subject: [PATCH 077/159] "Bootstrap 5 Migration - initial auto-migration for
 login_and_password/two_factor/profile/profile.html, splitting templates"

---
 .../profile/{ => bootstrap3}/profile.html     |  0
 .../profile/bootstrap5/profile.html           | 91 +++++++++++++++++++
 2 files changed, 91 insertions(+)
 rename corehq/apps/domain/templates/login_and_password/two_factor/profile/{ => bootstrap3}/profile.html (100%)
 create mode 100644 corehq/apps/domain/templates/login_and_password/two_factor/profile/bootstrap5/profile.html

diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/profile/profile.html b/corehq/apps/domain/templates/login_and_password/two_factor/profile/bootstrap3/profile.html
similarity index 100%
rename from corehq/apps/domain/templates/login_and_password/two_factor/profile/profile.html
rename to corehq/apps/domain/templates/login_and_password/two_factor/profile/bootstrap3/profile.html
diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/profile/bootstrap5/profile.html b/corehq/apps/domain/templates/login_and_password/two_factor/profile/bootstrap5/profile.html
new file mode 100644
index 000000000000..df560f3cbd11
--- /dev/null
+++ b/corehq/apps/domain/templates/login_and_password/two_factor/profile/bootstrap5/profile.html
@@ -0,0 +1,91 @@
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load i18n phonenumber %}
+
+{% block page_content %}
+  {% if is_using_sso %}
+    <p class="lead">
+      {% blocktrans %}
+        Two-Factor Authentication is not managed here.
+      {% endblocktrans %}
+    </p>
+    <p>
+      {% blocktrans %}
+        Your account is managed by <strong>{{ idp_name }}</strong>.<br />
+        Please see your organization's documentation for how to update
+        your Two-Factor Authentication settings with Single Sign-On.
+      {% endblocktrans %}
+    </p>
+  {% else %}
+    {% if default_device %}
+      {% if allow_phone_2fa %}
+      <fieldset>
+        <legend>{% trans "Backup Phone Numbers" %}</legend>
+        <p>{% blocktrans %}If your primary method is not available, we are able to
+          send backup tokens to the phone numbers listed below.{% endblocktrans %}</p>
+        <ul>
+          {% for phone in backup_phones %}
+            <li>
+              {{ phone|device_action }}
+              <form method="post" action="{% url 'two_factor:phone_delete' phone.id %}"
+                    onsubmit="return confirm('Are you sure?')">
+                {% csrf_token %}
+                <button class="btn btn-sm btn-outline-danger"
+                        type="submit">{% trans "Unregister" %}</button>
+              </form>
+            </li>
+          {% endfor %}
+        </ul>
+        <p><a href="{% url 'two_factor:phone_create' %}"
+              class="btn btn-outline-primary">{% trans "Add Phone Number" %}</a></p>
+        <br/>
+      </fieldset>
+      {% endif %}
+
+      <fieldset>
+        <legend>{% trans "Backup Tokens" %}</legend>
+        <p>
+          {% blocktrans %}If you don't have any device with you, you can access
+            your account using backup tokens.{% endblocktrans %}
+          {% blocktrans count counter=backup_tokens %}
+            You have only one backup token remaining.
+          {% plural %}
+            You have {{ counter }} backup tokens remaining.
+          {% endblocktrans %}
+        </p>
+        <p><a href="{% url 'two_factor:backup_tokens' %}"
+              class="btn btn-outline-primary">{% trans "Show Codes" %}</a></p>
+        <br/>
+      </fieldset>
+
+      <fieldset>
+        <legend>{% trans "Remove Two-Factor Authentication" %}</legend>
+        <p>{% blocktrans %}We <strong>strongly discourage</strong> this, but if absolutely necessary you can
+          remove two-factor authentication from your account.{% endblocktrans %}</p>
+        <p><a class="btn btn-outline-danger" href="{% url 'two_factor:disable' %}">
+          {% trans "Remove Two-Factor Authentication" %}</a></p>
+        <br/>
+      </fieldset>
+      <fieldset>
+        <legend>{% trans "Reset Two-Factor Authentication" %}</legend>
+        <p>{% blocktrans %}
+          This will remove your current two-factor authentication, and prompt you to run through the entire setup again.
+          If you need to do this, please make sure you complete the entire process once you begin, otherwise your account will
+          not be protected by two-factor authentication.
+        {% endblocktrans %}</p>
+        <p><a class="btn btn-outline-primary" href="{% url 'reset' %}">
+          {% trans "Reset Two-Factor Authentication" %}</a></p>
+        <br/>
+      </fieldset>
+    {% else %}
+      <fieldset>
+        <legend>Two-Factor Authentication</legend>
+        <p>{% blocktrans %}Two-factor authentication is not enabled for your
+          account. Enable two-factor authentication for enhanced account
+          security.{% endblocktrans %}</p>
+        <p><a href="{% url 'two_factor:setup' %}" class="btn btn-primary">
+          {% trans "Enable Two-Factor Authentication" %}</a>
+        </p>
+      </fieldset>
+    {% endif %}
+  {% endif %}
+{% endblock %}

From 2978a630be0c93cab843b02ee939e643e1263699 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 21:36:41 +0000
Subject: [PATCH 078/159] "Bootstrap 5 Migration - initial auto-migration for
 login_and_password/login.html, splitting templates"

---
 .../{ => bootstrap3}/login.html               |  0
 .../login_and_password/bootstrap5/login.html  | 45 +++++++++++++++++++
 .../apps/domain/tests/test_domain_transfer.py |  4 +-
 corehq/apps/hqwebapp/views.py                 |  2 +-
 .../templates/registration/base.html          |  2 +-
 5 files changed, 49 insertions(+), 4 deletions(-)
 rename corehq/apps/domain/templates/login_and_password/{ => bootstrap3}/login.html (100%)
 create mode 100644 corehq/apps/domain/templates/login_and_password/bootstrap5/login.html

diff --git a/corehq/apps/domain/templates/login_and_password/login.html b/corehq/apps/domain/templates/login_and_password/bootstrap3/login.html
similarity index 100%
rename from corehq/apps/domain/templates/login_and_password/login.html
rename to corehq/apps/domain/templates/login_and_password/bootstrap3/login.html
diff --git a/corehq/apps/domain/templates/login_and_password/bootstrap5/login.html b/corehq/apps/domain/templates/login_and_password/bootstrap5/login.html
new file mode 100644
index 000000000000..ea73e82f1d63
--- /dev/null
+++ b/corehq/apps/domain/templates/login_and_password/bootstrap5/login.html
@@ -0,0 +1,45 @@
+{% extends "hqwebapp/bootstrap5/base_page.html" %}
+{% load i18n %}
+{% load hq_shared_tags %}
+{% load compress %}
+
+{% requirejs_main_b5 'registration/js/login' %}
+
+{% block title %}{% trans "Log In :: CommCare HQ" %}{% endblock title %}
+
+{% block background_content %}
+  <div class="bg-container">
+    <div class="bg-full-cover-fixed bg-registration b-lazy"
+         data-src="{% static 'hqwebapp/images/molly.jpg' %}"></div>
+    <div class="bg-overlay"></div>
+  </div>
+{% endblock %}
+
+{% block stylesheets %}
+  <link type="text/css"
+        rel="stylesheet"
+        media="all"
+        href="{% static 'intl-tel-input/build/css/intlTelInput.css' %}" />
+
+  {% compress css %}
+    <link type="text/less"
+          rel="stylesheet"
+          media="all"
+          href="{% static 'registration/less/registration.less' %}" />
+  {% endcompress %}
+{% endblock stylesheets %}
+
+{% block content %}
+  {% initial_page_data "hide_password_feedback" hide_password_feedback %}
+  {% initial_page_data "enforce_sso_login" enforce_sso_login|BOOL %}
+  {% registerurl 'check_sso_login_status' %}
+  {% registerurl 'iframe_sso_login_pending' %}
+  {% block login-content %}
+    <div {% if enforce_sso_login %}
+         id="user-login-form"
+         class="ko-template"
+         {% endif %}>
+      {% include "login_and_password/partials/bootstrap5/login_full.html" %}
+    </div>
+  {% endblock %}
+{% endblock content %}
diff --git a/corehq/apps/domain/tests/test_domain_transfer.py b/corehq/apps/domain/tests/test_domain_transfer.py
index 008951997138..c4b29a9be244 100644
--- a/corehq/apps/domain/tests/test_domain_transfer.py
+++ b/corehq/apps/domain/tests/test_domain_transfer.py
@@ -174,7 +174,7 @@ def test_permissions_for_activation(self):
         # No one logged in
         resp = self.client.post(reverse('activate_transfer_domain',
                                         args=[self.transfer.transfer_guid]), follow=True)
-        self.assertEqual(resp.template_name, ['login_and_password/login.html'],
+        self.assertEqual(resp.template_name, ['login_and_password/bootstrap3/login.html'],
                          'Should redirect to login page')
 
         # Initiator logged in
@@ -193,7 +193,7 @@ def test_permissions_for_deactivation(self):
         # No one logged in
         resp = self.client.post(reverse('deactivate_transfer_domain',
                                         args=[self.transfer.transfer_guid]), follow=True)
-        self.assertEqual(resp.template_name, ['login_and_password/login.html'],
+        self.assertEqual(resp.template_name, ['login_and_password/bootstrap3/login.html'],
                          'Should redirect to login page')
 
         # Random user who belongs to the domain
diff --git a/corehq/apps/hqwebapp/views.py b/corehq/apps/hqwebapp/views.py
index 3c52ea92a022..000d468be309 100644
--- a/corehq/apps/hqwebapp/views.py
+++ b/corehq/apps/hqwebapp/views.py
@@ -388,7 +388,7 @@ def _login(req, domain_name, custom_login_page, extra_context=None):
     req.base_template = settings.BASE_TEMPLATE
 
     context = {}
-    template_name = custom_login_page if custom_login_page else 'login_and_password/login.html'
+    template_name = custom_login_page if custom_login_page else 'login_and_password/bootstrap3/login.html'
     if not custom_login_page and domain_name:
         domain_obj = Domain.get_by_name(domain_name)
         req_params = req.GET if req.method == 'GET' else req.POST
diff --git a/corehq/apps/registration/templates/registration/base.html b/corehq/apps/registration/templates/registration/base.html
index b97f55381640..a419bc10e305 100644
--- a/corehq/apps/registration/templates/registration/base.html
+++ b/corehq/apps/registration/templates/registration/base.html
@@ -1,4 +1,4 @@
-{% extends "login_and_password/login.html" %}
+{% extends "login_and_password/bootstrap3/login.html" %}
 {% load i18n %}
 {% load hq_shared_tags %}
 {% load compress %}

From 303627cf0a9ea6f899e7d71c2334b48d3fbf95d2 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 21:36:55 +0000
Subject: [PATCH 079/159] "Bootstrap 5 Migration - initial auto-migration for
 login_and_password/two_factor/core/phone_register.html, splitting templates"

---
 .../core/{ => bootstrap3}/phone_register.html |  0
 .../core/bootstrap5/phone_register.html       | 22 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 rename corehq/apps/domain/templates/login_and_password/two_factor/core/{ => bootstrap3}/phone_register.html (100%)
 create mode 100644 corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/phone_register.html

diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/core/phone_register.html b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/phone_register.html
similarity index 100%
rename from corehq/apps/domain/templates/login_and_password/two_factor/core/phone_register.html
rename to corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/phone_register.html
diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/phone_register.html b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/phone_register.html
new file mode 100644
index 000000000000..4d4c592f8d8a
--- /dev/null
+++ b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/phone_register.html
@@ -0,0 +1,22 @@
+{# lightly modified version of two_factor/core/phone_register.html #}
+{% extends "hqwebapp/bootstrap5/base_section.html" %}
+{% load i18n %}
+{% load crispy_forms_tags %}
+
+{% block page_content %}
+  <h1>{% block title %}{% trans "Add Backup Phone" %}{% endblock %}</h1>
+
+  {% if wizard.steps.current == 'setup' %}
+    <p>{% blocktrans trimmed %}Your backup phone number will be used if your primary method of
+      registration is not available. Please enter a valid phone number.{% endblocktrans %}</p>
+  {% elif wizard.steps.current == 'validation' %}
+    <p>{% blocktrans trimmed %}We've sent a token to your phone number. Please
+      enter the token you've received.{% endblocktrans %}</p>
+  {% endif %}
+
+  <form action="" method="post" class="form-horizontal">{% csrf_token %}
+    {{ wizard.management_form }}
+    {% crispy wizard.form %}  {# todo B5: crispy #}
+  </form>
+
+{% endblock %}

From f2d2a6bc70f90579ce02b7a0a0d7b4b562234c45 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 21:37:09 +0000
Subject: [PATCH 080/159] "Bootstrap 5 Migration - initial auto-migration for
 login_and_password/two_factor/_wizard_forms.html, splitting templates"

---
 .../{ => bootstrap3}/_wizard_forms.html       |  0
 .../two_factor/bootstrap5/_wizard_forms.html  | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+)
 rename corehq/apps/domain/templates/login_and_password/two_factor/{ => bootstrap3}/_wizard_forms.html (100%)
 create mode 100644 corehq/apps/domain/templates/login_and_password/two_factor/bootstrap5/_wizard_forms.html

diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/_wizard_forms.html b/corehq/apps/domain/templates/login_and_password/two_factor/bootstrap3/_wizard_forms.html
similarity index 100%
rename from corehq/apps/domain/templates/login_and_password/two_factor/_wizard_forms.html
rename to corehq/apps/domain/templates/login_and_password/two_factor/bootstrap3/_wizard_forms.html
diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/bootstrap5/_wizard_forms.html b/corehq/apps/domain/templates/login_and_password/two_factor/bootstrap5/_wizard_forms.html
new file mode 100644
index 000000000000..31671a310ed9
--- /dev/null
+++ b/corehq/apps/domain/templates/login_and_password/two_factor/bootstrap5/_wizard_forms.html
@@ -0,0 +1,19 @@
+{% load i18n %}
+{{ wizard.management_form }}
+{% for field in wizard.form %}
+  <div class="form-group has-feedback{% if field.errors %} has-error{% endif %}">  {# todo B5: css-form-group, css-has-error #}
+    <label>{{ field.label }}</label>
+    <div>
+      {{ field }}
+      {% for error in field.errors %}
+        <span class="help-block">{{ error }}</span>
+      {% endfor %}
+      {% if field.name == "password" %}
+        <p class="help-block">
+          {% url "password_reset_email" as default_password_reset_link %}
+          <a href="{{ password_reset_url|default:default_password_reset_link }}">{% trans "Forgot your password?" %}</a>
+        </p>
+      {% endif %}
+    </div>
+  </div>
+{% endfor %}

From 92a0f07af840801ebd789b8c4c82abc5b25c1c72 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 16:43:42 -0500
Subject: [PATCH 081/159] Updated diff config for login_and_password directory

---
 .../hqwebapp/tests/data/bootstrap5_diff_config.json   | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json b/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json
index c8f941f89412..98b65b310a05 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json
@@ -685,6 +685,17 @@
       "compare_all_files": true
     }
   ],
+  "apps/domain/templates/login_and_password": [
+    {
+      "directories": [
+        "bootstrap3",
+        "bootstrap5"
+      ],
+      "file_type": "template",
+      "label": "login_and_password",
+      "compare_all_files": true
+    }
+  ],
   "apps/domain/templates/domain": [
     {
       "directories": [

From 31eb0200f662760f37b393a3821dc99ed527cfa2 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 16:44:11 -0500
Subject: [PATCH 082/159] Ran build_bootstrap5_diffs

---
 .../iframe_domain_login.html.diff.txt         |  9 ++++++++
 .../login_and_password/login.html.diff.txt    | 23 +++++++++++++++++++
 .../password_reset_confirm.html.diff.txt      | 22 ++++++++++++++++++
 .../password_reset_form.html.diff.txt         | 18 +++++++++++++++
 4 files changed, 72 insertions(+)
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/login.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/password_reset_confirm.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/password_reset_form.html.diff.txt

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/iframe_domain_login.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/iframe_domain_login.html.diff.txt
index 91b1224018f4..c314695bf657 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/iframe_domain_login.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/iframe_domain_login.html.diff.txt
@@ -9,3 +9,12 @@
  
  {% block background_content %}
    <div class="bg-container">
+@@ -48,7 +48,7 @@
+          id="user-login-form"
+          class="ko-template"
+          {% endif %}>
+-      {% include "login_and_password/partials/bootstrap3/login_full.html" %}
++      {% include "login_and_password/partials/bootstrap5/login_full.html" %}
+     </div>
+   {% endblock %}
+ {% endblock content %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/login.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/login.html.diff.txt
new file mode 100644
index 000000000000..2e86e0b0234c
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/login.html.diff.txt
@@ -0,0 +1,23 @@
+--- 
++++ 
+@@ -1,9 +1,9 @@
+-{% extends "hqwebapp/bootstrap3/base_page.html" %}
++{% extends "hqwebapp/bootstrap5/base_page.html" %}
+ {% load i18n %}
+ {% load hq_shared_tags %}
+ {% load compress %}
+ 
+-{% requirejs_main 'registration/js/login' %}
++{% requirejs_main_b5 'registration/js/login' %}
+ 
+ {% block title %}{% trans "Log In :: CommCare HQ" %}{% endblock title %}
+ 
+@@ -39,7 +39,7 @@
+          id="user-login-form"
+          class="ko-template"
+          {% endif %}>
+-      {% include "login_and_password/partials/bootstrap3/login_full.html" %}
++      {% include "login_and_password/partials/bootstrap5/login_full.html" %}
+     </div>
+   {% endblock %}
+ {% endblock content %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/password_reset_confirm.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/password_reset_confirm.html.diff.txt
new file mode 100644
index 000000000000..74ccd2cfd0bb
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/password_reset_confirm.html.diff.txt
@@ -0,0 +1,22 @@
+--- 
++++ 
+@@ -2,7 +2,7 @@
+ {% load hq_shared_tags %}
+ {% load i18n %}
+ 
+-{% requirejs_main 'registration/js/password_reset_confirm' %}
++{% requirejs_main_b5 'registration/js/password_reset_confirm' %}
+ 
+ {% block title %}{% trans "Password Reset Confirmation" %}{% endblock title %}
+ 
+@@ -20,8 +20,8 @@
+       {% endfor %}
+       <fieldset class="check-password">
+         {% for field in form.visible_fields %}
+-          <div class="form-group has-feedback{% if field.errors %} has-error{% endif %}">
+-            <label class="control-label" for="{{ field.id }}">{{ field.label }}</label>
++          <div class="form-group has-feedback{% if field.errors %} has-error{% endif %}">  {# todo B5: css-form-group, css-has-error #}
++            <label class="form-label" for="{{ field.id }}">{{ field.label }}</label>
+             <div>
+               {{ field }}
+               {% for error in field.errors %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/password_reset_form.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/password_reset_form.html.diff.txt
new file mode 100644
index 000000000000..bcfae3931aef
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/password_reset_form.html.diff.txt
@@ -0,0 +1,18 @@
+--- 
++++ 
+@@ -2,7 +2,7 @@
+ {% load hq_shared_tags %}
+ {% load i18n %}
+ 
+-{% requirejs_main 'registration/js/password_reset_form' %}
++{% requirejs_main_b5 'registration/js/password_reset_form' %}
+ 
+ {% block title %}{% trans "Password Reset" %}{% endblock title %}
+ 
+@@ -10,5 +10,5 @@
+   <h2 class="text-center">
+     {% trans "Reset Password" %}
+   </h2>
+-  {% include 'login_and_password/partials/bootstrap3/password_reset_form_only.html' %}
++  {% include 'login_and_password/partials/bootstrap5/password_reset_form_only.html' %}
+ {% endblock %}

From 44aa225aef28c8515c226042ec1673b196248afd Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 17:07:00 -0500
Subject: [PATCH 083/159] Updated references in two factor login form

---
 .../two_factor/core/bootstrap3/login_form.html                | 4 ++--
 .../two_factor/core/bootstrap5/login_form.html                | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/login_form.html b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/login_form.html
index 7fd85eb8a0f9..78e2b33e1545 100644
--- a/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/login_form.html
+++ b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap3/login_form.html
@@ -1,6 +1,6 @@
 {% load i18n two_factor_tags %}
 <form action="" method="post">{% csrf_token %}
-  {% include "two_factor/_wizard_forms.html" %}
+  {% include "two_factor/bootstrap3/_wizard_forms.html" %}
 
   {# hidden submit button to enable [enter] key #}
   <div style="display: none"><input type="submit" value=""/></div>
@@ -30,6 +30,6 @@
   {% endif %}
 
   <div class="form-bubble-actions">
-    {% include "two_factor/_wizard_actions.html" %}
+    {% include "two_factor/bootstrap3/_wizard_actions.html" %}
   </div>
 </form>
diff --git a/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/login_form.html b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/login_form.html
index c8051696cf2e..62b692085bcb 100644
--- a/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/login_form.html
+++ b/corehq/apps/domain/templates/login_and_password/two_factor/core/bootstrap5/login_form.html
@@ -1,6 +1,6 @@
 {% load i18n two_factor_tags %}
 <form action="" method="post">{% csrf_token %}
-  {% include "two_factor/_wizard_forms.html" %}
+  {% include "two_factor/bootstrap5/_wizard_forms.html" %}
 
   {# hidden submit button to enable [enter] key #}
   <div style="display: none"><input type="submit" value=""/></div>  {# todo B5: inline-style #}
@@ -30,6 +30,6 @@
   {% endif %}
 
   <div class="form-bubble-actions">
-    {% include "two_factor/_wizard_actions.html" %}
+    {% include "two_factor/bootstrap5/_wizard_actions.html" %}
   </div>
 </form>

From af45dcd5c01dabffd875c177df8982daf0c407d0 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 17:07:21 -0500
Subject: [PATCH 084/159] Updated diff config with login and password
 subdirectories

---
 .../tests/data/bootstrap5_diff_config.json    | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json b/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json
index 98b65b310a05..4e2e6e0d30e8 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diff_config.json
@@ -694,6 +694,42 @@
       "file_type": "template",
       "label": "login_and_password",
       "compare_all_files": true
+    },
+    {
+      "directories": [
+        "partials/bootstrap3",
+        "partials/bootstrap5"
+      ],
+      "file_type": "template",
+      "label": "login_and_password/partials",
+      "compare_all_files": true
+    },
+    {
+      "directories": [
+        "two_factor/bootstrap3",
+        "two_factor/bootstrap5"
+      ],
+      "file_type": "template",
+      "label": "login_and_password/two_factor",
+      "compare_all_files": true
+    },
+    {
+      "directories": [
+        "two_factor/core/bootstrap3",
+        "two_factor/core/bootstrap5"
+      ],
+      "file_type": "template",
+      "label": "login_and_password/two_factor/core",
+      "compare_all_files": true
+    },
+    {
+      "directories": [
+        "two_factor/profile/bootstrap3",
+        "two_factor/profile/bootstrap5"
+      ],
+      "file_type": "template",
+      "label": "login_and_password/two_factor/profile",
+      "compare_all_files": true
     }
   ],
   "apps/domain/templates/domain": [

From 0abfe92ea273108eae951c3bc4b8eb5e58a9c995 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 22:08:18 +0000
Subject: [PATCH 085/159] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../partials/login_full.html.diff.txt         | 19 +++++++
 .../password_reset_form_only.html.diff.txt    | 22 ++++++++
 .../two_factor/_wizard_actions.html.diff.txt  | 11 ++++
 .../two_factor/_wizard_forms.html.diff.txt    | 11 ++++
 .../core/backup_tokens.html.diff.txt          | 18 +++++++
 .../two_factor/core/login.html.diff.txt       |  9 ++++
 .../two_factor/core/login_form.html.diff.txt  | 40 ++++++++++++++
 .../core/otp_required.html.diff.txt           | 17 ++++++
 .../core/phone_register.html.diff.txt         | 18 +++++++
 .../two_factor/core/setup.html.diff.txt       | 17 ++++++
 .../core/setup_complete.html.diff.txt         | 28 ++++++++++
 .../two_factor/profile/disable.html.diff.txt  | 17 ++++++
 .../two_factor/profile/profile.html.diff.txt  | 52 +++++++++++++++++++
 13 files changed, 279 insertions(+)
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/partials/login_full.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/partials/password_reset_form_only.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/_wizard_actions.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/_wizard_forms.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/backup_tokens.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/login.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/login_form.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/otp_required.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/phone_register.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/setup.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/setup_complete.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/profile/disable.html.diff.txt
 create mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/profile/profile.html.diff.txt

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/partials/login_full.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/partials/login_full.html.diff.txt
new file mode 100644
index 000000000000..cb77f53c81cd
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/partials/login_full.html.diff.txt
@@ -0,0 +1,19 @@
+--- 
++++ 
+@@ -1,13 +1,13 @@
+ {% load i18n %}
+ <div class="container-fluid">
+   <div class="row">
+-    <div class="col-xs-12">
++    <div class="col-sm-12">
+       <div class="reg-form-container sign-in-container">
+         <div class="form-bubble form-bubble-lg">
+-          {% include "login_and_password/two_factor/core/bootstrap3/login.html" %}
++          {% include "login_and_password/two_factor/core/bootstrap5/login.html" %}
+         </div>
+         {% if not restrict_domain_creation %}
+-          <div class="well sign-up-bubble form-bubble-purple">
++          <div class="card sign-up-bubble form-bubble-purple">  {# todo B5: css-well #}
+             <h2>
+               {% blocktrans %}
+                 No account? Sign up today, it's free!
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/partials/password_reset_form_only.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/partials/password_reset_form_only.html.diff.txt
new file mode 100644
index 000000000000..d21b7a045a73
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/partials/password_reset_form_only.html.diff.txt
@@ -0,0 +1,22 @@
+--- 
++++ 
+@@ -10,8 +10,8 @@
+   {% endfor %}
+   <fieldset>
+     {% for field in form.visible_fields %}
+-      <div class="form-group has-feedback{% if field.errors %} has-error{% endif %}">
+-        <label class="control-label" for="{{ field.id }}">{{ field.label }}</label>
++      <div class="form-group has-feedback{% if field.errors %} has-error{% endif %}">  {# todo B5: css-form-group, css-has-error #}
++        <label class="form-label" for="{{ field.id }}">{{ field.label }}</label>
+         <div>
+           {{ field }}
+           {% for error in field.errors %}
+@@ -31,7 +31,7 @@
+   <div class="form-bubble-actions">
+     {% url "login" as default_login_url %}
+     <a href="{{ login_url|default:default_login_url }}"
+-       class="btn btn-lg btn-default">
++       class="btn btn-lg btn-outline-primary">
+       {% trans "Back" %}
+     </a>
+     <button type="submit" class="btn btn-lg btn-primary">
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/_wizard_actions.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/_wizard_actions.html.diff.txt
new file mode 100644
index 000000000000..4c0fc1c03cfa
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/_wizard_actions.html.diff.txt
@@ -0,0 +1,11 @@
+--- 
++++ 
+@@ -3,7 +3,7 @@
+ {% if wizard.steps.prev %}
+   <button name="wizard_goto_step" type="submit"
+           value="{{ wizard.steps.prev }}"
+-          class="btn btn-default btn-lg">{% trans "Back" %}</button>
++          class="btn btn-outline-primary btn-lg">{% trans "Back" %}</button>
+ {% endif %}
+ {% if wizard.steps.current == 'auth' %}
+   {% if enforce_sso_login %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/_wizard_forms.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/_wizard_forms.html.diff.txt
new file mode 100644
index 000000000000..25e2428c0783
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/_wizard_forms.html.diff.txt
@@ -0,0 +1,11 @@
+--- 
++++ 
+@@ -1,7 +1,7 @@
+ {% load i18n %}
+ {{ wizard.management_form }}
+ {% for field in wizard.form %}
+-  <div class="form-group has-feedback{% if field.errors %} has-error{% endif %}">
++  <div class="form-group has-feedback{% if field.errors %} has-error{% endif %}">  {# todo B5: css-form-group, css-has-error #}
+     <label>{{ field.label }}</label>
+     <div>
+       {{ field }}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/backup_tokens.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/backup_tokens.html.diff.txt
new file mode 100644
index 000000000000..445cb1ab1202
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/backup_tokens.html.diff.txt
@@ -0,0 +1,18 @@
+--- 
++++ 
+@@ -1,4 +1,4 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load i18n %}
+ 
+ {% block page_content %}
+@@ -25,7 +25,7 @@
+       <a href="{% url 'homepage'%}" class="btn btn-primary">{% trans "Begin Using CommCare Now" %}</a>
+     {% endif %}
+     <a href="{% url 'two_factor:profile'%}"
+-       class="pull-right btn btn-link">{% trans "Back to Profile" %}</a>
+-    <button class="btn btn-default" type="submit">{% trans "Generate Tokens" %}</button>
++       class="float-end btn btn-link">{% trans "Back to Profile" %}</a>
++    <button class="btn btn-outline-primary" type="submit">{% trans "Generate Tokens" %}</button>
+   </form>
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/login.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/login.html.diff.txt
new file mode 100644
index 000000000000..c3ed530b7243
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/login.html.diff.txt
@@ -0,0 +1,9 @@
+--- 
++++ 
+@@ -68,5 +68,5 @@
+       {{ global_error }}
+     </div>
+   {% endfor %}
+-  {% include "login_and_password/two_factor/core/bootstrap3/login_form.html" %}
++  {% include "login_and_password/two_factor/core/bootstrap5/login_form.html" %}
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/login_form.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/login_form.html.diff.txt
new file mode 100644
index 000000000000..5caab0a9e797
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/login_form.html.diff.txt
@@ -0,0 +1,40 @@
+--- 
++++ 
+@@ -1,9 +1,9 @@
+ {% load i18n two_factor_tags %}
+ <form action="" method="post">{% csrf_token %}
+-  {% include "two_factor/bootstrap3/_wizard_forms.html" %}
++  {% include "two_factor/bootstrap5/_wizard_forms.html" %}
+ 
+   {# hidden submit button to enable [enter] key #}
+-  <div style="display: none"><input type="submit" value=""/></div>
++  <div style="display: none"><input type="submit" value=""/></div>  {# todo B5: inline-style #}
+ 
+   {% if device.name == "default" and other_devices %}
+     <p>{% trans "Or, alternatively, use one of your backup phones:" %}</p>
+@@ -11,7 +11,7 @@
+       <p>
+         <button name="challenge_device"
+                 value="{{ other.persistent_id }}"
+-                class="btn btn-default" type="submit">
++                class="btn btn-outline-primary" type="submit">
+           {{ other|as_action }}
+         </button>
+       </p>
+@@ -22,7 +22,7 @@
+     <p>
+       <button name="wizard_goto_step"
+               type="submit" value="backup"
+-              class="btn btn-default">
++              class="btn btn-outline-primary">
+         {% trans "Use Backup Token" %}
+       </button>
+     </p>
+@@ -30,6 +30,6 @@
+   {% endif %}
+ 
+   <div class="form-bubble-actions">
+-    {% include "two_factor/bootstrap3/_wizard_actions.html" %}
++    {% include "two_factor/bootstrap5/_wizard_actions.html" %}
+   </div>
+ </form>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/otp_required.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/otp_required.html.diff.txt
new file mode 100644
index 000000000000..c59a01013ace
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/otp_required.html.diff.txt
@@ -0,0 +1,17 @@
+--- 
++++ 
+@@ -1,4 +1,4 @@
+-{% extends "hqwebapp/bootstrap3/base_page.html" %}
++{% extends "hqwebapp/bootstrap5/base_page.html" %}
+ {% load i18n %}
+ 
+ {% block page_content %}
+@@ -20,7 +20,7 @@
+ 
+   <p>
+     <a href="{% url "domain_select_redirect" %}"
+-       class="pull-right btn btn-link">{% trans "Go back" %}</a>
++       class="float-end btn btn-link">{% trans "Go back" %}</a>
+     <a href="{% url 'two_factor:setup' %}" class="btn btn-primary">
+       {% trans "Enable Two-Factor Authentication" %}</a>
+   </p>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/phone_register.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/phone_register.html.diff.txt
new file mode 100644
index 000000000000..3b471a856abe
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/phone_register.html.diff.txt
@@ -0,0 +1,18 @@
+--- 
++++ 
+@@ -1,5 +1,5 @@
+ {# lightly modified version of two_factor/core/phone_register.html #}
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load i18n %}
+ {% load crispy_forms_tags %}
+ 
+@@ -16,7 +16,7 @@
+ 
+   <form action="" method="post" class="form-horizontal">{% csrf_token %}
+     {{ wizard.management_form }}
+-    {% crispy wizard.form %}
++    {% crispy wizard.form %}  {# todo B5: crispy #}
+   </form>
+ 
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/setup.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/setup.html.diff.txt
new file mode 100644
index 000000000000..b9f9089ff46c
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/setup.html.diff.txt
@@ -0,0 +1,17 @@
+--- 
++++ 
+@@ -1,5 +1,5 @@
+ {# lightly modified version of two_factor/core/setup.html #}
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load i18n %}
+ {% load crispy_forms_tags %}
+ 
+@@ -52,6 +52,6 @@
+ 
+   <form action="" method="post" class="form-horizontal" >{% csrf_token %}
+     {{ wizard.management_form }}
+-    {% crispy wizard.form %}
++    {% crispy wizard.form %}  {# todo B5: crispy #}
+   </form>
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/setup_complete.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/setup_complete.html.diff.txt
new file mode 100644
index 000000000000..77f810d7b92f
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/core/setup_complete.html.diff.txt
@@ -0,0 +1,28 @@
+--- 
++++ 
+@@ -1,4 +1,4 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load i18n %}
+ 
+ {% block page_content %}
+@@ -12,16 +12,16 @@
+         <a href="{% url 'homepage'%}" class="btn btn-primary">{% trans "Begin Using CommCare Now" %}</a>
+       {% endif %}
+       <p><a href="{% url 'two_factor:profile' %}"
+-            class="btn btn-block btn-default">{% trans "Back to Profile" %}</a></p>
++            class="btn btn-block btn-outline-primary">{% trans "Back to Profile" %}</a></p>
+     {% else %}
+       <p>{% blocktrans %}To enable account recovery, generate backup tokens.{% endblocktrans %}</p>
+       {% if link_to_webapps %}
+         <a href="{% url 'homepage'%}" class="btn btn-primary">{% trans "Begin Using CommCare Now" %}</a>
+       {% endif %}
+       <p></p><a href="{% url 'two_factor:profile' %}"
+-         class="pull-right btn btn-link">{% trans "Back to Profile" %}</a></p>
++         class="float-end btn btn-link">{% trans "Back to Profile" %}</a></p>
+       <p><a href="{% url 'two_factor:backup_tokens' %}"
+-            class="btn btn-default">{% trans "Generate Backup Tokens" %}</a></p>
++            class="btn btn-outline-primary">{% trans "Generate Backup Tokens" %}</a></p>
+     {% endif %}
+ 
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/profile/disable.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/profile/disable.html.diff.txt
new file mode 100644
index 000000000000..e0a71659056f
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/profile/disable.html.diff.txt
@@ -0,0 +1,17 @@
+--- 
++++ 
+@@ -1,4 +1,4 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load i18n %}
+ 
+ {% block page_content %}
+@@ -8,7 +8,7 @@
+   <form method="post">
+     {% csrf_token %}
+     <table>{{ form }}</table>
+-    <button class="btn btn-danger"
++    <button class="btn btn-outline-danger"
+             type="submit">{% trans "Remove" %}</button>
+   </form>
+ {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/profile/profile.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/profile/profile.html.diff.txt
new file mode 100644
index 000000000000..c3eeb01fef30
--- /dev/null
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/two_factor/profile/profile.html.diff.txt
@@ -0,0 +1,52 @@
+--- 
++++ 
+@@ -1,4 +1,4 @@
+-{% extends "hqwebapp/bootstrap3/base_section.html" %}
++{% extends "hqwebapp/bootstrap5/base_section.html" %}
+ {% load i18n phonenumber %}
+ 
+ {% block page_content %}
+@@ -29,14 +29,14 @@
+               <form method="post" action="{% url 'two_factor:phone_delete' phone.id %}"
+                     onsubmit="return confirm('Are you sure?')">
+                 {% csrf_token %}
+-                <button class="btn btn-xs btn-danger"
++                <button class="btn btn-sm btn-outline-danger"
+                         type="submit">{% trans "Unregister" %}</button>
+               </form>
+             </li>
+           {% endfor %}
+         </ul>
+         <p><a href="{% url 'two_factor:phone_create' %}"
+-              class="btn btn-default">{% trans "Add Phone Number" %}</a></p>
++              class="btn btn-outline-primary">{% trans "Add Phone Number" %}</a></p>
+         <br/>
+       </fieldset>
+       {% endif %}
+@@ -53,7 +53,7 @@
+           {% endblocktrans %}
+         </p>
+         <p><a href="{% url 'two_factor:backup_tokens' %}"
+-              class="btn btn-default">{% trans "Show Codes" %}</a></p>
++              class="btn btn-outline-primary">{% trans "Show Codes" %}</a></p>
+         <br/>
+       </fieldset>
+ 
+@@ -61,7 +61,7 @@
+         <legend>{% trans "Remove Two-Factor Authentication" %}</legend>
+         <p>{% blocktrans %}We <strong>strongly discourage</strong> this, but if absolutely necessary you can
+           remove two-factor authentication from your account.{% endblocktrans %}</p>
+-        <p><a class="btn btn-danger" href="{% url 'two_factor:disable' %}">
++        <p><a class="btn btn-outline-danger" href="{% url 'two_factor:disable' %}">
+           {% trans "Remove Two-Factor Authentication" %}</a></p>
+         <br/>
+       </fieldset>
+@@ -72,7 +72,7 @@
+           If you need to do this, please make sure you complete the entire process once you begin, otherwise your account will
+           not be protected by two-factor authentication.
+         {% endblocktrans %}</p>
+-        <p><a class="btn btn-default" href="{% url 'reset' %}">
++        <p><a class="btn btn-outline-primary" href="{% url 'reset' %}">
+           {% trans "Reset Two-Factor Authentication" %}</a></p>
+         <br/>
+       </fieldset>

From 5386b9e7e049a1b264eeccbad723093be1c03068 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 11 Nov 2024 17:28:52 -0500
Subject: [PATCH 086/159] Updated settings.LOGIN_TEMPLATE

---
 settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings.py b/settings.py
index f82ee2a63412..503f4b4160d9 100755
--- a/settings.py
+++ b/settings.py
@@ -454,7 +454,7 @@
 # restyle some templates
 BASE_TEMPLATE = "hqwebapp/bootstrap3/base_navigation.html"
 BASE_ASYNC_TEMPLATE = "reports/async/basic.html"
-LOGIN_TEMPLATE = "login_and_password/login.html"
+LOGIN_TEMPLATE = "login_and_password/bootstrap3/login.html"
 LOGGEDOUT_TEMPLATE = LOGIN_TEMPLATE
 
 CSRF_FAILURE_VIEW = 'corehq.apps.hqwebapp.views.csrf_failure'

From b80f8ab5ac44897d5c9c764329f788b9f3087959 Mon Sep 17 00:00:00 2001
From: nospame <mapson.evan@gmail.com>
Date: Tue, 12 Nov 2024 12:10:06 -0800
Subject: [PATCH 087/159] Filter out Paused subscriptions after ensuring full
 coverage

Fixes a bug where unnecessary extra subscriptions and charges could be created. Because Paused plans were not returned by _get_subscriptions, _ensure_full_coverage would incorrectly see a Paused plan subscription as a gap in coverage, retroactively applying a Community subscription for the time period.
---
 corehq/apps/accounting/invoicing.py                  | 10 +++++-----
 corehq/apps/accounting/tests/test_invoice_factory.py |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/corehq/apps/accounting/invoicing.py b/corehq/apps/accounting/invoicing.py
index d45a50beed8f..ca254cf0f624 100644
--- a/corehq/apps/accounting/invoicing.py
+++ b/corehq/apps/accounting/invoicing.py
@@ -83,9 +83,11 @@ def __init__(self, date_start, date_end, domain, recipients=None):
             raise InvoiceError("Domain '%s' is not a valid domain on HQ!" % domain)
 
     def create_invoices(self):
-        subscriptions = self._get_subscriptions()
-        self._ensure_full_coverage(subscriptions)
-        for subscription in subscriptions:
+        all_subscriptions = self._get_subscriptions()
+        self._ensure_full_coverage(all_subscriptions)
+        chargeable_subscriptions = [sub for sub in all_subscriptions
+                                    if sub.plan_version.plan.edition != SoftwarePlanEdition.PAUSED]
+        for subscription in chargeable_subscriptions:
             try:
                 if subscription.account.is_customer_billing_account:
                     log_accounting_info("Skipping invoice for subscription: %s, because it is part of a Customer "
@@ -106,8 +108,6 @@ def _get_subscriptions(self):
             ),
             subscriber=self.subscriber,
             date_start__lte=self.date_end,
-        ).exclude(
-            plan_version__plan__edition=SoftwarePlanEdition.PAUSED,
         ).order_by('date_start', 'date_end').all()
         return list(subscriptions)
 
diff --git a/corehq/apps/accounting/tests/test_invoice_factory.py b/corehq/apps/accounting/tests/test_invoice_factory.py
index 4bbc0fc1c177..619372bf0af6 100644
--- a/corehq/apps/accounting/tests/test_invoice_factory.py
+++ b/corehq/apps/accounting/tests/test_invoice_factory.py
@@ -1,4 +1,5 @@
 import datetime
+from unittest.mock import patch
 
 from corehq.apps.accounting.invoicing import (
     CustomerAccountInvoiceFactory,
@@ -136,9 +137,10 @@ def test_paused_plan_generates_no_invoice(self):
             self.account, self.domain.name, paused_plan,
             date_start=self.invoice_start,
             date_end=self.invoice_end + datetime.timedelta(days=1),
-
         )
-        self.assertListEqual(self.invoice_factory._get_subscriptions(), [])
+        with patch.object(self.invoice_factory, '_create_invoice_for_subscription') as mock_create_invoice:
+            self.invoice_factory.create_invoices()
+            mock_create_invoice.assert_not_called()
 
 
 class TestInvoicingMethods(BaseAccountingTest):

From 1d3d44c00bebafcf4a1bbbe75c4d26e99b16febe Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Fri, 15 Nov 2024 08:52:25 -0500
Subject: [PATCH 088/159] Add uv to docker test container

The new image is backward-compatible with pip-tools installation, which means it will work with versions of run.sh that use pip-sync rather than uv pip sync.

Image size reducing changes:
- python:3.9 (1.02 GB) -> ghcr.io/astral-sh/uv:0.5.2-python3.9-bookworm-slim (163 MB)
  python:3.9 is based on bookworm, the major size difference came from the -slim base image.
- install non-dev packages (libxml2, libxmlsec1, jre instead of jdk)
- use google-chrome-stable instead of google-chrome-unstable + fonts
- do all apt-get installs in one layer, removing apt cache at the end
- use uv to create virtualenv and install packages, faster and smaller

Overall image size reduced from 3.05GB to 2.11GB
---
 Dockerfile        | 55 ++++++++++++++++++++---------------------------
 docker/Dockerfile |  3 ++-
 docker/run.sh     |  2 +-
 3 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a1ed3491897c..44a0f5d28cce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,54 +3,45 @@
 # This Dockerfile is built as the `dimagi/commcarehq_base` image, which
 # is used for running tests.
 
-FROM python:3.9
+FROM ghcr.io/astral-sh/uv:0.5.2-python3.9-bookworm-slim
 MAINTAINER Dimagi <devops@dimagi.com>
 
 ENV PYTHONUNBUFFERED=1 \
     PYTHONUSERBASE=/vendor \
     PATH=/vendor/bin:$PATH \
-    NODE_VERSION=20.11.1
+    NODE_VERSION=20.11.1 \
+    UV_COMPILE_BYTECODE=1 \
+    UV_LINK_MODE=copy
 
 RUN mkdir /vendor
 
-RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \
-  && tar -xzf "node-v$NODE_VERSION-linux-x64.tar.gz" -C /usr/local --strip-components=1 \
-  && rm "node-v$NODE_VERSION-linux-x64.tar.gz"
-
 RUN apt-get update \
-  && apt-get install -y --no-install-recommends \
-     default-jdk \
-     wget \
-     libxml2-dev \
-     libxmlsec1-dev \
-     libxmlsec1-openssl \
-     gettext
-
-# Install latest chrome dev package and fonts to support major
-# charsets (Chinese, Japanese, Arabic, Hebrew, Thai and a few others)
-# Note: this installs the necessary libs to make the bundled version
-# of Chromium that Puppeteer installs, work.
-RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
+  && apt-get install -y --no-install-recommends curl gnupg \
+  && curl https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
   && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
   && apt-get update \
   && apt-get install -y --no-install-recommends \
-     google-chrome-unstable \
-     fonts-ipafont-gothic \
-     fonts-wqy-zenhei \
-     fonts-thai-tlwg \
-     fonts-kacst \
-     fonts-freefont-ttf
+     bzip2 \
+     default-jre \
+     gettext \
+     git \
+     google-chrome-stable \
+     libmagic1 \
+     libpq5 \
+     libxml2 \
+     libxmlsec1 \
+     libxmlsec1-openssl \
+  && rm -rf /var/lib/apt/lists/* /src/*.deb
 
-# Deletes all package sources, so don't apt-get install anything after this:
-RUN rm -rf /var/lib/apt/lists/* /src/*.deb
+RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \
+  && tar -xzf "node-v$NODE_VERSION-linux-x64.tar.gz" -C /usr/local --strip-components=1 \
+  && rm "node-v$NODE_VERSION-linux-x64.tar.gz"
 
 COPY requirements/test-requirements.txt package.json /vendor/
 
-# prefer https for git checkouts made by pip
-RUN git config --global url."https://".insteadOf git:// \
- && pip install --upgrade pip \
- && pip install -r /vendor/test-requirements.txt --user --upgrade \
- && rm -rf /root/.cache/pip
+RUN --mount=type=cache,target=/root/.cache/uv \
+  uv venv --allow-existing /vendor \
+  && uv pip install --prefix=/vendor -r /vendor/test-requirements.txt
 
 # this keeps the image size down, make sure to set in mocha-headless-chrome options
 #   executablePath: 'google-chrome-unstable'
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 357d6b46a500..8eaf44ab0031 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,5 @@
-FROM dimagi/commcarehq_base:latest
+# DO NOT MERGE. TODO: configure automated build on hub.docker.com or revert to commcarehq_base
+FROM dimagi/commcarehq-py39-uv:latest
 
 VOLUME /mnt/commcare-hq-ro /mnt/lib
 RUN ln -s /mnt/commcare-hq-ro/docker/run.sh /mnt/run.sh && \
diff --git a/docker/run.sh b/docker/run.sh
index e57a2cb82e56..c95985d054f2 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -36,7 +36,7 @@ function setup {
         install -dm0755 -o cchq -g cchq ./artifacts
     fi
 
-    pip-sync --user requirements/test-requirements.txt
+    uv pip sync requirements/test-requirements.txt
     pip check  # make sure there are no incompatibilities in test-requirements.txt
     python_preheat  # preheat the python libs
 

From 86b55f4fdd63e9d6d3638bbda243e9673b94fec4 Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Fri, 15 Nov 2024 10:38:21 -0500
Subject: [PATCH 089/159] Fix chrome executable path

---
 Dockerfile   | 2 +-
 Gruntfile.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 44a0f5d28cce..5acc98808593 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,7 +44,7 @@ RUN --mount=type=cache,target=/root/.cache/uv \
   && uv pip install --prefix=/vendor -r /vendor/test-requirements.txt
 
 # this keeps the image size down, make sure to set in mocha-headless-chrome options
-#   executablePath: 'google-chrome-unstable'
+#   executablePath: 'google-chrome-stable'
 ENV PUPPETEER_SKIP_DOWNLOAD true
 
 RUN npm -g install \
diff --git a/Gruntfile.js b/Gruntfile.js
index 0b88f4d1bf16..1872a8f79629 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -70,9 +70,9 @@ module.exports = function (grunt) {
                 reporter: reporter,
             };
 
-        // For running in docker/travis
+        // For running in docker
         if (process.env.PUPPETEER_SKIP_DOWNLOAD) {
-            runnerOptions.executablePath = 'google-chrome-unstable';
+            runnerOptions.executablePath = 'google-chrome-stable';
         }
 
         grunt.log.writeln("\n");

From 83fe22b89027e23b063b0560cd62fc6017cf5551 Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Fri, 15 Nov 2024 11:29:31 -0500
Subject: [PATCH 090/159] Fix test-make-requirements.sh

Revert to libpq-dev could possibly be avoided by switching our psycopg2 requirement to use a binary package rather than one that compiles from source. Alternately, using uv to compile requirements could also do it, although is likely a bigger lift.
---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 5acc98808593..fcd175f697cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,10 +27,11 @@ RUN apt-get update \
      git \
      google-chrome-stable \
      libmagic1 \
-     libpq5 \
+     libpq-dev \
      libxml2 \
      libxmlsec1 \
      libxmlsec1-openssl \
+     make \
   && rm -rf /var/lib/apt/lists/* /src/*.deb
 
 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \

From 4799d5279c51018dc9d47c2da938d409182f8141 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 18 Nov 2024 17:17:56 -0500
Subject: [PATCH 091/159] Migrated login and password pages to webpack

---
 .../domain/templates/login_and_password/bootstrap3/login.html   | 2 +-
 .../login_and_password/bootstrap3/password_reset_confirm.html   | 2 +-
 .../login_and_password/bootstrap3/password_reset_form.html      | 2 +-
 .../domain/templates/login_and_password/bootstrap5/login.html   | 2 +-
 .../login_and_password/bootstrap5/password_reset_confirm.html   | 2 +-
 .../login_and_password/bootstrap5/password_reset_form.html      | 2 +-
 .../templates/hqwebapp/bootstrap3/iframe_domain_login.html      | 2 +-
 .../templates/hqwebapp/bootstrap5/iframe_domain_login.html      | 2 +-
 corehq/apps/registration/static/registration/js/login.js        | 1 +
 .../static/registration/js/password_reset_confirm.js            | 1 +
 .../registration/static/registration/js/password_reset_form.js  | 1 +
 11 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/corehq/apps/domain/templates/login_and_password/bootstrap3/login.html b/corehq/apps/domain/templates/login_and_password/bootstrap3/login.html
index b6f0fcd3294f..28c2f7c5e8d1 100644
--- a/corehq/apps/domain/templates/login_and_password/bootstrap3/login.html
+++ b/corehq/apps/domain/templates/login_and_password/bootstrap3/login.html
@@ -3,7 +3,7 @@
 {% load hq_shared_tags %}
 {% load compress %}
 
-{% requirejs_main 'registration/js/login' %}
+{% js_entry_b3 'registration/js/login' %}
 
 {% block title %}{% trans "Log In :: CommCare HQ" %}{% endblock title %}
 
diff --git a/corehq/apps/domain/templates/login_and_password/bootstrap3/password_reset_confirm.html b/corehq/apps/domain/templates/login_and_password/bootstrap3/password_reset_confirm.html
index 7fe6e314ab08..c1afabfdf56b 100644
--- a/corehq/apps/domain/templates/login_and_password/bootstrap3/password_reset_confirm.html
+++ b/corehq/apps/domain/templates/login_and_password/bootstrap3/password_reset_confirm.html
@@ -2,7 +2,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main 'registration/js/password_reset_confirm' %}
+{% js_entry_b3 'registration/js/password_reset_confirm' %}
 
 {% block title %}{% trans "Password Reset Confirmation" %}{% endblock title %}
 
diff --git a/corehq/apps/domain/templates/login_and_password/bootstrap3/password_reset_form.html b/corehq/apps/domain/templates/login_and_password/bootstrap3/password_reset_form.html
index eb9eab0e2911..8c9c7ef69bf1 100644
--- a/corehq/apps/domain/templates/login_and_password/bootstrap3/password_reset_form.html
+++ b/corehq/apps/domain/templates/login_and_password/bootstrap3/password_reset_form.html
@@ -2,7 +2,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main 'registration/js/password_reset_form' %}
+{% js_entry_b3 'registration/js/password_reset_form' %}
 
 {% block title %}{% trans "Password Reset" %}{% endblock title %}
 
diff --git a/corehq/apps/domain/templates/login_and_password/bootstrap5/login.html b/corehq/apps/domain/templates/login_and_password/bootstrap5/login.html
index ea73e82f1d63..a23ee5c55c5f 100644
--- a/corehq/apps/domain/templates/login_and_password/bootstrap5/login.html
+++ b/corehq/apps/domain/templates/login_and_password/bootstrap5/login.html
@@ -3,7 +3,7 @@
 {% load hq_shared_tags %}
 {% load compress %}
 
-{% requirejs_main_b5 'registration/js/login' %}
+{% js_entry 'registration/js/login' %}
 
 {% block title %}{% trans "Log In :: CommCare HQ" %}{% endblock title %}
 
diff --git a/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_confirm.html b/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_confirm.html
index db1b9fa6b58a..007a9e9e2dc2 100644
--- a/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_confirm.html
+++ b/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_confirm.html
@@ -2,7 +2,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main_b5 'registration/js/password_reset_confirm' %}
+{% js_entry 'registration/js/password_reset_confirm' %}
 
 {% block title %}{% trans "Password Reset Confirmation" %}{% endblock title %}
 
diff --git a/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_form.html b/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_form.html
index 78680b5369a9..c0c88badf5e9 100644
--- a/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_form.html
+++ b/corehq/apps/domain/templates/login_and_password/bootstrap5/password_reset_form.html
@@ -2,7 +2,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main_b5 'registration/js/password_reset_form' %}
+{% js_entry 'registration/js/password_reset_form' %}
 
 {% block title %}{% trans "Password Reset" %}{% endblock title %}
 
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap3/iframe_domain_login.html b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap3/iframe_domain_login.html
index 3091a16e5921..f1005e28ca0a 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap3/iframe_domain_login.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap3/iframe_domain_login.html
@@ -5,7 +5,7 @@
 
 {% block title %}{% trans "Your session has expired" %}{% endblock %}
 
-{% requirejs_main 'registration/js/login' %}
+{% js_entry_b3 'registration/js/login' %}
 
 {% block background_content %}
   <div class="bg-container">
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/iframe_domain_login.html b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/iframe_domain_login.html
index ccc018bcbd11..88b041856714 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/iframe_domain_login.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/bootstrap5/iframe_domain_login.html
@@ -5,7 +5,7 @@
 
 {% block title %}{% trans "Your session has expired" %}{% endblock %}
 
-{% requirejs_main_b5 'registration/js/login' %}
+{% js_entry 'registration/js/login' %}
 
 {% block background_content %}
   <div class="bg-container">
diff --git a/corehq/apps/registration/static/registration/js/login.js b/corehq/apps/registration/static/registration/js/login.js
index 8df7d96a24cd..46c941f61c88 100644
--- a/corehq/apps/registration/static/registration/js/login.js
+++ b/corehq/apps/registration/static/registration/js/login.js
@@ -5,6 +5,7 @@ hqDefine('registration/js/login', [
     'registration/js/user_login_form',
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/captcha', // shows captcha
+    'commcarehq',
 ], function (
     $,
     blazy,
diff --git a/corehq/apps/registration/static/registration/js/password_reset_confirm.js b/corehq/apps/registration/static/registration/js/password_reset_confirm.js
index df4f9e134fb9..a776e7da65d7 100644
--- a/corehq/apps/registration/static/registration/js/password_reset_confirm.js
+++ b/corehq/apps/registration/static/registration/js/password_reset_confirm.js
@@ -1,4 +1,5 @@
 hqDefine('registration/js/password_reset_confirm', [
     'registration/js/login', // contains password obfuscation
     'registration/js/bootstrap3/password',
+    'commcarehq',
 ], function () {});
diff --git a/corehq/apps/registration/static/registration/js/password_reset_form.js b/corehq/apps/registration/static/registration/js/password_reset_form.js
index 8cad789c6041..ae0444f0cc79 100644
--- a/corehq/apps/registration/static/registration/js/password_reset_form.js
+++ b/corehq/apps/registration/static/registration/js/password_reset_form.js
@@ -1,4 +1,5 @@
 hqDefine('registration/js/password_reset_form', [
     'registration/js/login', // contains password obfuscation
     'hqwebapp/js/captcha', // shows captcha
+    'commcarehq',
 ], function () {});

From b657e35f669ad88371921c41b9b83408de0c9077 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 18 Nov 2024 22:18:09 +0000
Subject: [PATCH 092/159] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../hqwebapp/iframe_domain_login.html.diff.txt                | 4 ++--
 .../bootstrap5_diffs/login_and_password/login.html.diff.txt   | 4 ++--
 .../login_and_password/password_reset_confirm.html.diff.txt   | 4 ++--
 .../login_and_password/password_reset_form.html.diff.txt      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/iframe_domain_login.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/iframe_domain_login.html.diff.txt
index c314695bf657..0fc43b2be5a8 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/iframe_domain_login.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/hqwebapp/iframe_domain_login.html.diff.txt
@@ -4,8 +4,8 @@
  
  {% block title %}{% trans "Your session has expired" %}{% endblock %}
  
--{% requirejs_main 'registration/js/login' %}
-+{% requirejs_main_b5 'registration/js/login' %}
+-{% js_entry_b3 'registration/js/login' %}
++{% js_entry 'registration/js/login' %}
  
  {% block background_content %}
    <div class="bg-container">
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/login.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/login.html.diff.txt
index 2e86e0b0234c..6ee827252498 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/login.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/login.html.diff.txt
@@ -7,8 +7,8 @@
  {% load hq_shared_tags %}
  {% load compress %}
  
--{% requirejs_main 'registration/js/login' %}
-+{% requirejs_main_b5 'registration/js/login' %}
+-{% js_entry_b3 'registration/js/login' %}
++{% js_entry 'registration/js/login' %}
  
  {% block title %}{% trans "Log In :: CommCare HQ" %}{% endblock title %}
  
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/password_reset_confirm.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/password_reset_confirm.html.diff.txt
index 74ccd2cfd0bb..9d77e6030998 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/password_reset_confirm.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/password_reset_confirm.html.diff.txt
@@ -4,8 +4,8 @@
  {% load hq_shared_tags %}
  {% load i18n %}
  
--{% requirejs_main 'registration/js/password_reset_confirm' %}
-+{% requirejs_main_b5 'registration/js/password_reset_confirm' %}
+-{% js_entry_b3 'registration/js/password_reset_confirm' %}
++{% js_entry 'registration/js/password_reset_confirm' %}
  
  {% block title %}{% trans "Password Reset Confirmation" %}{% endblock title %}
  
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/password_reset_form.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/password_reset_form.html.diff.txt
index bcfae3931aef..c62d5baae4d7 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/password_reset_form.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/login_and_password/password_reset_form.html.diff.txt
@@ -4,8 +4,8 @@
  {% load hq_shared_tags %}
  {% load i18n %}
  
--{% requirejs_main 'registration/js/password_reset_form' %}
-+{% requirejs_main_b5 'registration/js/password_reset_form' %}
+-{% js_entry_b3 'registration/js/password_reset_form' %}
++{% js_entry 'registration/js/password_reset_form' %}
  
  {% block title %}{% trans "Password Reset" %}{% endblock title %}
  

From 30999d3533e0ee9f0642d4d605df3dfe656d4770 Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Mon, 18 Nov 2024 16:14:06 -0500
Subject: [PATCH 093/159] Pre-uv Docker image compatibility

google-chrome-[un]stable scenarios:
uv Dockerfile not merged, all PRs ref -unstable -> pass (current state)

uv Dockerfile merged
  master merged into other PR (gruntfile refs -stable)
  other PR created (gruntfile refs -stable)
    uv image not yet published -> fail: -stable does not exist
      addressed by creating symlink in run.sh
    uv image published -> pass

  tests run on other PR (gruntfile refs -unstable)
    uv image not yet published -> pass
    uv image published -> fail: -unstable does not exist
      addressed by creating symlink in Dockerfile
---
 Dockerfile        | 7 +++++++
 docker/Dockerfile | 3 +--
 docker/run.sh     | 9 ++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fcd175f697cd..1c4b03f0ff67 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -59,3 +59,10 @@ RUN npm -g install \
  && cd /vendor \
  && npm shrinkwrap \
  && yarn global add phantomjs-prebuilt
+
+# For backward compatibility with commcarehq_base image containing
+# google-chrome-unstable. Can be removed after all test jobs with Gruntfile.js
+# referencing google-chrome-unstable have completed (at least a few weeks or
+# months after the PR in which this was introduced is merged). Old PRs can be
+# updated to use google-chrome-stable by merging master into them.
+RUN ln -s /usr/bin/google-chrome-stable /usr/bin/google-chrome-unstable
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8eaf44ab0031..357d6b46a500 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,5 +1,4 @@
-# DO NOT MERGE. TODO: configure automated build on hub.docker.com or revert to commcarehq_base
-FROM dimagi/commcarehq-py39-uv:latest
+FROM dimagi/commcarehq_base:latest
 
 VOLUME /mnt/commcare-hq-ro /mnt/lib
 RUN ln -s /mnt/commcare-hq-ro/docker/run.sh /mnt/run.sh && \
diff --git a/docker/run.sh b/docker/run.sh
index c95985d054f2..05dd3645427f 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -36,7 +36,14 @@ function setup {
         install -dm0755 -o cchq -g cchq ./artifacts
     fi
 
-    uv pip sync requirements/test-requirements.txt
+    # uv check, pip-sync, and symlink can be removed after the commcarehq_base
+    # Docker image containing uv has been published for use by Github Actions.
+    if which uv &> /dev/null; then
+        uv pip sync requirements/test-requirements.txt
+    else
+        pip-sync --user requirements/test-requirements.txt
+        ln -s /usr/bin/google-chrome-unstable /usr/bin/google-chrome-stable
+    fi
     pip check  # make sure there are no incompatibilities in test-requirements.txt
     python_preheat  # preheat the python libs
 

From 889c625b8fd96322c99cdbcfe262d7410b7cd025 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 20 Nov 2024 08:57:22 -0500
Subject: [PATCH 094/159] Switched B5 pages that have been migrated to webpack
 to use js_entry

---
 .../domain/templates/domain/admin/bootstrap5/case_search.html  | 2 +-
 .../domain/templates/domain/admin/bootstrap5/info_basic.html   | 2 +-
 .../templates/domain/admin/bootstrap5/manage_alerts.html       | 2 +-
 .../templates/domain/admin/bootstrap5/my_project_settings.html | 2 +-
 .../apps/domain/templates/domain/bootstrap5/confirm_plan.html  | 3 ++-
 .../templates/domain/bootstrap5/internal_calculations.html     | 2 +-
 .../domain/bootstrap5/manage_releases_by_app_profile.html      | 2 +-
 .../domain/bootstrap5/manage_releases_by_location.html         | 2 +-
 corehq/apps/domain/templates/domain/bootstrap5/select.html     | 2 +-
 .../apps/domain/templates/domain/bootstrap5/select_plan.html   | 2 +-
 .../domain/templates/domain/pro_bono/bootstrap5/domain.html    | 2 +-
 .../domain/templates/domain/pro_bono/bootstrap5/static.html    | 2 +-
 12 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html
index 10a0f5bb9f7b..3d4cf1376ffc 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/case_search.html
@@ -2,7 +2,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main_b5 'domain/js/bootstrap5/case_search_main' %}
+{% js_entry 'domain/js/bootstrap5/case_search_main' %}
 
 {% block page_content %}
   {% include 'domain/admin/partials/bootstrap5/case_search_templates.html' %}
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/info_basic.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/info_basic.html
index 876641f83e85..31f5afcca7ff 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap5/info_basic.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/info_basic.html
@@ -3,7 +3,7 @@
 {% load hq_shared_tags %}
 
 
-{% requirejs_main_b5 'domain/js/bootstrap5/info_basic' %}
+{% js_entry 'domain/js/bootstrap5/info_basic' %}
 
 {% block stylesheets %}{{ block.super }}
    <link rel="stylesheet" href="{% static '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.css' %}" type="text/css" />
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/manage_alerts.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/manage_alerts.html
index b7428d991fcb..762df62d092b 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap5/manage_alerts.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/manage_alerts.html
@@ -3,7 +3,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main_b5 "domain/js/manage_alerts" %}
+{% js_entry "domain/js/manage_alerts" %}
 
 {% block page_content %}
     {% initial_page_data 'alerts' alerts %}
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/my_project_settings.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/my_project_settings.html
index ef1b81b1f3a7..fcdfadd46185 100644
--- a/corehq/apps/domain/templates/domain/admin/bootstrap5/my_project_settings.html
+++ b/corehq/apps/domain/templates/domain/admin/bootstrap5/my_project_settings.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
-{% requirejs_main_b5 'domain/js/my_project_settings' %}
+{% js_entry 'domain/js/my_project_settings' %}
 
 {% block stylesheets %}
   <style>
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/confirm_plan.html b/corehq/apps/domain/templates/domain/bootstrap5/confirm_plan.html
index 16699c59d563..34f5663d8a0b 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/confirm_plan.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/confirm_plan.html
@@ -1,7 +1,8 @@
 {% extends "domain/bootstrap5/base_change_plan.html" %}
 {% load i18n %}
 {% load hq_shared_tags %}
-{% requirejs_main_b5 'accounting/js/confirm_plan' %}
+
+{% js_entry 'accounting/js/confirm_plan' %}
 
 {% block form_content %}
   {% initial_page_data 'is_upgrade' is_upgrade %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/internal_calculations.html b/corehq/apps/domain/templates/domain/bootstrap5/internal_calculations.html
index 0e44a7fbdecf..126ddefbaef1 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/internal_calculations.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/internal_calculations.html
@@ -2,7 +2,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main_b5 "domain/js/internal_calculations" %}
+{% js_entry "domain/js/internal_calculations" %}
 
 {% block page_content %}
   {% registerurl 'calculated_properties' domain %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/manage_releases_by_app_profile.html b/corehq/apps/domain/templates/domain/bootstrap5/manage_releases_by_app_profile.html
index 01125ef05cdb..a8e97ee37468 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/manage_releases_by_app_profile.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/manage_releases_by_app_profile.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
-{% requirejs_main_b5 'app_manager/js/manage_releases_by_app_profile' %}
+{% js_entry 'app_manager/js/manage_releases_by_app_profile' %}
 
 {% block page_content %}
   {% initial_page_data 'app_releases_by_app_profile' app_releases_by_app_profile %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/manage_releases_by_location.html b/corehq/apps/domain/templates/domain/bootstrap5/manage_releases_by_location.html
index 7457e55a9880..e6bb285ceaa6 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/manage_releases_by_location.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/manage_releases_by_location.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
-{% requirejs_main_b5 'app_manager/js/manage_releases_by_location' %}
+{% js_entry 'app_manager/js/manage_releases_by_location' %}
 
 {% block page_content %}
   {% initial_page_data 'app_releases_by_location' app_releases_by_location %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/select.html b/corehq/apps/domain/templates/domain/bootstrap5/select.html
index 21fbbc5e42c6..a5401a052e6e 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/select.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/select.html
@@ -4,7 +4,7 @@
 
 {% block title %}{% trans "My Projects" %}{% endblock title %}
 
-{% requirejs_main_b5 'domain/js/select' %}
+{% js_entry 'domain/js/select' %}
 
 {% block page_content %}
   {% initial_page_data 'invitation_links' invitation_links %}
diff --git a/corehq/apps/domain/templates/domain/bootstrap5/select_plan.html b/corehq/apps/domain/templates/domain/bootstrap5/select_plan.html
index 4d78bc5796df..8963bb909922 100644
--- a/corehq/apps/domain/templates/domain/bootstrap5/select_plan.html
+++ b/corehq/apps/domain/templates/domain/bootstrap5/select_plan.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load menu_tags %}
 
-{% requirejs_main_b5 'accounting/js/pricing_table' %}
+{% js_entry 'accounting/js/pricing_table' %}
 
 {% block form_content %}
   {% initial_page_data 'editions' editions %}
diff --git a/corehq/apps/domain/templates/domain/pro_bono/bootstrap5/domain.html b/corehq/apps/domain/templates/domain/pro_bono/bootstrap5/domain.html
index e5734285e89f..38d434cc6850 100644
--- a/corehq/apps/domain/templates/domain/pro_bono/bootstrap5/domain.html
+++ b/corehq/apps/domain/templates/domain/pro_bono/bootstrap5/domain.html
@@ -1,7 +1,7 @@
 {% extends "hqwebapp/bootstrap5/base_section.html" %}
 {% load hq_shared_tags %}
 
-{% requirejs_main_b5 'domain/js/pro-bono' %}
+{% js_entry 'domain/js/pro-bono' %}
 
 {% block page_content %}
   {% include 'domain/pro_bono/bootstrap5/page_content.html' %}
diff --git a/corehq/apps/domain/templates/domain/pro_bono/bootstrap5/static.html b/corehq/apps/domain/templates/domain/pro_bono/bootstrap5/static.html
index dbe80f3564b6..9f9b4f49f6cf 100644
--- a/corehq/apps/domain/templates/domain/pro_bono/bootstrap5/static.html
+++ b/corehq/apps/domain/templates/domain/pro_bono/bootstrap5/static.html
@@ -1,7 +1,7 @@
 {% extends 'hqwebapp/bootstrap5/base_page.html' %}
 {% load hq_shared_tags %}
 
-{% requirejs_main_b5 'domain/js/pro-bono' %}
+{% js_entry 'domain/js/pro-bono' %}
 
 {% block page_content %}
   {% include 'domain/pro_bono/bootstrap5/page_content.html' %}

From 7688f31a52f1873481d5e170fcfab035f6f53545 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 20 Nov 2024 13:59:28 +0000
Subject: [PATCH 095/159] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../domain/admin/case_search.html.diff.txt    |  4 ++--
 .../admin/commtrack_settings.html.diff.txt    |  8 ++++++--
 .../domain/admin/info_basic.html.diff.txt     | 10 +++++-----
 .../domain/admin/manage_alerts.html.diff.txt  |  4 ++--
 .../admin/my_project_settings.html.diff.txt   |  4 ++--
 .../domain/admin/sms_settings.html.diff.txt   |  9 +++++++++
 .../domain/confirm_plan.html.diff.txt         | 19 ++++++++++---------
 .../internal_calculations.html.diff.txt       |  4 ++--
 ...nage_releases_by_app_profile.html.diff.txt |  4 ++--
 .../manage_releases_by_location.html.diff.txt |  4 ++--
 .../domain/pro_bono/domain.html.diff.txt      |  4 ++--
 .../domain/pro_bono/static.html.diff.txt      |  4 ++--
 .../domain/select.html.diff.txt               |  4 ++--
 .../domain/select_plan.html.diff.txt          |  4 ++--
 .../domain/js/case_search_main.js.diff.txt    |  3 ++-
 .../domain/js/info_basic.js.diff.txt          |  3 ++-
 16 files changed, 54 insertions(+), 38 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/case_search.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/case_search.html.diff.txt
index 98e35dc5442d..c8b2229714c2 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/case_search.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/case_search.html.diff.txt
@@ -6,8 +6,8 @@
  {% load hq_shared_tags %}
  {% load i18n %}
  
--{% requirejs_main 'domain/js/bootstrap3/case_search_main' %}
-+{% requirejs_main_b5 'domain/js/bootstrap5/case_search_main' %}
+-{% js_entry_b3 'domain/js/bootstrap3/case_search_main' %}
++{% js_entry 'domain/js/bootstrap5/case_search_main' %}
  
  {% block page_content %}
 -  {% include 'domain/admin/partials/bootstrap3/case_search_templates.html' %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/commtrack_settings.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/commtrack_settings.html.diff.txt
index 19eef577baaa..0b432f22edc7 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/commtrack_settings.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/commtrack_settings.html.diff.txt
@@ -1,7 +1,11 @@
 --- 
 +++ 
-@@ -6,5 +6,5 @@
- {% requirejs_main_b5 "domain/js/commtrack_settings" %}
+@@ -3,8 +3,8 @@
+ {% load i18n %}
+ {% load crispy_forms_tags %}
+ 
+-{% js_entry "domain/js/commtrack_settings" %}
++{% requirejs_main_b5 "domain/js/commtrack_settings" %}
  
  {% block page_content %}
 -  {% crispy form %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/info_basic.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/info_basic.html.diff.txt
index f95046a08f05..112c87a50db2 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/info_basic.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/info_basic.html.diff.txt
@@ -1,18 +1,18 @@
 --- 
 +++ 
-@@ -1,9 +1,9 @@
+@@ -1,8 +1,9 @@
 -{% extends "hqwebapp/bootstrap3/base_section.html" %}
 +{% extends "hqwebapp/bootstrap5/base_section.html" %}
  {% load crispy_forms_tags %}
  {% load hq_shared_tags %}
  
- 
--{% requirejs_main 'domain/js/bootstrap3/info_basic' %}
-+{% requirejs_main_b5 'domain/js/bootstrap5/info_basic' %}
+-{% js_entry_b3 'domain/js/bootstrap3/info_basic' %}
++
++{% js_entry 'domain/js/bootstrap5/info_basic' %}
  
  {% block stylesheets %}{{ block.super }}
     <link rel="stylesheet" href="{% static '@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.css' %}" type="text/css" />
-@@ -11,5 +11,5 @@
+@@ -10,5 +11,5 @@
  
  {% block page_content %}
      {% initial_page_data 'mapbox_access_token' mapbox_access_token %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/manage_alerts.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/manage_alerts.html.diff.txt
index 580a2d9fe710..4f668946486c 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/manage_alerts.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/manage_alerts.html.diff.txt
@@ -7,8 +7,8 @@
  {% load hq_shared_tags %}
  {% load i18n %}
  
--{% requirejs_main "domain/js/manage_alerts" %}
-+{% requirejs_main_b5 "domain/js/manage_alerts" %}
+-{% js_entry_b3 "domain/js/manage_alerts" %}
++{% js_entry "domain/js/manage_alerts" %}
  
  {% block page_content %}
      {% initial_page_data 'alerts' alerts %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/my_project_settings.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/my_project_settings.html.diff.txt
index 224ca76d73a8..a62f6be067d6 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/my_project_settings.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/my_project_settings.html.diff.txt
@@ -7,8 +7,8 @@
  {% load crispy_forms_tags %}
  {% load i18n %}
  
--{% requirejs_main 'domain/js/my_project_settings' %}
-+{% requirejs_main_b5 'domain/js/my_project_settings' %}
+-{% js_entry_b3 'domain/js/my_project_settings' %}
++{% js_entry 'domain/js/my_project_settings' %}
  
  {% block stylesheets %}
    <style>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_settings.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_settings.html.diff.txt
index 474d9b403401..c2523eef5cf8 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_settings.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_settings.html.diff.txt
@@ -1,5 +1,14 @@
 --- 
 +++ 
+@@ -2,7 +2,7 @@
+ {% load hq_shared_tags %}
+ {% load i18n %}
+ 
+-{% requirejs_main_b5 'commtrack/js/sms' %}
++{% js_entry 'commtrack/js/sms' %}
+ 
+ {% block page_content %}
+   {% initial_page_data "settings" settings %}
 @@ -12,7 +12,7 @@
      <fieldset>
        <legend>{% trans 'Stock Actions' %}</legend>
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_plan.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_plan.html.diff.txt
index ebc642839abb..00d430020a21 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_plan.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/confirm_plan.html.diff.txt
@@ -1,16 +1,17 @@
 --- 
 +++ 
-@@ -1,7 +1,7 @@
+@@ -1,8 +1,8 @@
 -{% extends "domain/bootstrap3/base_change_plan.html" %}
 +{% extends "domain/bootstrap5/base_change_plan.html" %}
  {% load i18n %}
  {% load hq_shared_tags %}
--{% requirejs_main 'accounting/js/confirm_plan' %}
-+{% requirejs_main_b5 'accounting/js/confirm_plan' %}
+ 
+-{% js_entry_b3 'accounting/js/confirm_plan' %}
++{% js_entry 'accounting/js/confirm_plan' %}
  
  {% block form_content %}
    {% initial_page_data 'is_upgrade' is_upgrade %}
-@@ -42,7 +42,7 @@
+@@ -43,7 +43,7 @@
          </p>
        {% endif %}
        <div class="text-center plan-next">
@@ -19,7 +20,7 @@
            {% if is_paused %}
              {% trans 'Select different option' %}
            {% else %}
-@@ -68,7 +68,7 @@
+@@ -69,7 +69,7 @@
      <div class="modal-dialog">
        <div class="modal-content">
          <div class="modal-header">
@@ -28,7 +29,7 @@
              <span aria-hidden="true">&times;</span>
              <span class="sr-only">{% trans "Close" %}</span>
            </button>
-@@ -98,7 +98,7 @@
+@@ -99,7 +99,7 @@
                  Why are you downgrading your subscription today?
                {% endblocktrans %}
              {% endif %}
@@ -37,7 +38,7 @@
                      class="form-control"
                      data-bind="selectedOptions: oDowngradeReason,
                                 options: downgradeReasonList"></select>
-@@ -109,7 +109,7 @@
+@@ -110,7 +110,7 @@
                {% blocktrans %}
                  Do you think your project may start again?
                {% endblocktrans %}
@@ -46,7 +47,7 @@
                        data-bind="value: oWillProjectRestart">
                  <option value="yes">
                    {% trans "Yes" %}
-@@ -134,7 +134,7 @@
+@@ -135,7 +135,7 @@
                {% blocktrans %}
                  Why are you switching to a new tool?
                {% endblocktrans %}
@@ -55,7 +56,7 @@
                        class="form-control"
                        data-bind="selectedOptions: oNewToolReason,
                                   options: newToolReasonList"></select>
-@@ -171,7 +171,7 @@
+@@ -172,7 +172,7 @@
            <!-- ko ifnot: oRequiredQuestionsAnswered -->
              <button type="button"
                      disabled="disabled"
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_calculations.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_calculations.html.diff.txt
index e74663146bc7..9f83abbf4e0f 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_calculations.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_calculations.html.diff.txt
@@ -6,8 +6,8 @@
  {% load hq_shared_tags %}
  {% load i18n %}
  
--{% requirejs_main "domain/js/internal_calculations" %}
-+{% requirejs_main_b5 "domain/js/internal_calculations" %}
+-{% js_entry_b3 "domain/js/internal_calculations" %}
++{% js_entry "domain/js/internal_calculations" %}
  
  {% block page_content %}
    {% registerurl 'calculated_properties' domain %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/manage_releases_by_app_profile.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/manage_releases_by_app_profile.html.diff.txt
index e8626e780a50..b68aff52e36c 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/manage_releases_by_app_profile.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/manage_releases_by_app_profile.html.diff.txt
@@ -7,8 +7,8 @@
  {% load crispy_forms_tags %}
  {% load i18n %}
  
--{% requirejs_main 'app_manager/js/manage_releases_by_app_profile' %}
-+{% requirejs_main_b5 'app_manager/js/manage_releases_by_app_profile' %}
+-{% js_entry_b3 'app_manager/js/manage_releases_by_app_profile' %}
++{% js_entry 'app_manager/js/manage_releases_by_app_profile' %}
  
  {% block page_content %}
    {% initial_page_data 'app_releases_by_app_profile' app_releases_by_app_profile %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/manage_releases_by_location.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/manage_releases_by_location.html.diff.txt
index 6d1969628f6f..60817bb18fb6 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/manage_releases_by_location.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/manage_releases_by_location.html.diff.txt
@@ -7,8 +7,8 @@
  {% load crispy_forms_tags %}
  {% load i18n %}
  
--{% requirejs_main 'app_manager/js/manage_releases_by_location' %}
-+{% requirejs_main_b5 'app_manager/js/manage_releases_by_location' %}
+-{% js_entry_b3 'app_manager/js/manage_releases_by_location' %}
++{% js_entry 'app_manager/js/manage_releases_by_location' %}
  
  {% block page_content %}
    {% initial_page_data 'app_releases_by_location' app_releases_by_location %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/domain.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/domain.html.diff.txt
index 512e11b46777..c7b1c83e5493 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/domain.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/domain.html.diff.txt
@@ -5,8 +5,8 @@
 +{% extends "hqwebapp/bootstrap5/base_section.html" %}
  {% load hq_shared_tags %}
  
--{% requirejs_main 'domain/js/pro-bono' %}
-+{% requirejs_main_b5 'domain/js/pro-bono' %}
+-{% js_entry_b3 'domain/js/pro-bono' %}
++{% js_entry 'domain/js/pro-bono' %}
  
  {% block page_content %}
 -  {% include 'domain/pro_bono/bootstrap3/page_content.html' %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/static.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/static.html.diff.txt
index a685c85e2dde..021d41d14dcb 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/static.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/pro_bono/static.html.diff.txt
@@ -5,8 +5,8 @@
 +{% extends 'hqwebapp/bootstrap5/base_page.html' %}
  {% load hq_shared_tags %}
  
--{% requirejs_main 'domain/js/pro-bono' %}
-+{% requirejs_main_b5 'domain/js/pro-bono' %}
+-{% js_entry_b3 'domain/js/pro-bono' %}
++{% js_entry 'domain/js/pro-bono' %}
  
  {% block page_content %}
 -  {% include 'domain/pro_bono/bootstrap3/page_content.html' %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/select.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/select.html.diff.txt
index f8a5af8eced1..0a7429ae5c05 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/select.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/select.html.diff.txt
@@ -8,8 +8,8 @@
  
  {% block title %}{% trans "My Projects" %}{% endblock title %}
  
--{% requirejs_main 'domain/js/select' %}
-+{% requirejs_main_b5 'domain/js/select' %}
+-{% js_entry_b3 'domain/js/select' %}
++{% js_entry 'domain/js/select' %}
  
  {% block page_content %}
    {% initial_page_data 'invitation_links' invitation_links %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/select_plan.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/select_plan.html.diff.txt
index c069c32c0c0a..0130eaef9770 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/select_plan.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/select_plan.html.diff.txt
@@ -7,8 +7,8 @@
  {% load i18n %}
  {% load menu_tags %}
  
--{% requirejs_main 'accounting/js/pricing_table' %}
-+{% requirejs_main_b5 'accounting/js/pricing_table' %}
+-{% js_entry_b3 'accounting/js/pricing_table' %}
++{% js_entry 'accounting/js/pricing_table' %}
  
  {% block form_content %}
    {% initial_page_data 'editions' editions %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/case_search_main.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/case_search_main.js.diff.txt
index c56e24e91a0e..bb27536060ef 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/case_search_main.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/case_search_main.js.diff.txt
@@ -1,12 +1,13 @@
 --- 
 +++ 
-@@ -1,8 +1,8 @@
+@@ -1,9 +1,8 @@
 -hqDefine('domain/js/bootstrap3/case_search_main', [
 +hqDefine('domain/js/bootstrap5/case_search_main', [
      'jquery',
      'hqwebapp/js/initial_page_data',
 -    'domain/js/bootstrap3/case_search',
 -    'hqwebapp/js/bootstrap3/knockout_bindings.ko',     // save button
+-    'commcarehq',
 +    'domain/js/bootstrap5/case_search',
 +    'hqwebapp/js/bootstrap5/knockout_bindings.ko',     // save button
  ], function (
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/info_basic.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/info_basic.js.diff.txt
index 51fa87df9960..9ed6456fdafc 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/info_basic.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/info_basic.js.diff.txt
@@ -1,12 +1,13 @@
 --- 
 +++ 
-@@ -1,8 +1,8 @@
+@@ -1,9 +1,8 @@
 -hqDefine("domain/js/bootstrap3/info_basic", [
 +hqDefine("domain/js/bootstrap5/info_basic", [
      'jquery',
      'hqwebapp/js/select_2_ajax_widget', // for call center case owner
      'select2/dist/js/select2.full.min',
 -    'hqwebapp/js/bootstrap3/widgets',
+-    'commcarehq',
 +    'hqwebapp/js/bootstrap5/widgets',
  ], function (
      $

From f316b3ce4c90d65ff031d500bb519ea863569323 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 20 Nov 2024 09:05:10 -0500
Subject: [PATCH 096/159] Fixed lint error

---
 corehq/apps/domain/tests/test_domain_transfer.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/domain/tests/test_domain_transfer.py b/corehq/apps/domain/tests/test_domain_transfer.py
index c4b29a9be244..3e486fc4fd6d 100644
--- a/corehq/apps/domain/tests/test_domain_transfer.py
+++ b/corehq/apps/domain/tests/test_domain_transfer.py
@@ -212,8 +212,8 @@ def test_permissions_for_transfer_domain_view(self):
         # No one logged in
         resp = self.client.get(reverse('transfer_domain_view',
                                        args=[self.domain.name]), follow=True)
-        self.assertRedirects(resp, reverse('domain_login', kwargs={'domain': self.domain.name}) +
-            '?next=' + reverse('transfer_domain_view', args=[self.domain.name]))
+        self.assertRedirects(resp, reverse('domain_login', kwargs={'domain': self.domain.name})
+            + '?next=' + reverse('transfer_domain_view', args=[self.domain.name]))
 
         # Random user who belongs to the domain but not an admin
         self.client.login(username=self.rando.username, password=self.password)

From e6414dfbbc0bc58906f60aaa34116b9d5685fdad Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 20 Nov 2024 09:34:46 -0500
Subject: [PATCH 097/159] "Migrated" commtrack_settings.html

This was already migrated in https://github.com/dimagi/commcare-hq/pull/34309/
---
 corehq/apps/commtrack/views.py                         |  2 +-
 .../domain/admin/bootstrap5/commtrack_settings.html    | 10 ----------
 .../admin/{bootstrap3 => }/commtrack_settings.html     |  0
 .../utils/bootstrap/status/bootstrap3_to_5.json        |  5 ++++-
 4 files changed, 5 insertions(+), 12 deletions(-)
 delete mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap5/commtrack_settings.html
 rename corehq/apps/domain/templates/domain/admin/{bootstrap3 => }/commtrack_settings.html (100%)

diff --git a/corehq/apps/commtrack/views.py b/corehq/apps/commtrack/views.py
index c0dcd6dada9b..ff9d30300157 100644
--- a/corehq/apps/commtrack/views.py
+++ b/corehq/apps/commtrack/views.py
@@ -56,7 +56,7 @@ def dispatch(self, request, *args, **kwargs):
 class CommTrackSettingsView(BaseCommTrackManageView):
     urlname = 'commtrack_settings'
     page_title = gettext_noop("Advanced Settings")
-    template_name = 'domain/admin/bootstrap3/commtrack_settings.html'
+    template_name = 'domain/admin/commtrack_settings.html'
 
     @property
     @memoized
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/commtrack_settings.html b/corehq/apps/domain/templates/domain/admin/bootstrap5/commtrack_settings.html
deleted file mode 100644
index c72f5e48a7fe..000000000000
--- a/corehq/apps/domain/templates/domain/admin/bootstrap5/commtrack_settings.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "hqwebapp/bootstrap5/base_section.html" %}
-{% load hq_shared_tags %}
-{% load i18n %}
-{% load crispy_forms_tags %}
-
-{% requirejs_main_b5 "domain/js/commtrack_settings" %}
-
-{% block page_content %}
-  {% crispy form %}  {# todo B5: crispy #}
-{% endblock %}
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap3/commtrack_settings.html b/corehq/apps/domain/templates/domain/admin/commtrack_settings.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/bootstrap3/commtrack_settings.html
rename to corehq/apps/domain/templates/domain/admin/commtrack_settings.html
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
index 5d665da7f28a..e2b897d0a773 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
+++ b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
@@ -52,7 +52,10 @@
     "is_complete": true
   },
   "domain": {
-    "in_progress": true
+    "in_progress": true,
+    "templates": [
+      "admin/commtrack_settings.html"
+    ]
   },
   "dropbox": {
     "is_complete": true

From e638cbc94131640f051192a232e545273a72e0b7 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 20 Nov 2024 09:37:10 -0500
Subject: [PATCH 098/159] "Migrated" sms_settings.html

This was already migrated in https://github.com/dimagi/commcare-hq/pull/34309/
---
 corehq/apps/commtrack/views.py                |  2 +-
 .../domain/admin/bootstrap3/sms_settings.html | 28 -------------------
 .../admin/{bootstrap5 => }/sms_settings.html  |  0
 .../bootstrap/status/bootstrap3_to_5.json     |  3 +-
 4 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 corehq/apps/domain/templates/domain/admin/bootstrap3/sms_settings.html
 rename corehq/apps/domain/templates/domain/admin/{bootstrap5 => }/sms_settings.html (100%)

diff --git a/corehq/apps/commtrack/views.py b/corehq/apps/commtrack/views.py
index ff9d30300157..8cd69e26d214 100644
--- a/corehq/apps/commtrack/views.py
+++ b/corehq/apps/commtrack/views.py
@@ -185,7 +185,7 @@ def post(self, request, *args, **kwargs):
 class SMSSettingsView(BaseCommTrackManageView):
     urlname = 'commtrack_sms_settings'
     page_title = gettext_noop("SMS")
-    template_name = 'domain/admin/bootstrap3/sms_settings.html'
+    template_name = 'domain/admin/sms_settings.html'
 
     @property
     def page_context(self):
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap3/sms_settings.html b/corehq/apps/domain/templates/domain/admin/bootstrap3/sms_settings.html
deleted file mode 100644
index b0f48245abf2..000000000000
--- a/corehq/apps/domain/templates/domain/admin/bootstrap3/sms_settings.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "hqwebapp/bootstrap5/base_section.html" %}
-{% load hq_shared_tags %}
-{% load i18n %}
-
-{% requirejs_main_b5 'commtrack/js/sms' %}
-
-{% block page_content %}
-  {% initial_page_data "settings" settings %}
-  {% initial_page_data "other_sms_codes" other_sms_codes %}
-  <form id="settings" method="post">
-    {% csrf_token %}
-    <fieldset>
-      <legend>{% trans 'Stock Actions' %}</legend>
-      <div class="{% css_field_class %}">
-        {% include "domain/admin/bootstrap3/commtrack_action_table.html" %}
-        <button type="button" class="btn btn-outline-primary float-end" data-bind="click: new_action">
-          <i class="fa fa-plus"></i> {% trans "New Action" %}
-        </button>
-      </div>
-    </fieldset>
-
-    <button type="submit" class="btn btn-primary">
-      {% trans "Save Settings" %}
-    </button>
-
-    <input name="json" type="hidden" data-bind="value: json_payload" />
-  </form>
-{% endblock %}
diff --git a/corehq/apps/domain/templates/domain/admin/bootstrap5/sms_settings.html b/corehq/apps/domain/templates/domain/admin/sms_settings.html
similarity index 100%
rename from corehq/apps/domain/templates/domain/admin/bootstrap5/sms_settings.html
rename to corehq/apps/domain/templates/domain/admin/sms_settings.html
diff --git a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
index e2b897d0a773..f6c7e2942559 100644
--- a/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
+++ b/corehq/apps/hqwebapp/utils/bootstrap/status/bootstrap3_to_5.json
@@ -54,7 +54,8 @@
   "domain": {
     "in_progress": true,
     "templates": [
-      "admin/commtrack_settings.html"
+      "admin/commtrack_settings.html",
+      "admin/sms_settings.html"
     ]
   },
   "dropbox": {

From 0377e5cf06f6930aa0a3bf2ddec830c7d306b36c Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 20 Nov 2024 14:38:12 +0000
Subject: [PATCH 099/159] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../admin/commtrack_settings.html.diff.txt    | 13 ------------
 .../domain/admin/sms_settings.html.diff.txt   | 20 -------------------
 2 files changed, 33 deletions(-)
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/commtrack_settings.html.diff.txt
 delete mode 100644 corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_settings.html.diff.txt

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/commtrack_settings.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/commtrack_settings.html.diff.txt
deleted file mode 100644
index 0b432f22edc7..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/commtrack_settings.html.diff.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- 
-+++ 
-@@ -3,8 +3,8 @@
- {% load i18n %}
- {% load crispy_forms_tags %}
- 
--{% js_entry "domain/js/commtrack_settings" %}
-+{% requirejs_main_b5 "domain/js/commtrack_settings" %}
- 
- {% block page_content %}
--  {% crispy form %}
-+  {% crispy form %}  {# todo B5: crispy #}
- {% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_settings.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_settings.html.diff.txt
deleted file mode 100644
index c2523eef5cf8..000000000000
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_settings.html.diff.txt
+++ /dev/null
@@ -1,20 +0,0 @@
---- 
-+++ 
-@@ -2,7 +2,7 @@
- {% load hq_shared_tags %}
- {% load i18n %}
- 
--{% requirejs_main_b5 'commtrack/js/sms' %}
-+{% js_entry 'commtrack/js/sms' %}
- 
- {% block page_content %}
-   {% initial_page_data "settings" settings %}
-@@ -12,7 +12,7 @@
-     <fieldset>
-       <legend>{% trans 'Stock Actions' %}</legend>
-       <div class="{% css_field_class %}">
--        {% include "domain/admin/bootstrap3/commtrack_action_table.html" %}
-+        {% include "domain/admin/bootstrap5/commtrack_action_table.html" %}
-         <button type="button" class="btn btn-outline-primary float-end" data-bind="click: new_action">
-           <i class="fa fa-plus"></i> {% trans "New Action" %}
-         </button>

From 33ffa04b08687b5a5b6b2114bf3061367b1edf0f Mon Sep 17 00:00:00 2001
From: nospame <mapson.evan@gmail.com>
Date: Wed, 20 Nov 2024 10:29:57 -0800
Subject: [PATCH 100/159] Test that paused plans don't generate invoices

In contrast with a Community plan that does.
---
 .../accounting/tests/test_invoice_factory.py  | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/corehq/apps/accounting/tests/test_invoice_factory.py b/corehq/apps/accounting/tests/test_invoice_factory.py
index 619372bf0af6..8ad47c26078a 100644
--- a/corehq/apps/accounting/tests/test_invoice_factory.py
+++ b/corehq/apps/accounting/tests/test_invoice_factory.py
@@ -1,5 +1,4 @@
 import datetime
-from unittest.mock import patch
 
 from corehq.apps.accounting.invoicing import (
     CustomerAccountInvoiceFactory,
@@ -9,6 +8,7 @@
 from corehq.apps.accounting.models import (
     BillingAccount,
     DefaultProductPlan,
+    DomainUserHistory,
     SoftwarePlanEdition,
     Subscription,
 )
@@ -126,21 +126,39 @@ def test_no_coverage(self):
         community_ranges = self.invoice_factory._get_community_ranges(subscriptions)
         self.assertEqual(community_ranges, [(self.invoice_start, self.invoice_end + datetime.timedelta(days=1))])
 
+    def test_community_plan_generates_invoice(self):
+        """
+        Ensure that Community plans can generate invoices.
+        """
+        community_plan = DefaultProductPlan.get_default_plan_version()
+        subscription = Subscription.new_domain_subscription(
+            self.account, self.domain.name, community_plan,
+            date_start=self.invoice_start,
+            date_end=self.invoice_end + datetime.timedelta(days=1),
+        )
+        DomainUserHistory.objects.create(
+            domain=self.domain.name, record_date=self.invoice_end, num_users=10)
+
+        self.invoice_factory.create_invoices()
+        invoice_count = subscription.invoice_set.count()
+        self.assertEqual(invoice_count, 1)
+
     def test_paused_plan_generates_no_invoice(self):
         """
-        Ensure that paused plans do not generate invoices.
+        Ensure that Paused plans do not generate invoices.
         """
         paused_plan = generator.subscribable_plan_version(
             edition=SoftwarePlanEdition.PAUSED
         )
-        Subscription.new_domain_subscription(
+        subscription = Subscription.new_domain_subscription(
             self.account, self.domain.name, paused_plan,
             date_start=self.invoice_start,
             date_end=self.invoice_end + datetime.timedelta(days=1),
         )
-        with patch.object(self.invoice_factory, '_create_invoice_for_subscription') as mock_create_invoice:
-            self.invoice_factory.create_invoices()
-            mock_create_invoice.assert_not_called()
+
+        self.invoice_factory.create_invoices()
+        invoice_count = subscription.invoice_set.count()
+        self.assertEqual(invoice_count, 0)
 
 
 class TestInvoicingMethods(BaseAccountingTest):

From f4746de45bacfcc95f49c46402f40f78f7686ac1 Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Thu, 21 Nov 2024 11:03:27 -0500
Subject: [PATCH 101/159] Comments to explain UV environment variables

---
 Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 1c4b03f0ff67..e4b0288227e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,6 +12,8 @@ ENV PYTHONUNBUFFERED=1 \
     NODE_VERSION=20.11.1 \
     UV_COMPILE_BYTECODE=1 \
     UV_LINK_MODE=copy
+# UV_COMPILE_BYTECODE: Compile bytecode during installation.
+# UV_LINK_MODE: Copy from the cache instead of linking since it's a mounted volume
 
 RUN mkdir /vendor
 

From 5da37505c99bce93efc89d49cc8d9176968defc0 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Thu, 21 Nov 2024 10:55:30 -0600
Subject: [PATCH 102/159] Add max height and scroll bar to log in as dialog

If there are too many user properties on the dialog the bottom is
outside the view port making the user scroll to login. Adding a
maximum height to the table keeps the login button in view.
---
 .../templates/cloudcare/partials/users/user_data.html         | 4 +++-
 .../static/cloudcare/scss/formplayer-common/module.scss       | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/users/user_data.html b/corehq/apps/cloudcare/templates/cloudcare/partials/users/user_data.html
index f490f1df49dd..9cc852354919 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/users/user_data.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/users/user_data.html
@@ -1,7 +1,8 @@
 {% load i18n %}
 
 <script type="text/template" id="user-data-template">
-  <table class="table module-table module-table-case-detail">
+  <div class="module-table-case-detail-wrapper">
+    <table class="table module-table module-table-case-detail">
     <tbody>
     <tr>
       <th>{% trans "Name" %}</th>
@@ -31,4 +32,5 @@
     <% }) %>
     </tbody>
   </table>
+  </div>
 </script>
diff --git a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/module.scss b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/module.scss
index d03d1d1bc095..be26aeb19f6b 100644
--- a/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/module.scss
+++ b/corehq/apps/hqwebapp/static/cloudcare/scss/formplayer-common/module.scss
@@ -146,8 +146,10 @@ button.clickable-icon {
   margin-bottom: 0;
 }
 
-.module-table-case-detail {
+.module-table-case-detail-wrapper {
   margin-top: 10px;
+  max-height: calc(100vh - 180px);
+  overflow-y: auto;
 }
 
 .module-table-case-detail tbody tr {

From ad7af6802dd0155bc3706469e3c9ec2d13b43cb4 Mon Sep 17 00:00:00 2001
From: Martin Riese <mriese@dimagi.com>
Date: Thu, 21 Nov 2024 11:02:15 -0600
Subject: [PATCH 103/159] Fix indentation

---
 .../cloudcare/partials/users/user_data.html   | 58 +++++++++----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/corehq/apps/cloudcare/templates/cloudcare/partials/users/user_data.html b/corehq/apps/cloudcare/templates/cloudcare/partials/users/user_data.html
index 9cc852354919..0f647d9da3fa 100644
--- a/corehq/apps/cloudcare/templates/cloudcare/partials/users/user_data.html
+++ b/corehq/apps/cloudcare/templates/cloudcare/partials/users/user_data.html
@@ -3,34 +3,34 @@
 <script type="text/template" id="user-data-template">
   <div class="module-table-case-detail-wrapper">
     <table class="table module-table module-table-case-detail">
-    <tbody>
-    <tr>
-      <th>{% trans "Name" %}</th>
-      <td><%- user.first_name + ' ' + user.last_name %></td>
-    </tr>
-    <% if (user.location) { %>
-    <tr>
-      <th>{% trans "Organization" %}</th>
-      <td><%- user.location.name %></td>
-    </tr>
-    <tr>
-      <th>{% trans "Organization Type" %}</th>
-      <td><%- user.location.location_type %></td>
-    </tr>
-    <% } %>
-    <tr>
-      <th>{% trans "Date Registered" %}</th>
-      <td><%- user.dateRegistered %></td>
-    </tr>
-    <% _.each(user.customFields, function(value, key) { %>
-    <% if (!key.startsWith('commcare_') && !key.startsWith('commtrack') && value) { %>
-    <tr>
-      <th><%- key %></th>
-      <td><%- value %></td>
-    </tr>
-    <% } %>
-    <% }) %>
-    </tbody>
-  </table>
+      <tbody>
+        <tr>
+          <th>{% trans "Name" %}</th>
+          <td><%- user.first_name + ' ' + user.last_name %></td>
+        </tr>
+        <% if (user.location) { %>
+        <tr>
+          <th>{% trans "Organization" %}</th>
+          <td><%- user.location.name %></td>
+        </tr>
+        <tr>
+          <th>{% trans "Organization Type" %}</th>
+          <td><%- user.location.location_type %></td>
+        </tr>
+        <% } %>
+        <tr>
+          <th>{% trans "Date Registered" %}</th>
+          <td><%- user.dateRegistered %></td>
+        </tr>
+        <% _.each(user.customFields, function(value, key) { %>
+        <% if (!key.startsWith('commcare_') && !key.startsWith('commtrack') && value) { %>
+        <tr>
+          <th><%- key %></th>
+          <td><%- value %></td>
+        </tr>
+        <% } %>
+        <% }) %>
+      </tbody>
+    </table>
   </div>
 </script>

From 44395e4ac1e1b133a8bc92934a64ebd88f82c34e Mon Sep 17 00:00:00 2001
From: Ethan Soergel <esoergel@gmail.com>
Date: Mon, 18 Nov 2024 14:42:11 -0500
Subject: [PATCH 104/159] Move fixture providers to the same file

---
 .../apps/phone/data_providers/__init__.py     | 85 ++++++++++++++++++-
 .../phone/data_providers/case/__init__.py     |  1 -
 .../phone/data_providers/case/providers.py    | 16 ----
 .../apps/phone/data_providers/standard.py     | 69 ---------------
 4 files changed, 83 insertions(+), 88 deletions(-)
 delete mode 100644 corehq/ex-submodules/casexml/apps/phone/data_providers/case/providers.py
 delete mode 100644 corehq/ex-submodules/casexml/apps/phone/data_providers/standard.py

diff --git a/corehq/ex-submodules/casexml/apps/phone/data_providers/__init__.py b/corehq/ex-submodules/casexml/apps/phone/data_providers/__init__.py
index 28272f118061..c71b6198cffd 100644
--- a/corehq/ex-submodules/casexml/apps/phone/data_providers/__init__.py
+++ b/corehq/ex-submodules/casexml/apps/phone/data_providers/__init__.py
@@ -1,5 +1,6 @@
-from .standard import *
-from .case import *
+from casexml.apps.phone import xml
+from casexml.apps.phone.data_providers.case.livequery import do_livequery
+from casexml.apps.phone.fixtures import generator
 
 
 def get_element_providers(timing_context, skip_fixtures=False):
@@ -20,6 +21,7 @@ def get_element_providers(timing_context, skip_fixtures=False):
         FixtureElementProvider(timing_context, skip_fixtures),
     ]
 
+
 def get_async_providers(timing_context, async_task=None):
     """
     Get restore providers that return their own fully formed responses
@@ -29,3 +31,82 @@ def get_async_providers(timing_context, async_task=None):
     return [
         CasePayloadProvider(timing_context, async_task),
     ]
+
+
+class TimedProvider(object):
+    def __init__(self, timing_context):
+        self.timing_context = timing_context
+
+
+class RestoreDataProvider(TimedProvider):
+    """
+    Base class for things that gives data directly to a restore.
+    """
+    def get_elements(self, restore_state):
+        raise NotImplementedError('Need to implement this method')
+
+
+class SyncElementProvider(RestoreDataProvider):
+    """
+    Gets the initial sync element.
+    """
+
+    def get_elements(self, restore_state):
+        yield xml.get_sync_element(restore_state.current_sync_log._id)
+
+
+class RegistrationElementProvider(RestoreDataProvider):
+    """
+    Gets the registration XML
+    """
+
+    def get_elements(self, restore_state):
+        yield xml.get_registration_element(restore_state.restore_user)
+
+
+class FixtureElementProvider(RestoreDataProvider):
+    """
+    Gets any associated fixtures.
+    """
+
+    def __init__(self, timing_context, skip_fixtures):
+        self._skip_fixtures = skip_fixtures
+        super().__init__(timing_context)
+
+    def get_elements(self, restore_state):
+        # fixture block
+        providers = generator.get_providers(
+            restore_state.restore_user,
+            version=restore_state.version,
+        )
+        for provider in providers:
+            if self._skip_fixtures and not getattr(provider, 'ignore_skip_fixtures_flag', False):
+                continue
+            with self.timing_context('fixture:{}'.format(provider.id)):
+                elements = provider(restore_state)
+                for element in elements:
+                    yield element
+
+
+class AsyncDataProvider(TimedProvider):
+    """
+    Base class for things that deal with their own response.
+    """
+    def __init__(self, timing_context, async_task=None):
+        super().__init__(timing_context)
+        self.async_task = async_task
+
+    def extend_response(self, restore_state, response):
+        raise NotImplementedError('Need to implement this method')
+
+
+class CasePayloadProvider(AsyncDataProvider):
+    """Async provider responsible for generating the case and stock payloads."""
+
+    def extend_response(self, restore_state, response):
+        do_livequery(
+            self.timing_context,
+            restore_state,
+            response,
+            self.async_task,
+        )
diff --git a/corehq/ex-submodules/casexml/apps/phone/data_providers/case/__init__.py b/corehq/ex-submodules/casexml/apps/phone/data_providers/case/__init__.py
index 58d298235121..e69de29bb2d1 100644
--- a/corehq/ex-submodules/casexml/apps/phone/data_providers/case/__init__.py
+++ b/corehq/ex-submodules/casexml/apps/phone/data_providers/case/__init__.py
@@ -1 +0,0 @@
-from .providers import *
diff --git a/corehq/ex-submodules/casexml/apps/phone/data_providers/case/providers.py b/corehq/ex-submodules/casexml/apps/phone/data_providers/case/providers.py
deleted file mode 100644
index 8045ca2f1941..000000000000
--- a/corehq/ex-submodules/casexml/apps/phone/data_providers/case/providers.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from casexml.apps.phone.data_providers import AsyncDataProvider
-from casexml.apps.phone.data_providers.case.livequery import do_livequery
-
-
-class CasePayloadProvider(AsyncDataProvider):
-    """
-    Async provider responsible for generating the case and stock payloads.
-    """
-
-    def extend_response(self, restore_state, response):
-        do_livequery(
-            self.timing_context,
-            restore_state,
-            response,
-            self.async_task,
-        )
diff --git a/corehq/ex-submodules/casexml/apps/phone/data_providers/standard.py b/corehq/ex-submodules/casexml/apps/phone/data_providers/standard.py
deleted file mode 100644
index 62eff76191a9..000000000000
--- a/corehq/ex-submodules/casexml/apps/phone/data_providers/standard.py
+++ /dev/null
@@ -1,69 +0,0 @@
-from casexml.apps.phone import xml
-from casexml.apps.phone.fixtures import generator
-
-
-class TimedProvider(object):
-    def __init__(self, timing_context):
-        self.timing_context = timing_context
-
-
-class RestoreDataProvider(TimedProvider):
-    """
-    Base class for things that gives data directly to a restore.
-    """
-    def get_elements(self, restore_state):
-        raise NotImplementedError('Need to implement this method')
-
-
-class AsyncDataProvider(TimedProvider):
-    """
-    Base class for things that deal with their own response.
-    """
-    def __init__(self, timing_context, async_task=None):
-        super(AsyncDataProvider, self).__init__(timing_context)
-        self.async_task = async_task
-
-    def extend_response(self, restore_state, response):
-        raise NotImplementedError('Need to implement this method')
-
-
-class SyncElementProvider(RestoreDataProvider):
-    """
-    Gets the initial sync element.
-    """
-
-    def get_elements(self, restore_state):
-        yield xml.get_sync_element(restore_state.current_sync_log._id)
-
-
-class RegistrationElementProvider(RestoreDataProvider):
-    """
-    Gets the registration XML
-    """
-
-    def get_elements(self, restore_state):
-        yield xml.get_registration_element(restore_state.restore_user)
-
-
-class FixtureElementProvider(RestoreDataProvider):
-    """
-    Gets any associated fixtures.
-    """
-
-    def __init__(self, timing_context, skip_fixtures):
-        super().__init__(timing_context)
-        self._skip_fixtures = skip_fixtures
-
-    def get_elements(self, restore_state):
-        # fixture block
-        providers = generator.get_providers(
-            restore_state.restore_user,
-            version=restore_state.version,
-        )
-        for provider in providers:
-            if self._skip_fixtures and not getattr(provider, 'ignore_skip_fixtures_flag', False):
-                continue
-            with self.timing_context('fixture:{}'.format(provider.id)):
-                elements = provider(restore_state)
-                for element in elements:
-                    yield element

From 814d82dd0174aa740a6db41373058ec88e092c87 Mon Sep 17 00:00:00 2001
From: Ethan Soergel <esoergel@gmail.com>
Date: Mon, 18 Nov 2024 15:54:45 -0500
Subject: [PATCH 105/159] Move livequery call in-line

---
 .../apps/phone/data_providers/__init__.py     | 36 -------------------
 .../casexml/apps/phone/restore.py             | 12 +++----
 2 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/corehq/ex-submodules/casexml/apps/phone/data_providers/__init__.py b/corehq/ex-submodules/casexml/apps/phone/data_providers/__init__.py
index c71b6198cffd..2b9035155fa1 100644
--- a/corehq/ex-submodules/casexml/apps/phone/data_providers/__init__.py
+++ b/corehq/ex-submodules/casexml/apps/phone/data_providers/__init__.py
@@ -1,5 +1,4 @@
 from casexml.apps.phone import xml
-from casexml.apps.phone.data_providers.case.livequery import do_livequery
 from casexml.apps.phone.fixtures import generator
 
 
@@ -22,17 +21,6 @@ def get_element_providers(timing_context, skip_fixtures=False):
     ]
 
 
-def get_async_providers(timing_context, async_task=None):
-    """
-    Get restore providers that return their own fully formed responses
-
-    They can optionally take an async task to update progress
-    """
-    return [
-        CasePayloadProvider(timing_context, async_task),
-    ]
-
-
 class TimedProvider(object):
     def __init__(self, timing_context):
         self.timing_context = timing_context
@@ -86,27 +74,3 @@ def get_elements(self, restore_state):
                 elements = provider(restore_state)
                 for element in elements:
                     yield element
-
-
-class AsyncDataProvider(TimedProvider):
-    """
-    Base class for things that deal with their own response.
-    """
-    def __init__(self, timing_context, async_task=None):
-        super().__init__(timing_context)
-        self.async_task = async_task
-
-    def extend_response(self, restore_state, response):
-        raise NotImplementedError('Need to implement this method')
-
-
-class CasePayloadProvider(AsyncDataProvider):
-    """Async provider responsible for generating the case and stock payloads."""
-
-    def extend_response(self, restore_state, response):
-        do_livequery(
-            self.timing_context,
-            restore_state,
-            response,
-            self.async_task,
-        )
diff --git a/corehq/ex-submodules/casexml/apps/phone/restore.py b/corehq/ex-submodules/casexml/apps/phone/restore.py
index 8c0609f428af..762647a4f8c8 100644
--- a/corehq/ex-submodules/casexml/apps/phone/restore.py
+++ b/corehq/ex-submodules/casexml/apps/phone/restore.py
@@ -4,7 +4,6 @@
 import tempfile
 import uuid
 from datetime import datetime, timedelta
-from looseversion import LooseVersion
 from io import BytesIO
 from typing import Optional
 from uuid import uuid4
@@ -17,6 +16,7 @@
 
 from celery.exceptions import TimeoutError
 from celery.result import AsyncResult
+from looseversion import LooseVersion
 from memoized import memoized
 
 from casexml.apps.case.xml import V1, check_version
@@ -25,6 +25,7 @@
     get_response_element,
     get_simple_response_xml,
 )
+from dimagi.utils.logging import notify_error
 
 from corehq.apps.app_manager.exceptions import CannotRestoreException
 from corehq.apps.domain.models import Domain
@@ -34,7 +35,6 @@
 from corehq.toggles import EXTENSION_CASES_SYNC_ENABLED
 from corehq.util.metrics import metrics_counter, metrics_histogram
 from corehq.util.timer import TimingContext
-from dimagi.utils.logging import notify_error
 
 from .checksum import CaseStateHash
 from .const import (
@@ -43,7 +43,8 @@
     INITIAL_SYNC_CACHE_THRESHOLD,
     INITIAL_SYNC_CACHE_TIMEOUT,
 )
-from .data_providers import get_async_providers, get_element_providers
+from .data_providers import get_element_providers
+from .data_providers.case.livequery import do_livequery
 from .exceptions import (
     BadStateException,
     InvalidSyncLogException,
@@ -726,9 +727,8 @@ def _generate_restore_response(self, async_task=None):
                 with self.timing_context(provider.__class__.__name__):
                     content.extend(provider.get_elements(self.restore_state))
 
-            for provider in get_async_providers(self.timing_context, async_task):
-                with self.timing_context(provider.__class__.__name__):
-                    provider.extend_response(self.restore_state, content)
+            with self.timing_context('CasePayloadProvider'):
+                do_livequery(self.timing_context, self.restore_state, content, async_task)
 
             return content.get_fileobj()
 

From a8dbf86f82d9c7455def5ae7aaa2cb49ce25b5aa Mon Sep 17 00:00:00 2001
From: Ethan Soergel <esoergel@gmail.com>
Date: Mon, 18 Nov 2024 16:05:54 -0500
Subject: [PATCH 106/159] Remove other data providers in-line

---
 .../apps/phone/data_providers/__init__.py     | 76 -------------------
 .../casexml/apps/phone/restore.py             | 26 +++++--
 2 files changed, 21 insertions(+), 81 deletions(-)

diff --git a/corehq/ex-submodules/casexml/apps/phone/data_providers/__init__.py b/corehq/ex-submodules/casexml/apps/phone/data_providers/__init__.py
index 2b9035155fa1..e69de29bb2d1 100644
--- a/corehq/ex-submodules/casexml/apps/phone/data_providers/__init__.py
+++ b/corehq/ex-submodules/casexml/apps/phone/data_providers/__init__.py
@@ -1,76 +0,0 @@
-from casexml.apps.phone import xml
-from casexml.apps.phone.fixtures import generator
-
-
-def get_element_providers(timing_context, skip_fixtures=False):
-    """
-    Get restore providers which contribute directly to the XML.
-
-    Each provider has a `get_elements(restore_state)` method which
-    returns an iterable. Each item yielded by the returned iterable is
-    either an `cElementTree.Element` object or a UTF-8 encoded string
-    containing one or more XML elements. The string form must be wrapped
-    in an enclosing XML element to construct valid XML.
-    """
-    # note that ordering matters in this list as this is the order that the items
-    # will appear in the XML, and have access to the RestoreState object
-    return [
-        SyncElementProvider(timing_context),
-        RegistrationElementProvider(timing_context),
-        FixtureElementProvider(timing_context, skip_fixtures),
-    ]
-
-
-class TimedProvider(object):
-    def __init__(self, timing_context):
-        self.timing_context = timing_context
-
-
-class RestoreDataProvider(TimedProvider):
-    """
-    Base class for things that gives data directly to a restore.
-    """
-    def get_elements(self, restore_state):
-        raise NotImplementedError('Need to implement this method')
-
-
-class SyncElementProvider(RestoreDataProvider):
-    """
-    Gets the initial sync element.
-    """
-
-    def get_elements(self, restore_state):
-        yield xml.get_sync_element(restore_state.current_sync_log._id)
-
-
-class RegistrationElementProvider(RestoreDataProvider):
-    """
-    Gets the registration XML
-    """
-
-    def get_elements(self, restore_state):
-        yield xml.get_registration_element(restore_state.restore_user)
-
-
-class FixtureElementProvider(RestoreDataProvider):
-    """
-    Gets any associated fixtures.
-    """
-
-    def __init__(self, timing_context, skip_fixtures):
-        self._skip_fixtures = skip_fixtures
-        super().__init__(timing_context)
-
-    def get_elements(self, restore_state):
-        # fixture block
-        providers = generator.get_providers(
-            restore_state.restore_user,
-            version=restore_state.version,
-        )
-        for provider in providers:
-            if self._skip_fixtures and not getattr(provider, 'ignore_skip_fixtures_flag', False):
-                continue
-            with self.timing_context('fixture:{}'.format(provider.id)):
-                elements = provider(restore_state)
-                for element in elements:
-                    yield element
diff --git a/corehq/ex-submodules/casexml/apps/phone/restore.py b/corehq/ex-submodules/casexml/apps/phone/restore.py
index 762647a4f8c8..31b36d0fa008 100644
--- a/corehq/ex-submodules/casexml/apps/phone/restore.py
+++ b/corehq/ex-submodules/casexml/apps/phone/restore.py
@@ -43,7 +43,6 @@
     INITIAL_SYNC_CACHE_THRESHOLD,
     INITIAL_SYNC_CACHE_TIMEOUT,
 )
-from .data_providers import get_element_providers
 from .data_providers.case.livequery import do_livequery
 from .exceptions import (
     BadStateException,
@@ -51,6 +50,7 @@
     RestoreException,
     SyncLogUserMismatch,
 )
+from .fixtures import generator as fixture_generator
 from .models import (
     LOG_FORMAT_LIVEQUERY,
     OTARestoreUser,
@@ -60,7 +60,11 @@
 from .restore_caching import AsyncRestoreTaskIdCache, RestorePayloadPathCache
 from .tasks import ASYNC_RESTORE_SENT, get_async_restore_payload
 from .utils import get_cached_items_with_count
-from .xml import get_progress_element, get_sync_element
+from .xml import (
+    get_progress_element,
+    get_registration_element,
+    get_sync_element,
+)
 
 logger = logging.getLogger('restore')
 
@@ -723,9 +727,21 @@ def _generate_restore_response(self, async_task=None):
         username = self.restore_user.username
         count_items = self.params.include_item_count
         with RestoreContent(username, count_items) as content:
-            for provider in get_element_providers(self.timing_context, skip_fixtures=self.skip_fixtures):
-                with self.timing_context(provider.__class__.__name__):
-                    content.extend(provider.get_elements(self.restore_state))
+            with self.timing_context('SyncElementProvider'):
+                content.append(get_sync_element(self.restore_state.current_sync_log._id))
+
+            with self.timing_context('RegistrationElementProvider'):
+                content.append(get_registration_element(self.restore_state.restore_user))
+
+            with self.timing_context('FixtureElementProvider'):
+                for provider in fixture_generator.get_providers(
+                        self.restore_state.restore_user, version=self.restore_state.version
+                ):
+                    if self.skip_fixtures and not getattr(provider, 'ignore_skip_fixtures_flag', False):
+                        continue
+                    with self.timing_context('fixture:{}'.format(provider.id)):
+                        for element in provider(self.restore_state):
+                            content.append(element)
 
             with self.timing_context('CasePayloadProvider'):
                 do_livequery(self.timing_context, self.restore_state, content, async_task)

From 22fb9e3b22b254463be2026243a966b5ec8c484b Mon Sep 17 00:00:00 2001
From: Ethan Soergel <esoergel@gmail.com>
Date: Mon, 18 Nov 2024 17:10:30 -0500
Subject: [PATCH 107/159] Move fixture generator stuff into one place

---
 .../casexml/apps/phone/fixtures.py            | 38 +++++++++----------
 .../casexml/apps/phone/restore.py             | 12 ++----
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/corehq/ex-submodules/casexml/apps/phone/fixtures.py b/corehq/ex-submodules/casexml/apps/phone/fixtures.py
index a6f6645f3d74..829b04dce51f 100644
--- a/corehq/ex-submodules/casexml/apps/phone/fixtures.py
+++ b/corehq/ex-submodules/casexml/apps/phone/fixtures.py
@@ -1,10 +1,12 @@
 from abc import ABCMeta, abstractmethod, abstractproperty
 
-from casexml.apps.phone.models import OTARestoreUser
-from casexml.apps.case.xml import V1, V2
 from django.conf import settings
+
+from memoized import memoized
+
+from casexml.apps.case.xml import V1
+from casexml.apps.phone.models import OTARestoreUser
 from dimagi.utils.modules import to_function
-import itertools
 
 
 class FixtureProvider(metaclass=ABCMeta):
@@ -18,11 +20,9 @@ def __call__(self, restore_state):
         raise NotImplementedError
 
 
-class FixtureGenerator(object):
+@memoized
+def _fixture_generators():
     """
-    The generator object, which gets fixtures from your config file that should
-    be included when OTA restoring.
-
     See: https://bitbucket.org/javarosa/javarosa/wiki/externalinstances
 
     To use, add the following to your settings.py
@@ -45,19 +45,19 @@ class FixtureGenerator(object):
 
     The function should return an empty list if there are no fixtures
     """
+    functions = [to_function(func_path, failhard=True) for func_path in settings.FIXTURE_GENERATORS]
+    return [f for f in functions if f]
 
-    def __init__(self):
-        functions = [to_function(func_path, failhard=True) for func_path in settings.FIXTURE_GENERATORS]
-        self._generator_providers = [f for f in functions if f]
-
-    def get_providers(self, user, fixture_id=None, version=V2):
-        if version == V1:
-            return []  # V1 phones will never use or want fixtures
-
-        if not isinstance(user, OTARestoreUser):
-            return []
 
-        return self._generator_providers
+def get_fixture_elements(restore_state, timing_context, skip_fixtures):
+    if restore_state.version == V1:
+        return  # V1 phones will never use or want fixtures
 
+    if not isinstance(restore_state.restore_user, OTARestoreUser):
+        return
 
-generator = FixtureGenerator()
+    for provider in _fixture_generators():
+        if not skip_fixtures or getattr(provider, 'ignore_skip_fixtures_flag', False):
+            with timing_context('fixture:{}'.format(provider.id)):
+                for element in provider(restore_state):
+                    yield element
diff --git a/corehq/ex-submodules/casexml/apps/phone/restore.py b/corehq/ex-submodules/casexml/apps/phone/restore.py
index 31b36d0fa008..c0e020af4d59 100644
--- a/corehq/ex-submodules/casexml/apps/phone/restore.py
+++ b/corehq/ex-submodules/casexml/apps/phone/restore.py
@@ -50,7 +50,7 @@
     RestoreException,
     SyncLogUserMismatch,
 )
-from .fixtures import generator as fixture_generator
+from .fixtures import get_fixture_elements
 from .models import (
     LOG_FORMAT_LIVEQUERY,
     OTARestoreUser,
@@ -734,14 +734,8 @@ def _generate_restore_response(self, async_task=None):
                 content.append(get_registration_element(self.restore_state.restore_user))
 
             with self.timing_context('FixtureElementProvider'):
-                for provider in fixture_generator.get_providers(
-                        self.restore_state.restore_user, version=self.restore_state.version
-                ):
-                    if self.skip_fixtures and not getattr(provider, 'ignore_skip_fixtures_flag', False):
-                        continue
-                    with self.timing_context('fixture:{}'.format(provider.id)):
-                        for element in provider(self.restore_state):
-                            content.append(element)
+                for element in get_fixture_elements(self.restore_state, self.timing_context, self.skip_fixtures):
+                    content.append(element)
 
             with self.timing_context('CasePayloadProvider'):
                 do_livequery(self.timing_context, self.restore_state, content, async_task)

From 4c73bee9e4a07ad35c593bdb21b21d08e04d6407 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 20 Nov 2024 17:02:04 -0500
Subject: [PATCH 108/159] Updated webpack config to fix multiselect error,
 migrate a B3 and a B5 page

The config change is necessary because this library expects a "jQuery" property to be set on the window.
See https://github.com/lou/multi-select/blob/57fb8d3f5d27a0e1058f63921cdb26b4d30da361/js/jquery.multi-select.js#L544
---
 corehq/apps/events/static/events/js/new_event.js           | 1 +
 corehq/apps/events/templates/events/new_event.html         | 2 +-
 corehq/apps/registry/static/registry/js/registry_edit.js   | 1 +
 corehq/apps/registry/templates/registry/registry_edit.html | 2 +-
 webpack/webpack.b3.common.js                               | 1 +
 webpack/webpack.common.js                                  | 1 +
 6 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/events/static/events/js/new_event.js b/corehq/apps/events/static/events/js/new_event.js
index 7bfc349f1c1e..68d369f4f70a 100644
--- a/corehq/apps/events/static/events/js/new_event.js
+++ b/corehq/apps/events/static/events/js/new_event.js
@@ -6,6 +6,7 @@ hqDefine("events/js/new_event", [
     "locations/js/widgets",
     "hqwebapp/js/bootstrap3/widgets",
     "jquery-ui/ui/widgets/datepicker",
+    "commcarehq",
 ], function (
     $,
     ko,
diff --git a/corehq/apps/events/templates/events/new_event.html b/corehq/apps/events/templates/events/new_event.html
index 3ba7cf37a451..27734b2e3cd3 100644
--- a/corehq/apps/events/templates/events/new_event.html
+++ b/corehq/apps/events/templates/events/new_event.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
-{% requirejs_main 'events/js/new_event' %}
+{% js_entry_b3 'events/js/new_event' %}
 
 {% block page_content %}
   {% initial_page_data 'current_values' form.current_values %}
diff --git a/corehq/apps/registry/static/registry/js/registry_edit.js b/corehq/apps/registry/static/registry/js/registry_edit.js
index 37af56af7c9e..060151b28999 100644
--- a/corehq/apps/registry/static/registry/js/registry_edit.js
+++ b/corehq/apps/registry/static/registry/js/registry_edit.js
@@ -13,6 +13,7 @@ hqDefine("registry/js/registry_edit", [
     'hqwebapp/js/bootstrap5/main', // makeHqHelp
     'hqwebapp/js/multiselect_utils',
     'hqwebapp/js/components/inline_edit',
+    'commcarehq',
 ], function (
     moment,
     ko,
diff --git a/corehq/apps/registry/templates/registry/registry_edit.html b/corehq/apps/registry/templates/registry/registry_edit.html
index 2a858383c662..769ba0a183a7 100644
--- a/corehq/apps/registry/templates/registry/registry_edit.html
+++ b/corehq/apps/registry/templates/registry/registry_edit.html
@@ -16,7 +16,7 @@
   {% endcompress %}
 {% endblock %}
 
-{% requirejs_main_b5 'registry/js/registry_edit' %}
+{% js_entry 'registry/js/registry_edit' %}
 
 {% block page_content %}
 {% initial_page_data "registry" registry %}
diff --git a/webpack/webpack.b3.common.js b/webpack/webpack.b3.common.js
index a275e9c94352..2295e427c30e 100644
--- a/webpack/webpack.b3.common.js
+++ b/webpack/webpack.b3.common.js
@@ -14,6 +14,7 @@ module.exports = Object.assign({}, commonDefault, {
         new webpack.ProvidePlugin({
             '$': 'jquery',
             'jQuery': 'jquery',  // needed for bootstrap 3 to work
+            'window.jQuery': 'jquery',
         }),
         new hqPlugins.EntryChunksPlugin({
             filename: 'manifest_b3.json',
diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js
index efbad22e74a5..c017e1da05eb 100644
--- a/webpack/webpack.common.js
+++ b/webpack/webpack.common.js
@@ -85,6 +85,7 @@ module.exports = {
         new webpack.ProvidePlugin({
             '$': 'jquery',
             'jQuery': 'jquery',  // needed for bootstrap to work
+            'window.jQuery': 'jquery',
         }),
         new hqPlugins.EntryChunksPlugin(),
     ],

From a880b06967c0c939fa3082517ddcb2403fc487b0 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 20 Nov 2024 17:52:41 -0500
Subject: [PATCH 109/159] Replaced quicksearch with a simple indexOf search.

This library was throwing errors relating to functions not being found as expected on the window. Rather than
troubleshoot, I'm just killing it. Usages of the multiselect widget don't have that many items, a basic search is fine.
quicksearch appears abandoned, no updates in 8 years: https://www.npmjs.com/package/quicksearch
---
 .../static/hqwebapp/js/multiselect_utils.js   | 32 +++++++++++--------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js b/corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
index 9147af3638c4..b08770171fc8 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
@@ -5,7 +5,6 @@ hqDefine('hqwebapp/js/multiselect_utils', [
     "underscore",
     "hqwebapp/js/assert_properties",
     "multiselect/js/jquery.multi-select",
-    "quicksearch/dist/jquery.quicksearch.min",
 ], function (
     $,
     ko,
@@ -100,7 +99,18 @@ hqDefine('hqwebapp/js/multiselect_utils', [
                     selectableSearchString = '#' + that.$container.attr('id') + ' .ms-elem-selectable:not(.ms-selected)',
                     selectionSearchString = '#' + that.$container.attr('id') + ' .ms-elem-selection.ms-selected';
 
-                that.search_left = $selectableSearch.quicksearch(selectableSearchString)
+                const _search = function (query, itemSelector) {
+                    $(itemSelector).each(function (index, item) {
+                        const $item = $(item);
+                        if (!query || $item.text().indexOf(query) !== -1) {
+                            $item.removeClass(window.USE_BOOTSTRAP5 ? "d-none" : "hide");
+                        } else {
+                            $item.addClass(window.USE_BOOTSTRAP5 ? "d-none" : "hide");
+                        }
+                    });
+                };
+
+                that.search_left = $selectableSearch
                     .on('keydown', function (e) {
                         if (e.which === 40) {  // down arrow, was recommended by loudev docs
                             that.$selectableUl.focus();
@@ -108,7 +118,9 @@ hqDefine('hqwebapp/js/multiselect_utils', [
                         }
                     })
                     .on('keyup change search input', function () {
-                    // disable add all functionality so that user is not confused
+                        _search($selectableSearch.val(), selectableSearchString);
+
+                        // disable add all functionality so that user is not confused
                         if (that.search_left.val().length > 0) {
                             $('#' + selectAllId).addClass('disabled').prop('disabled', true);
                         } else {
@@ -118,7 +130,7 @@ hqDefine('hqwebapp/js/multiselect_utils', [
                         }
                     });
 
-                that.search_right = $selectionSearch.quicksearch(selectionSearchString)
+                that.search_right = $selectionSearch
                     .on('keydown', function (e) {
                         if (e.which === 40) {  // down arrow, was recommended by loudev docs
                             that.$selectionUl.focus();
@@ -126,7 +138,9 @@ hqDefine('hqwebapp/js/multiselect_utils', [
                         }
                     })
                     .on('keyup change search input', function () {
-                    // disable remove all functionality so that user is not confused
+                        _search($selectionSearch.val(), selectionSearchString);
+
+                        // disable remove all functionality so that user is not confused
                         if (that.search_right.val().length > 0) {
                             $('#' + removeAllId).addClass('disabled').prop('disabled', true);
                         } else if (!disableModifyAllActions) {
@@ -135,22 +149,14 @@ hqDefine('hqwebapp/js/multiselect_utils', [
                     });
             },
             afterSelect: function () {
-                this.search_left.cache();
-                // remove search option so that user doesn't get confused
-                this.search_right.val('').search('');
                 if (!disableModifyAllActions) {
                     $('#' + removeAllId).removeClass('disabled').prop('disabled', false);
                 }
-                this.search_right.cache();
             },
             afterDeselect: function () {
-                // remove search option so that user doesn't get confused
-                this.search_left.val('').search('');
                 if (!disableModifyAllActions) {
                     $('#' + selectAllId).removeClass('disabled').prop('disabled', false);
                 }
-                this.search_left.cache();
-                this.search_right.cache();
             },
         });
 

From 4a72c49400155336f954878d9cb3b0a68064f3ce Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 20 Nov 2024 17:55:51 -0500
Subject: [PATCH 110/159] Removed quicksearch dependency from HQ

---
 .../hqwebapp/templates/hqwebapp/base.html     |  1 -
 .../templates/styleguide/bootstrap3/base.html |  1 -
 .../templates/styleguide/bootstrap5/base.html |  1 -
 package.json                                  |  1 -
 yarn.lock                                     | 39 ++++++++++++++-----
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/base.html b/corehq/apps/hqwebapp/templates/hqwebapp/base.html
index 0843c37bc854..9e3628f52ba2 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/base.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/base.html
@@ -408,7 +408,6 @@
     {% if request.use_multiselect and not use_js_bundler %}
       {% compress js %}
         <script src="{% static 'multiselect/js/jquery.multi-select.js' %}"></script>
-        <script src="{% static 'quicksearch/dist/jquery.quicksearch.min.js' %}"></script>
         <script src="{% static 'hqwebapp/js/multiselect_utils.js' %}"></script>
       {% endcompress %}
     {% endif %}
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap3/base.html b/corehq/apps/styleguide/templates/styleguide/bootstrap3/base.html
index 9dec484e0b93..22526a43ad1f 100644
--- a/corehq/apps/styleguide/templates/styleguide/bootstrap3/base.html
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap3/base.html
@@ -36,7 +36,6 @@
       <script src="{% static 'hqwebapp/js/bootstrap3/widgets.js' %}"></script>
       <script src="{% static 'hqwebapp/js/bootstrap3/main.js' %}"></script>
       <script src="{% static 'multiselect/js/jquery.multi-select.js' %}"></script>
-      <script src="{% static 'quicksearch/dist/jquery.quicksearch.min.js' %}"></script>
       <script src="{% static 'hqwebapp/js/multiselect_utils.js' %}"></script>
     {% endcompress %}
   </head>
diff --git a/corehq/apps/styleguide/templates/styleguide/bootstrap5/base.html b/corehq/apps/styleguide/templates/styleguide/bootstrap5/base.html
index 69e3c398331f..8a1a03900dfe 100644
--- a/corehq/apps/styleguide/templates/styleguide/bootstrap5/base.html
+++ b/corehq/apps/styleguide/templates/styleguide/bootstrap5/base.html
@@ -122,7 +122,6 @@ <h6>Quick Links</h6>
       <script src="{% static 'hqwebapp/js/bootstrap5/main.js' %}"></script>
       <script src="{% static 'hqwebapp/js/select_2_ajax_widget.js' %}"></script>
       <script src="{% static 'multiselect/js/jquery.multi-select.js' %}"></script>
-      <script src="{% static 'quicksearch/dist/jquery.quicksearch.min.js' %}"></script>
       <script src="{% static 'hqwebapp/js/multiselect_utils.js' %}"></script>
       <script src="{% static 'ace-builds/src-min-noconflict/ace.js' %}"></script>
       <script src="{% static 'ace-builds/src-min-noconflict/mode-python.js' %}"></script>
diff --git a/package.json b/package.json
index e482091fbf06..6dc0233c947e 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,6 @@
         "nprogress": "0.2.0",
         "nvd3": "1.1.10",
         "nvd3-1.8.6": "npm:nvd3#1.8.6",
-        "quicksearch": "DeuxHuitHuit/quicksearch#2.2.1",
         "requirejs": "2.3.7",
         "requirejs-babel7": "^1.3.2",
         "select2": "4.1.0-rc.0",
diff --git a/yarn.lock b/yarn.lock
index 4f70ba4f3d1f..da660f1a7981 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4081,7 +4081,7 @@ jquery@3.5.1:
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
   integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
 
-"jquery@>= 1.7.1", jquery@>=1.10, jquery@>=1.7, jquery@>=1.8, "jquery@>=1.8.0 <4.0.0", jquery@^3.5.1:
+"jquery@>= 1.7.1", jquery@>=1.10, jquery@>=1.7, "jquery@>=1.8.0 <4.0.0", jquery@^3.5.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
   integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
@@ -5750,12 +5750,6 @@ quick-lru@^5.1.1:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
   integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
 
-quicksearch@DeuxHuitHuit/quicksearch#2.2.1:
-  version "2.2.1"
-  resolved "https://codeload.github.com/DeuxHuitHuit/quicksearch/tar.gz/05089bc3aa95a68eee2f7f484a304be06a8f1303"
-  dependencies:
-    jquery ">=1.8"
-
 randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -6312,7 +6306,16 @@ string-template@~0.2.1:
   resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
   integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -6358,7 +6361,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -6372,6 +6375,13 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
+strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
 strip-ansi@^7.0.1, strip-ansi@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45"
@@ -7018,7 +7028,7 @@ workerpool@6.2.0:
   resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.0.tgz#827d93c9ba23ee2019c3ffaff5c27fccea289e8b"
   integrity sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -7036,6 +7046,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From 43ea49a153a3a7b504f7d4368d461f747aa60aec Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 20 Nov 2024 18:11:20 -0500
Subject: [PATCH 111/159] Migrated reports/js/bootstrap5/edit_scheduled_report

---
 .../static/reports/js/bootstrap3/edit_scheduled_report.js       | 1 +
 .../static/reports/js/bootstrap5/edit_scheduled_report.js       | 1 +
 .../templates/reports/bootstrap3/edit_scheduled_report.html     | 2 +-
 .../templates/reports/bootstrap5/edit_scheduled_report.html     | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/reports/static/reports/js/bootstrap3/edit_scheduled_report.js b/corehq/apps/reports/static/reports/js/bootstrap3/edit_scheduled_report.js
index f47613c55c81..4bfe1c0cfe78 100644
--- a/corehq/apps/reports/static/reports/js/bootstrap3/edit_scheduled_report.js
+++ b/corehq/apps/reports/static/reports/js/bootstrap3/edit_scheduled_report.js
@@ -8,6 +8,7 @@ hqDefine("reports/js/bootstrap3/edit_scheduled_report", [
     "hqwebapp/js/bootstrap3/widgets",  // autocomplete widget for email recipient list
     "jquery-ui/ui/widgets/datepicker",
     'hqwebapp/js/components/select_toggle',
+    "commcarehq",
 ], function (
     $,
     _,
diff --git a/corehq/apps/reports/static/reports/js/bootstrap5/edit_scheduled_report.js b/corehq/apps/reports/static/reports/js/bootstrap5/edit_scheduled_report.js
index 3cbcf63fde93..8fe43608bb04 100644
--- a/corehq/apps/reports/static/reports/js/bootstrap5/edit_scheduled_report.js
+++ b/corehq/apps/reports/static/reports/js/bootstrap5/edit_scheduled_report.js
@@ -8,6 +8,7 @@ hqDefine("reports/js/bootstrap5/edit_scheduled_report", [
     "hqwebapp/js/bootstrap5/widgets",  // autocomplete widget for email recipient list
     "jquery-ui/ui/widgets/datepicker",
     'hqwebapp/js/components/select_toggle',
+    "commcarehq",
 ], function (
     $,
     _,
diff --git a/corehq/apps/reports/templates/reports/bootstrap3/edit_scheduled_report.html b/corehq/apps/reports/templates/reports/bootstrap3/edit_scheduled_report.html
index 0771d985a87e..aba16959cd9e 100644
--- a/corehq/apps/reports/templates/reports/bootstrap3/edit_scheduled_report.html
+++ b/corehq/apps/reports/templates/reports/bootstrap3/edit_scheduled_report.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 
 
-{% requirejs_main 'reports/js/bootstrap3/edit_scheduled_report' %}
+{% js_entry_b3 'reports/js/bootstrap3/edit_scheduled_report' %}
 
 {% block page_content %}
   {% initial_page_data 'is_configurable_map' is_configurable_map %}
diff --git a/corehq/apps/reports/templates/reports/bootstrap5/edit_scheduled_report.html b/corehq/apps/reports/templates/reports/bootstrap5/edit_scheduled_report.html
index 1ece16ae711c..42cc09ae9761 100644
--- a/corehq/apps/reports/templates/reports/bootstrap5/edit_scheduled_report.html
+++ b/corehq/apps/reports/templates/reports/bootstrap5/edit_scheduled_report.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 
 
-{% requirejs_main_b5 'reports/js/bootstrap5/edit_scheduled_report' %}
+{% js_entry 'reports/js/bootstrap5/edit_scheduled_report' %}
 
 {% block page_content %}
   {% initial_page_data 'is_configurable_map' is_configurable_map %}

From ce01cf5ec920b8f5fc56a19b3ffad1dc9fadafe1 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 20 Nov 2024 18:20:53 -0500
Subject: [PATCH 112/159] Migrated users pages

---
 corehq/apps/users/static/users/js/edit_commcare_user.js    | 1 +
 corehq/apps/users/static/users/js/edit_web_user.js         | 1 +
 corehq/apps/users/static/users/js/filtered_download.js     | 1 +
 corehq/apps/users/static/users/js/invite_web_user.js       | 1 +
 corehq/apps/users/static/users/js/mobile_workers.js        | 1 +
 corehq/apps/users/templates/users/edit_commcare_user.html  | 2 +-
 corehq/apps/users/templates/users/edit_web_user.html       | 2 +-
 corehq/apps/users/templates/users/filter_and_download.html | 2 +-
 corehq/apps/users/templates/users/invite_web_user.html     | 2 +-
 corehq/apps/users/templates/users/mobile_workers.html      | 2 +-
 10 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/corehq/apps/users/static/users/js/edit_commcare_user.js b/corehq/apps/users/static/users/js/edit_commcare_user.js
index 269c40e71e77..b43bf69a1a58 100644
--- a/corehq/apps/users/static/users/js/edit_commcare_user.js
+++ b/corehq/apps/users/static/users/js/edit_commcare_user.js
@@ -15,6 +15,7 @@ hqDefine('users/js/edit_commcare_user', [
     'registration/js/bootstrap3/password',
     'select2/dist/js/select2.full.min',
     'eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min',
+    'commcarehq',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/users/static/users/js/edit_web_user.js b/corehq/apps/users/static/users/js/edit_web_user.js
index de055d2a7ef2..bf270654868b 100644
--- a/corehq/apps/users/static/users/js/edit_web_user.js
+++ b/corehq/apps/users/static/users/js/edit_web_user.js
@@ -5,6 +5,7 @@ hqDefine('users/js/edit_web_user', [
     'hqwebapp/js/initial_page_data',
     'users/js/custom_data_fields',
     'locations/js/widgets',
+    'commcarehq',
 ], function (
     $,
     initialPageData,
diff --git a/corehq/apps/users/static/users/js/filtered_download.js b/corehq/apps/users/static/users/js/filtered_download.js
index 4d8719fdd07b..cc3b2fc9f0d2 100644
--- a/corehq/apps/users/static/users/js/filtered_download.js
+++ b/corehq/apps/users/static/users/js/filtered_download.js
@@ -7,6 +7,7 @@ hqDefine('users/js/filtered_download', [
     'locations/js/widgets',     // location search
     'hqwebapp/js/components/select_toggle',
     'hqwebapp/js/bootstrap3/knockout_bindings.ko', // slideVisible binding
+    'commcarehq',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/users/static/users/js/invite_web_user.js b/corehq/apps/users/static/users/js/invite_web_user.js
index 6ebbf3773062..e79a233ae7c8 100644
--- a/corehq/apps/users/static/users/js/invite_web_user.js
+++ b/corehq/apps/users/static/users/js/invite_web_user.js
@@ -6,6 +6,7 @@ hqDefine('users/js/invite_web_user',[
     'hqwebapp/js/toggles',
     'hqwebapp/js/bootstrap3/validators.ko',
     'locations/js/widgets',
+    'commcarehq',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/users/static/users/js/mobile_workers.js b/corehq/apps/users/static/users/js/mobile_workers.js
index afc51b303e07..1e130439e1d2 100644
--- a/corehq/apps/users/static/users/js/mobile_workers.js
+++ b/corehq/apps/users/static/users/js/mobile_workers.js
@@ -32,6 +32,7 @@ hqDefine("users/js/mobile_workers",[
     'hqwebapp/js/components/search_box',
     'hqwebapp/js/bootstrap3/validators.ko', // email address validation
     'eonasdan-bootstrap-datetimepicker/build/js/bootstrap-datetimepicker.min',
+    'commcarehq',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/users/templates/users/edit_commcare_user.html b/corehq/apps/users/templates/users/edit_commcare_user.html
index 3a4e4c32fe28..78f13b0e9055 100644
--- a/corehq/apps/users/templates/users/edit_commcare_user.html
+++ b/corehq/apps/users/templates/users/edit_commcare_user.html
@@ -4,7 +4,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main 'users/js/edit_commcare_user' %}
+{% js_entry_b3 'users/js/edit_commcare_user' %}
 
 {% block page_content %}
   {% initial_page_data "couch_user_id" couch_user.user_id %}
diff --git a/corehq/apps/users/templates/users/edit_web_user.html b/corehq/apps/users/templates/users/edit_web_user.html
index 5f2e96e412b6..f84162c508db 100644
--- a/corehq/apps/users/templates/users/edit_web_user.html
+++ b/corehq/apps/users/templates/users/edit_web_user.html
@@ -4,7 +4,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main 'users/js/edit_web_user' %}
+{% js_entry_b3 'users/js/edit_web_user' %}
 
 {% block page_content %}
   {% initial_page_data 'can_edit_original_profile' can_edit_original_profile %}
diff --git a/corehq/apps/users/templates/users/filter_and_download.html b/corehq/apps/users/templates/users/filter_and_download.html
index 6abee9d26e85..cba151cfda11 100644
--- a/corehq/apps/users/templates/users/filter_and_download.html
+++ b/corehq/apps/users/templates/users/filter_and_download.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load crispy_forms_tags %}
 
-{% requirejs_main 'users/js/filtered_download' %}
+{% js_entry_b3 'users/js/filtered_download' %}
 
 {% block page_content %}
   {% initial_page_data 'count_users_url' count_users_url %}
diff --git a/corehq/apps/users/templates/users/invite_web_user.html b/corehq/apps/users/templates/users/invite_web_user.html
index 52efd230b922..70a88838ec43 100644
--- a/corehq/apps/users/templates/users/invite_web_user.html
+++ b/corehq/apps/users/templates/users/invite_web_user.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
-{% requirejs_main 'users/js/invite_web_user' %}
+{% js_entry_b3 'users/js/invite_web_user' %}
 
 {% block page_content %}
   {% initial_page_data 'custom_fields_slugs' custom_fields_slugs %}
diff --git a/corehq/apps/users/templates/users/mobile_workers.html b/corehq/apps/users/templates/users/mobile_workers.html
index 7b4f7cfd0c6a..5ccdb6a03c8b 100644
--- a/corehq/apps/users/templates/users/mobile_workers.html
+++ b/corehq/apps/users/templates/users/mobile_workers.html
@@ -4,7 +4,7 @@
 {% load hq_shared_tags %}
 {% load crispy_forms_tags %}
 
-{% requirejs_main 'users/js/mobile_workers' %}
+{% js_entry_b3 'users/js/mobile_workers' %}
 
 {% block page_content %}
   {% initial_page_data 'can_access_all_locations' can_access_all_locations %}

From 0f9fb223a147bfb4b233954649adaeb0886bd35a Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 20 Nov 2024 21:56:56 -0500
Subject: [PATCH 113/159] Migrated linked_domain

---
 .../apps/linked_domain/static/linked_domain/js/domain_links.js  | 1 +
 .../linked_domain/templates/linked_domain/domain_links.html     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/linked_domain/static/linked_domain/js/domain_links.js b/corehq/apps/linked_domain/static/linked_domain/js/domain_links.js
index ba2062349308..76af60e9bfff 100644
--- a/corehq/apps/linked_domain/static/linked_domain/js/domain_links.js
+++ b/corehq/apps/linked_domain/static/linked_domain/js/domain_links.js
@@ -9,6 +9,7 @@ hqDefine("linked_domain/js/domain_links", [
     'hqwebapp/js/components/pagination',
     'hqwebapp/js/components/search_box',
     'hqwebapp/js/select2_knockout_bindings.ko',     // selects2 for fields
+    'commcarehq',
 ], function (
     RMI,
     initialPageData,
diff --git a/corehq/apps/linked_domain/templates/linked_domain/domain_links.html b/corehq/apps/linked_domain/templates/linked_domain/domain_links.html
index 8ea71f981f9e..dbc683c75bdb 100644
--- a/corehq/apps/linked_domain/templates/linked_domain/domain_links.html
+++ b/corehq/apps/linked_domain/templates/linked_domain/domain_links.html
@@ -2,7 +2,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main "linked_domain/js/domain_links" %}
+{% js_entry_b3 "linked_domain/js/domain_links" %}
 
 {% block additional_initial_page_data %}
 {% initial_analytics_data 'appcues.linked_status' linked_status %}

From cf562cc05f2ac7db165f56ea680639827cb5393e Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Thu, 21 Nov 2024 14:21:49 -0500
Subject: [PATCH 114/159] use AppsAPI instead of appselect:getApp

---
 .../static/cloudcare/js/formplayer/utils/utils.js         | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
index 123e4cb58379..2b01bfb74d9f 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
@@ -8,6 +8,7 @@ hqDefine("cloudcare/js/formplayer/utils/utils", [
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/toggles',
     "cloudcare/js/formplayer/constants",
+    'cloudcare/js/formplayer/apps/api',
 ], function (
     $,
     _,
@@ -16,7 +17,8 @@ hqDefine("cloudcare/js/formplayer/utils/utils", [
     bootstrap,
     initialPageData,
     toggles,
-    constants
+    constants,
+    AppsAPI
 ) {
     var Utils = {};
 
@@ -452,7 +454,7 @@ hqDefine("cloudcare/js/formplayer/utils/utils", [
 
     Utils.setSyncInterval = function (appId, restartInterval) {
         hqRequire(["cloudcare/js/formplayer/app"], function (FormplayerFrontend) {
-            const currentApp = FormplayerFrontend.getChannel().request("appselect:getApp", appId);
+            const currentApp = AppsAPI.getAppEntity(appId);
             let customProperties = {};
             if (currentApp && currentApp.attributes && currentApp.attributes.profile) {
                 customProperties = currentApp.attributes.profile.custom_properties || {};
@@ -488,7 +490,7 @@ hqDefine("cloudcare/js/formplayer/utils/utils", [
             if (!FormplayerFrontend.syncInterval) {
                 FormplayerFrontend.syncInterval = setInterval(function () {
                     const urlObject = Utils.currentUrlToObject(),
-                        currentApp = FormplayerFrontend.getChannel().request("appselect:getApp", urlObject.appId);
+                        currentApp = AppsAPI.getAppEntity(appId);
                     let customProperties = {};
                     if (currentApp && currentApp.attributes && currentApp.attributes.profile) {
                         customProperties = currentApp.attributes.profile.custom_properties || {};

From 18d8c3aeada9b8b0e92c8b25ae439c5c737600e9 Mon Sep 17 00:00:00 2001
From: Minha <mlee@dimagi.com>
Date: Thu, 21 Nov 2024 14:32:52 -0500
Subject: [PATCH 115/159] Use defusedxml.parseString instead of
 etree.fromString

---
 corehq/messaging/smsbackends/push/views.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/corehq/messaging/smsbackends/push/views.py b/corehq/messaging/smsbackends/push/views.py
index 392a4dcb72ff..bfebae82f6b8 100644
--- a/corehq/messaging/smsbackends/push/views.py
+++ b/corehq/messaging/smsbackends/push/views.py
@@ -2,7 +2,9 @@
 from corehq.apps.sms.views import IncomingBackendView
 from corehq.messaging.smsbackends.push.models import PushBackend
 from django.http import HttpResponse, HttpResponseBadRequest
-from lxml import etree
+
+from defusedxml.minidom import parseString
+from xml.parsers.expat import ExpatError
 from xml.sax.saxutils import unescape
 
 
@@ -24,16 +26,16 @@ def get_number_and_message(self, request):
         number = None
         text = None
         try:
-            xml = etree.fromstring(request.body)
-        except etree.XMLSyntaxError:
+            xml = parseString(request.body).documentElement.childNodes
+        except (ExpatError, ValueError):
             return None, None
 
         for element in xml:
-            name = element.get('name')
+            name = element.getAttribute('name')
             if name == 'MobileNumber':
-                number = self.clean_value(element.text)
+                number = self.clean_value(element.childNodes[0].nodeValue)
             elif name == 'Text':
-                text = self.clean_value(element.text)
+                text = self.clean_value(element.childNodes[0].nodeValue)
 
         return number, text
 

From e6e1e16943f0fa020367132e73a3afaf01d04dc8 Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Thu, 21 Nov 2024 14:52:44 -0500
Subject: [PATCH 116/159] grab appId from urlObject

---
 .../cloudcare/static/cloudcare/js/formplayer/utils/utils.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
index 2b01bfb74d9f..8096a8285c64 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
@@ -490,7 +490,7 @@ hqDefine("cloudcare/js/formplayer/utils/utils", [
             if (!FormplayerFrontend.syncInterval) {
                 FormplayerFrontend.syncInterval = setInterval(function () {
                     const urlObject = Utils.currentUrlToObject(),
-                        currentApp = AppsAPI.getAppEntity(appId);
+                        currentApp = AppsAPI.getAppEntity(urlObject.appId);
                     let customProperties = {};
                     if (currentApp && currentApp.attributes && currentApp.attributes.profile) {
                         customProperties = currentApp.attributes.profile.custom_properties || {};

From e34cd50a5992efa41bd791701d2fe1dd7eea193b Mon Sep 17 00:00:00 2001
From: robert-costello <robertcostello81@gmail.com>
Date: Thu, 21 Nov 2024 15:01:43 -0500
Subject: [PATCH 117/159] remove unused import

---
 .../cloudcare/js/formplayer/utils/utils.js    | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
index 8096a8285c64..a90579a22496 100644
--- a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
+++ b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/utils.js
@@ -453,26 +453,24 @@ hqDefine("cloudcare/js/formplayer/utils/utils", [
     };
 
     Utils.setSyncInterval = function (appId, restartInterval) {
-        hqRequire(["cloudcare/js/formplayer/app"], function (FormplayerFrontend) {
-            const currentApp = AppsAPI.getAppEntity(appId);
-            let customProperties = {};
-            if (currentApp && currentApp.attributes && currentApp.attributes.profile) {
-                customProperties = currentApp.attributes.profile.custom_properties || {};
-            }
+        const currentApp = AppsAPI.getAppEntity(appId);
+        let customProperties = {};
+        if (currentApp && currentApp.attributes && currentApp.attributes.profile) {
+            customProperties = currentApp.attributes.profile.custom_properties || {};
+        }
 
-            const useAggressiveSyncTiming = (customProperties[constants.POST_FORM_SYNC] === "yes");
-            if (!useAggressiveSyncTiming) {
-                return;
-            }
+        const useAggressiveSyncTiming = (customProperties[constants.POST_FORM_SYNC] === "yes");
+        if (!useAggressiveSyncTiming) {
+            return;
+        }
 
-            const FIVE_MINUTES_IN_MILLISECONDS = 1000 * 60 * 5;
-            if (restartInterval) {
-                stopSyncInterval();
-                startSyncInterval(FIVE_MINUTES_IN_MILLISECONDS);
-            } else {
-                startSyncInterval(FIVE_MINUTES_IN_MILLISECONDS);
-            }
-        });
+        const FIVE_MINUTES_IN_MILLISECONDS = 1000 * 60 * 5;
+        if (restartInterval) {
+            stopSyncInterval();
+            startSyncInterval(FIVE_MINUTES_IN_MILLISECONDS);
+        } else {
+            startSyncInterval(FIVE_MINUTES_IN_MILLISECONDS);
+        }
     };
 
     function startSyncInterval(delayInMilliseconds) {

From 7c5c37ec4e54d043bbcc80cfb18c5fb83b91746c Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Thu, 21 Nov 2024 15:23:49 -0500
Subject: [PATCH 118/159] Improve UV_COMPILE_BYTECODE comment

---
 Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index e4b0288227e9..f24f03dbdbc7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,9 @@ ENV PYTHONUNBUFFERED=1 \
     NODE_VERSION=20.11.1 \
     UV_COMPILE_BYTECODE=1 \
     UV_LINK_MODE=copy
-# UV_COMPILE_BYTECODE: Compile bytecode during installation.
+# UV_COMPILE_BYTECODE: Compile bytecode during installation to improve module
+#   load performance. Also suppresses a couchdbkit syntax error that happens
+#   during bytecode compilation.
 # UV_LINK_MODE: Copy from the cache instead of linking since it's a mounted volume
 
 RUN mkdir /vendor

From d93ee6a421c04e7076e74235fafd0befae26ced8 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Thu, 21 Nov 2024 20:41:05 +0000
Subject: [PATCH 119/159] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../javascript/reports/js/edit_scheduled_report.js.diff.txt   | 2 +-
 .../reports/edit_scheduled_report.html.diff.txt               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/edit_scheduled_report.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/edit_scheduled_report.js.diff.txt
index fcf32c10d46a..9daa8f4e26a4 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/edit_scheduled_report.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/reports/js/edit_scheduled_report.js.diff.txt
@@ -13,4 +13,4 @@
 +    "hqwebapp/js/bootstrap5/widgets",  // autocomplete widget for email recipient list
      "jquery-ui/ui/widgets/datepicker",
      'hqwebapp/js/components/select_toggle',
- ], function (
+     "commcarehq",
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/edit_scheduled_report.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/edit_scheduled_report.html.diff.txt
index aecb03d706ef..89d21978d19e 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/edit_scheduled_report.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/reports/edit_scheduled_report.html.diff.txt
@@ -8,8 +8,8 @@
  {% load i18n %}
  
  
--{% requirejs_main 'reports/js/bootstrap3/edit_scheduled_report' %}
-+{% requirejs_main_b5 'reports/js/bootstrap5/edit_scheduled_report' %}
+-{% js_entry_b3 'reports/js/bootstrap3/edit_scheduled_report' %}
++{% js_entry 'reports/js/bootstrap5/edit_scheduled_report' %}
  
  {% block page_content %}
    {% initial_page_data 'is_configurable_map' is_configurable_map %}

From cf874e121c753dbd4b5de1771b68d63ec0949cdf Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Thu, 21 Nov 2024 17:23:35 -0500
Subject: [PATCH 120/159] Removed unused dependency

---
 corehq/apps/users/static/users/js/invite_web_user.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/corehq/apps/users/static/users/js/invite_web_user.js b/corehq/apps/users/static/users/js/invite_web_user.js
index e79a233ae7c8..8aea316662ee 100644
--- a/corehq/apps/users/static/users/js/invite_web_user.js
+++ b/corehq/apps/users/static/users/js/invite_web_user.js
@@ -3,7 +3,6 @@ hqDefine('users/js/invite_web_user',[
     'knockout',
     'hqwebapp/js/initial_page_data',
     'users/js/custom_data_fields',
-    'hqwebapp/js/toggles',
     'hqwebapp/js/bootstrap3/validators.ko',
     'locations/js/widgets',
     'commcarehq',
@@ -11,8 +10,7 @@ hqDefine('users/js/invite_web_user',[
     $,
     ko,
     initialPageData,
-    customDataFields,
-    toggles
+    customDataFields
 ) {
     'use strict';
 

From 41fc59737575a0f89fbce9812299532810595aa3 Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Thu, 21 Nov 2024 17:44:45 -0500
Subject: [PATCH 121/159] Fix uwsgi error in docker build

Exception: you need a C compiler to build uWSGI
---
 Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index f24f03dbdbc7..6550c161177d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,6 +25,7 @@ RUN apt-get update \
   && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
   && apt-get update \
   && apt-get install -y --no-install-recommends \
+     build-essential \
      bzip2 \
      default-jre \
      gettext \
@@ -37,6 +38,9 @@ RUN apt-get update \
      libxmlsec1-openssl \
      make \
   && rm -rf /var/lib/apt/lists/* /src/*.deb
+# build-essential allows uv to build uwsgi; increases image size by 240 MB
+# libpq-dev is for make-requirements-test.sh; increases image size by ~20 MB
+# libpq-dev can be replaced with libpq5 if pip-tools is replaced with uv in make-requirements-test.sh
 
 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" \
   && tar -xzf "node-v$NODE_VERSION-linux-x64.tar.gz" -C /usr/local --strip-components=1 \

From 7e280fcbea6499e4a8117a86e5faad4462e3241f Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Fri, 22 Nov 2024 09:14:43 -0500
Subject: [PATCH 122/159] Fixed paths to two_factor views

---
 corehq/apps/domain/decorators.py |  4 +++-
 corehq/apps/hqwebapp/views.py    |  2 +-
 corehq/apps/settings/views.py    | 12 ++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/corehq/apps/domain/decorators.py b/corehq/apps/domain/decorators.py
index dc7cd45da3af..2db12643563f 100644
--- a/corehq/apps/domain/decorators.py
+++ b/corehq/apps/domain/decorators.py
@@ -108,7 +108,9 @@ def call_view():
 
         if couch_user.is_member_of(domain_obj, allow_enterprise=True):
             if _is_missing_two_factor(view_func, req):
-                return TemplateResponse(request=req, template='two_factor/core/otp_required.html', status=403)
+                return TemplateResponse(request=req,
+                                        template='two_factor/core/bootstrap3/otp_required.html',
+                                        status=403)
             elif not _can_access_project_page(req):
                 return _redirect_to_project_access_upgrade(req)
             elif is_request_blocked_from_viewing_domain_due_to_sso(req, domain_obj):
diff --git a/corehq/apps/hqwebapp/views.py b/corehq/apps/hqwebapp/views.py
index 000d468be309..b3355e332345 100644
--- a/corehq/apps/hqwebapp/views.py
+++ b/corehq/apps/hqwebapp/views.py
@@ -207,7 +207,7 @@ def redirect_to_default(req, domain=None):
     if domain and _two_factor_needed(domain, req):
         return TemplateResponse(
             request=req,
-            template='two_factor/core/otp_required.html',
+            template='two_factor/core/bootstrap3/otp_required.html',
             status=403,
         )
 
diff --git a/corehq/apps/settings/views.py b/corehq/apps/settings/views.py
index c4a25144cc36..95a8b81cfabb 100644
--- a/corehq/apps/settings/views.py
+++ b/corehq/apps/settings/views.py
@@ -368,7 +368,7 @@ def post(self, request, *args, **kwargs):
 
 class TwoFactorProfileView(BaseMyAccountView, ProfileView):
     urlname = 'two_factor_settings'
-    template_name = 'two_factor/profile/profile.html'
+    template_name = 'two_factor/profile/bootstrap3/profile.html'
     page_title = gettext_lazy("Two Factor Authentication")
 
     @method_decorator(active_domains_required)
@@ -400,7 +400,7 @@ def get_context_data(self, **kwargs):
 
 class TwoFactorSetupView(BaseMyAccountView, SetupView):
     urlname = 'two_factor_setup'
-    template_name = 'two_factor/core/setup.html'
+    template_name = 'two_factor/core/bootstrap3/setup.html'
     page_title = gettext_lazy("Two Factor Authentication Setup")
 
     form_list = (
@@ -434,7 +434,7 @@ def get_form_list(self):
 
 class TwoFactorSetupCompleteView(BaseMyAccountView, SetupCompleteView):
     urlname = 'two_factor_setup_complete'
-    template_name = 'two_factor/core/setup_complete.html'
+    template_name = 'two_factor/core/bootstrap3/setup_complete.html'
     page_title = gettext_lazy("Two Factor Authentication Setup Complete")
 
     @method_decorator(login_required)
@@ -451,7 +451,7 @@ def page_context(self):
 
 class TwoFactorBackupTokensView(BaseMyAccountView, BackupTokensView):
     urlname = 'two_factor_backup_tokens'
-    template_name = 'two_factor/core/backup_tokens.html'
+    template_name = 'two_factor/core/bootstrap3/backup_tokens.html'
     page_title = gettext_lazy("Two Factor Authentication Backup Tokens")
 
     @method_decorator(login_required)
@@ -478,7 +478,7 @@ def _show_link_to_webapps(user):
 
 class TwoFactorDisableView(BaseMyAccountView, DisableView):
     urlname = 'two_factor_disable'
-    template_name = 'two_factor/profile/disable.html'
+    template_name = 'two_factor/profile/bootstrap3/disable.html'
     page_title = gettext_lazy("Remove Two-Factor Authentication")
 
     @method_decorator(login_required)
@@ -492,7 +492,7 @@ def get(self, request, *args, **kwargs):
 
 class TwoFactorPhoneSetupView(BaseMyAccountView, PhoneSetupView):
     urlname = 'two_factor_phone_setup'
-    template_name = 'two_factor/core/phone_register.html'
+    template_name = 'two_factor/core/bootstrap3/phone_register.html'
     page_title = gettext_lazy("Two Factor Authentication Phone Setup")
 
     form_list = (

From 2626fe7db5ade3f623ed966eb4c53acf7fce9a09 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Fri, 22 Nov 2024 14:14:57 +0000
Subject: [PATCH 123/159] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../domain/internal_subscription_management.html.diff.txt      | 2 +-
 .../domain/js/internal_subscription_management.js.diff.txt     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_subscription_management.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_subscription_management.html.diff.txt
index cd248e504334..dbf9733f86e8 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_subscription_management.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/internal_subscription_management.html.diff.txt
@@ -7,7 +7,7 @@
  {% load crispy_forms_tags %}
  {% load hq_shared_tags %}
  
--{% requirejs_main 'domain/js/bootstrap3/internal_subscription_management' %}
+-{% js_entry_b3 'domain/js/bootstrap3/internal_subscription_management' %}
 +{% requirejs_main_b5 'domain/js/bootstrap5/internal_subscription_management' %}
  
  {% block page_content %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/internal_subscription_management.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/internal_subscription_management.js.diff.txt
index 9867b1fe1943..8306209a5355 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/internal_subscription_management.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/domain/js/internal_subscription_management.js.diff.txt
@@ -1,11 +1,12 @@
 --- 
 +++ 
-@@ -1,7 +1,7 @@
+@@ -1,8 +1,7 @@
 -hqDefine('domain/js/bootstrap3/internal_subscription_management', [
 +hqDefine('domain/js/bootstrap5/internal_subscription_management', [
      'jquery',
      'knockout',
 -    'hqwebapp/js/bootstrap3/widgets',
+-    'commcarehq',
 +    'hqwebapp/js/bootstrap5/widgets',
  ], function (
      $,

From 3620754a9d82af324bd98c949088de85f1bb2418 Mon Sep 17 00:00:00 2001
From: Ethan Soergel <esoergel@gmail.com>
Date: Fri, 22 Nov 2024 09:53:00 -0500
Subject: [PATCH 124/159] Use dedicated index for fixture where available

---
 corehq/apps/case_search/fixtures.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/case_search/fixtures.py b/corehq/apps/case_search/fixtures.py
index 5414c42f2ca5..60a956cb2152 100644
--- a/corehq/apps/case_search/fixtures.py
+++ b/corehq/apps/case_search/fixtures.py
@@ -5,6 +5,7 @@
 from corehq import extensions
 from corehq.apps.case_search.exceptions import CaseFilterError
 from corehq.apps.case_search.filter_dsl import build_filter_from_xpath
+from corehq.apps.case_search.models import CaseSearchConfig
 from corehq.apps.es.case_search import CaseSearchES
 from corehq.messaging.templating import (
     MessagingTemplateRenderer,
@@ -37,12 +38,12 @@ def custom_csql_fixture_context(domain, restore_user):
     '''Register custom template params to be available in CSQL templates'''
 
 
-def _run_query(domain, csql):
+def _run_query(domain, csql, index):
     try:
         filter_ = build_filter_from_xpath(csql, domain=domain)
     except CaseFilterError:
         return "ERROR"
-    return str(CaseSearchES()
+    return str(CaseSearchES(index=index or None)
                .domain(domain)
                .filter(filter_)
                .count())
@@ -51,12 +52,20 @@ def _run_query(domain, csql):
 def _get_indicator_nodes(restore_state, indicators):
     with restore_state.timing_context('_get_template_renderer'):
         renderer = _get_template_renderer(restore_state.restore_user)
+    index = _get_index(restore_state.domain)
     for name, csql_template in indicators:
         with restore_state.timing_context(name):
-            value = _run_query(restore_state.domain, renderer.render(csql_template))
+            value = _run_query(restore_state.domain, renderer.render(csql_template), index)
         yield E.value(value, name=name)
 
 
+def _get_index(domain):
+    return (CaseSearchConfig.objects
+            .filter(domain=domain)
+            .values_list('index_name', flat=True)
+            .first()) or None
+
+
 class CaseSearchFixtureProvider(FixtureProvider):
     id = 'case-search-fixture'
     ignore_skip_fixtures_flag = True

From 80e642e6f129d2cd1923deae929db8d28d42dd93 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Fri, 22 Nov 2024 11:33:54 -0500
Subject: [PATCH 125/159] Added comment to new config

---
 webpack/webpack.b3.common.js | 2 +-
 webpack/webpack.common.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webpack/webpack.b3.common.js b/webpack/webpack.b3.common.js
index 2295e427c30e..0253e96f0b15 100644
--- a/webpack/webpack.b3.common.js
+++ b/webpack/webpack.b3.common.js
@@ -14,7 +14,7 @@ module.exports = Object.assign({}, commonDefault, {
         new webpack.ProvidePlugin({
             '$': 'jquery',
             'jQuery': 'jquery',  // needed for bootstrap 3 to work
-            'window.jQuery': 'jquery',
+            'window.jQuery': 'jquery',  // needed for some third-party libraries that depend on jQuery, such as multiselect
         }),
         new hqPlugins.EntryChunksPlugin({
             filename: 'manifest_b3.json',
diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js
index c017e1da05eb..301619a33bbb 100644
--- a/webpack/webpack.common.js
+++ b/webpack/webpack.common.js
@@ -85,7 +85,7 @@ module.exports = {
         new webpack.ProvidePlugin({
             '$': 'jquery',
             'jQuery': 'jquery',  // needed for bootstrap to work
-            'window.jQuery': 'jquery',
+            'window.jQuery': 'jquery',  // needed for some third-party libraries that depend on jQuery, such as multiselect
         }),
         new hqPlugins.EntryChunksPlugin(),
     ],

From 69ef32a930e774ffc265809151bf04abe47b20b8 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Fri, 22 Nov 2024 11:45:57 -0500
Subject: [PATCH 126/159] Updated search to be case-insensitive

---
 corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js b/corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
index b08770171fc8..bc69c2d42692 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
@@ -100,9 +100,10 @@ hqDefine('hqwebapp/js/multiselect_utils', [
                     selectionSearchString = '#' + that.$container.attr('id') + ' .ms-elem-selection.ms-selected';
 
                 const _search = function (query, itemSelector) {
+                    query = query.toLowerCase();
                     $(itemSelector).each(function (index, item) {
                         const $item = $(item);
-                        if (!query || $item.text().indexOf(query) !== -1) {
+                        if (!query || $item.text().toLowerCase().indexOf(query) !== -1) {
                             $item.removeClass(window.USE_BOOTSTRAP5 ? "d-none" : "hide");
                         } else {
                             $item.addClass(window.USE_BOOTSTRAP5 ? "d-none" : "hide");

From 341d4df36716c929e6cc5dd65d8da1929bb22d98 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Fri, 22 Nov 2024 11:52:19 -0500
Subject: [PATCH 127/159] Added support for multi-term searches

---
 .../hqwebapp/static/hqwebapp/js/multiselect_utils.js  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js b/corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
index bc69c2d42692..3b9e504473e0 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/multiselect_utils.js
@@ -100,10 +100,15 @@ hqDefine('hqwebapp/js/multiselect_utils', [
                     selectionSearchString = '#' + that.$container.attr('id') + ' .ms-elem-selection.ms-selected';
 
                 const _search = function (query, itemSelector) {
-                    query = query.toLowerCase();
+                    const queries = (query || '').toLowerCase().split(/\s+/);
                     $(itemSelector).each(function (index, item) {
-                        const $item = $(item);
-                        if (!query || $item.text().toLowerCase().indexOf(query) !== -1) {
+                        const $item = $(item),
+                            itemText = $item.text().toLowerCase();
+                        let found = _.every(queries, function (q) {
+                            return !q || itemText.indexOf(q) !== -1;
+                        });
+
+                        if (found) {
                             $item.removeClass(window.USE_BOOTSTRAP5 ? "d-none" : "hide");
                         } else {
                             $item.addClass(window.USE_BOOTSTRAP5 ? "d-none" : "hide");

From e916560d502cbb68a8038546fc134d1403cf4051 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Fri, 22 Nov 2024 13:35:46 -0500
Subject: [PATCH 128/159] Migrated groups pages

---
 corehq/apps/groups/static/groups/js/all_groups.js      | 1 +
 corehq/apps/groups/static/groups/js/group_members.js   | 1 +
 corehq/apps/groups/templates/groups/all_groups.html    | 3 ++-
 corehq/apps/groups/templates/groups/group_members.html | 4 ++--
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/groups/static/groups/js/all_groups.js b/corehq/apps/groups/static/groups/js/all_groups.js
index 6e1813221973..7b0c01197ad0 100644
--- a/corehq/apps/groups/static/groups/js/all_groups.js
+++ b/corehq/apps/groups/static/groups/js/all_groups.js
@@ -5,6 +5,7 @@ hqDefine("groups/js/all_groups", [
     'es6!hqwebapp/js/bootstrap5_loader',
     // Just importing main.py so the post-link function is accessible, function parameter not needed
     'hqwebapp/js/bootstrap5/main',
+    'commcarehq',
 ], function (
     $,
     googleAnalytics,
diff --git a/corehq/apps/groups/static/groups/js/group_members.js b/corehq/apps/groups/static/groups/js/group_members.js
index d231895909db..8f7bd45c2884 100644
--- a/corehq/apps/groups/static/groups/js/group_members.js
+++ b/corehq/apps/groups/static/groups/js/group_members.js
@@ -9,6 +9,7 @@ hqDefine("groups/js/group_members", [
     "hqwebapp/js/ui_elements/bootstrap5/ui-element-key-val-list",
     "hqwebapp/js/select_2_ajax_widget",     // "Group Membership" select2
     "hqwebapp/js/components/select_toggle",            // select toggle for "Edit Setings" popup
+    "commcarehq",
 ], function (
     $,
     _,
diff --git a/corehq/apps/groups/templates/groups/all_groups.html b/corehq/apps/groups/templates/groups/all_groups.html
index 17c669dc89ce..021d84ea19ac 100644
--- a/corehq/apps/groups/templates/groups/all_groups.html
+++ b/corehq/apps/groups/templates/groups/all_groups.html
@@ -1,7 +1,8 @@
 {% extends "hqwebapp/bootstrap5/base_section.html" %}
 {% load i18n %}
 {% load hq_shared_tags %}
-{% requirejs_main_b5 "groups/js/all_groups" %}
+
+{% js_entry "groups/js/all_groups" %}
 
 {% block page_title %}
   {% trans "Groups" %}
diff --git a/corehq/apps/groups/templates/groups/group_members.html b/corehq/apps/groups/templates/groups/group_members.html
index 2544ab3d52bc..d9d279001254 100644
--- a/corehq/apps/groups/templates/groups/group_members.html
+++ b/corehq/apps/groups/templates/groups/group_members.html
@@ -11,7 +11,7 @@
   </style>
 {% endblock %}
 
-{% requirejs_main_b5 "groups/js/group_members" %}
+{% js_entry "groups/js/group_members" %}
 
 {% block page_title %}
   {% if request.is_view_only %}
@@ -81,7 +81,7 @@
                   data-html="true"
                   data-content="{% blocktrans %}
                         For all active mobile workers in this group, and for each phone number, this will
-                        initiate an SMS verification workflow. When a user replies to the SMS< their phone
+                        initiate an SMS verification workflow. When a user replies to the SMS, their phone
                         number will be verified.<br><br>If the phone number is already verified or
                         if the phone number is already in use by another contact in the system, nothing
                         will happen. If the phone number is pending verification, the verification SMS

From b45ca36fdcefd9b00339287e3eb9e29dc1d62d79 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Fri, 22 Nov 2024 13:47:27 -0500
Subject: [PATCH 129/159] Added datatables aliases and migration chat contacts
 page

---
 corehq/apps/sms/static/sms/js/chat_contacts.js   | 1 +
 corehq/apps/sms/templates/sms/chat_contacts.html | 2 +-
 webpack/webpack.b3.common.js                     | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/sms/static/sms/js/chat_contacts.js b/corehq/apps/sms/static/sms/js/chat_contacts.js
index 5ee8b23e0b9f..288e1df5bb01 100644
--- a/corehq/apps/sms/static/sms/js/chat_contacts.js
+++ b/corehq/apps/sms/static/sms/js/chat_contacts.js
@@ -4,6 +4,7 @@ hqDefine('sms/js/chat_contacts', [
     'underscore',
     'hqwebapp/js/initial_page_data',
     'datatables.bootstrap',
+    'commcarehq',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/sms/templates/sms/chat_contacts.html b/corehq/apps/sms/templates/sms/chat_contacts.html
index f993516b6094..e069b02a7df8 100644
--- a/corehq/apps/sms/templates/sms/chat_contacts.html
+++ b/corehq/apps/sms/templates/sms/chat_contacts.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 
-{% requirejs_main 'sms/js/chat_contacts' %}
+{% js_entry_b3 'sms/js/chat_contacts' %}
 
 {% block page_content %}
   {% registerurl "chat_contact_list" domain %}
diff --git a/webpack/webpack.b3.common.js b/webpack/webpack.b3.common.js
index 0253e96f0b15..3764dc4a6d10 100644
--- a/webpack/webpack.b3.common.js
+++ b/webpack/webpack.b3.common.js
@@ -24,6 +24,8 @@ module.exports = Object.assign({}, commonDefault, {
     resolve: {
         alias: Object.assign({}, commonDefault.resolve.alias, {
             "commcarehq": path.resolve(utils.getStaticPathForApp('hqwebapp', 'js/bootstrap3/'), 'commcarehq'),
+            "datatables": "datatables.net/js/jquery.dataTables.min",
+            "datatables.bootstrap": "datatables-bootstrap3/BS3/assets/js/datatables",
         }),
     },
 

From fe9dbb2f458fe9e5c8d223d2a2ebd60e0a760f44 Mon Sep 17 00:00:00 2001
From: Minha <mlee@dimagi.com>
Date: Fri, 22 Nov 2024 13:50:58 -0500
Subject: [PATCH 130/159] Fix for test

---
 corehq/messaging/smsbackends/push/views.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/corehq/messaging/smsbackends/push/views.py b/corehq/messaging/smsbackends/push/views.py
index bfebae82f6b8..d12a4f19fdda 100644
--- a/corehq/messaging/smsbackends/push/views.py
+++ b/corehq/messaging/smsbackends/push/views.py
@@ -4,6 +4,7 @@
 from django.http import HttpResponse, HttpResponseBadRequest
 
 from defusedxml.minidom import parseString
+from xml.dom import Node
 from xml.parsers.expat import ExpatError
 from xml.sax.saxutils import unescape
 
@@ -31,11 +32,12 @@ def get_number_and_message(self, request):
             return None, None
 
         for element in xml:
-            name = element.getAttribute('name')
-            if name == 'MobileNumber':
-                number = self.clean_value(element.childNodes[0].nodeValue)
-            elif name == 'Text':
-                text = self.clean_value(element.childNodes[0].nodeValue)
+            if element.nodeType == Node.ELEMENT_NODE:
+                name = element.getAttribute('name')
+                if name == 'MobileNumber':
+                    number = self.clean_value(element.childNodes[0].nodeValue)
+                elif name == 'Text':
+                    text = self.clean_value(element.childNodes[0].nodeValue)
 
         return number, text
 

From 9a30b0f30675b5349cc1034de8a600cb56c5645a Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Fri, 22 Nov 2024 14:43:59 -0500
Subject: [PATCH 131/159] Moved ko component templates and demo modals above js
 in base.html

All HTML should be above the start of js in this template.
This was causing the feature flags page to throw an error about the select-toggle
template not being found.
---
 .../hqwebapp/templates/hqwebapp/base.html     | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/base.html b/corehq/apps/hqwebapp/templates/hqwebapp/base.html
index 9e3628f52ba2..7c124e8154d2 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/base.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/base.html
@@ -305,6 +305,29 @@
       {% endblock %}
     </div>
 
+    {% if is_demo_visible %}
+      {% if use_bootstrap5 %}
+        {% include "hqwebapp/partials/bootstrap5/get_demo_modals.html" %}
+      {% else %}
+        {% include "hqwebapp/partials/bootstrap3/get_demo_modals.html" %}
+      {% endif %}
+    {% endif %}
+
+    {# Knockout component templates #}
+    {% if use_bootstrap5 %}
+      {% include 'hqwebapp/partials/bootstrap5/ko_pagination.html' %}
+      {% include 'hqwebapp/partials/bootstrap5/ko_inline_edit.html' %}
+      {% include 'hqwebapp/partials/bootstrap5/ko_search_box.html' %}
+      {% include 'hqwebapp/partials/bootstrap5/ko_select_toggle.html' %}
+      {% include 'hqwebapp/partials/bootstrap5/ko_feedback.html' %}
+    {% else %}
+      {% include 'hqwebapp/partials/bootstrap3/ko_pagination.html' %}
+      {% include 'hqwebapp/partials/bootstrap3/ko_inline_edit.html' %}
+      {% include 'hqwebapp/partials/bootstrap3/ko_search_box.html' %}
+      {% include 'hqwebapp/partials/bootstrap3/ko_select_toggle.html' %}
+      {% include 'hqwebapp/partials/bootstrap3/ko_feedback.html' %}
+    {% endif %}
+
     {# javascript below this line #}
 
     {% include "hqwebapp/partials/requirejs.html" with BASE_MAIN=True %}
@@ -421,29 +444,6 @@
       {% endif %}
     {% endif %}
 
-    {% if is_demo_visible %}
-      {% if use_bootstrap5 %}
-        {% include "hqwebapp/partials/bootstrap5/get_demo_modals.html" %}
-      {% else %}
-        {% include "hqwebapp/partials/bootstrap3/get_demo_modals.html" %}
-      {% endif %}
-    {% endif %}
-
-    {# Knockout component templates #}
-    {% if use_bootstrap5 %}
-      {% include 'hqwebapp/partials/bootstrap5/ko_pagination.html' %}
-      {% include 'hqwebapp/partials/bootstrap5/ko_inline_edit.html' %}
-      {% include 'hqwebapp/partials/bootstrap5/ko_search_box.html' %}
-      {% include 'hqwebapp/partials/bootstrap5/ko_select_toggle.html' %}
-      {% include 'hqwebapp/partials/bootstrap5/ko_feedback.html' %}
-    {% else %}
-      {% include 'hqwebapp/partials/bootstrap3/ko_pagination.html' %}
-      {% include 'hqwebapp/partials/bootstrap3/ko_inline_edit.html' %}
-      {% include 'hqwebapp/partials/bootstrap3/ko_search_box.html' %}
-      {% include 'hqwebapp/partials/bootstrap3/ko_select_toggle.html' %}
-      {% include 'hqwebapp/partials/bootstrap3/ko_feedback.html' %}
-    {% endif %}
-
     {% if show_overdue_invoice_modal and not use_js_bundler %}
       {% if use_bootstrap5 %}
         <script src="{% static 'hqwebapp/js/bootstrap5/downgrade_modal.js' %}"></script>

From 667f188fc4e7631c613dbe5c9832437faca51fb2 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Fri, 22 Nov 2024 14:51:19 -0500
Subject: [PATCH 132/159] Migrated toggle_ui app

---
 corehq/apps/toggle_ui/static/toggle_ui/js/edit-flag.js | 1 +
 corehq/apps/toggle_ui/static/toggle_ui/js/flags.js     | 1 +
 corehq/apps/toggle_ui/templates/toggle/edit_flag.html  | 2 +-
 corehq/apps/toggle_ui/templates/toggle/flags.html      | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/toggle_ui/static/toggle_ui/js/edit-flag.js b/corehq/apps/toggle_ui/static/toggle_ui/js/edit-flag.js
index 748eae578d77..07e115a0b37c 100644
--- a/corehq/apps/toggle_ui/static/toggle_ui/js/edit-flag.js
+++ b/corehq/apps/toggle_ui/static/toggle_ui/js/edit-flag.js
@@ -5,6 +5,7 @@ hqDefine('toggle_ui/js/edit-flag', [
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/bootstrap3/main',
     'hqwebapp/js/bootstrap3/knockout_bindings.ko',     // save button
+    'commcarehq',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/toggle_ui/static/toggle_ui/js/flags.js b/corehq/apps/toggle_ui/static/toggle_ui/js/flags.js
index 4916f1d1f409..bd08471256f1 100644
--- a/corehq/apps/toggle_ui/static/toggle_ui/js/flags.js
+++ b/corehq/apps/toggle_ui/static/toggle_ui/js/flags.js
@@ -5,6 +5,7 @@ hqDefine('toggle_ui/js/flags', [
     'hqwebapp/js/bootstrap3/alert_user',
     'reports/js/bootstrap3/config.dataTables.bootstrap',
     'hqwebapp/js/components/select_toggle',
+    'commcarehq',
 ], function (
     $,
     ko,
diff --git a/corehq/apps/toggle_ui/templates/toggle/edit_flag.html b/corehq/apps/toggle_ui/templates/toggle/edit_flag.html
index cc2ea8322c6a..a6dbb5b1bfca 100644
--- a/corehq/apps/toggle_ui/templates/toggle/edit_flag.html
+++ b/corehq/apps/toggle_ui/templates/toggle/edit_flag.html
@@ -3,7 +3,7 @@
 {% load hq_shared_tags %}
 {% load compress %}
 
-{% requirejs_main 'toggle_ui/js/edit-flag' %}
+{% js_entry_b3 'toggle_ui/js/edit-flag' %}
 
 {% block title %}{% trans "Edit Feature Flag: " %}{{ static_toggle.label }}{% endblock %}
 
diff --git a/corehq/apps/toggle_ui/templates/toggle/flags.html b/corehq/apps/toggle_ui/templates/toggle/flags.html
index 16de14949d00..f5b9ac5bfe23 100644
--- a/corehq/apps/toggle_ui/templates/toggle/flags.html
+++ b/corehq/apps/toggle_ui/templates/toggle/flags.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 
-{% requirejs_main 'toggle_ui/js/flags' %}
+{% js_entry_b3 'toggle_ui/js/flags' %}
 
 {% block stylesheets %}{{ block.super }}
   <style>

From 02b94956834903c840a85ccbd8019131f2805106 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Fri, 22 Nov 2024 14:57:04 -0500
Subject: [PATCH 133/159] Migrate manage lookup tables page

---
 corehq/apps/fixtures/static/fixtures/js/lookup-manage.js   | 1 +
 corehq/apps/fixtures/templates/fixtures/manage_tables.html | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/corehq/apps/fixtures/static/fixtures/js/lookup-manage.js b/corehq/apps/fixtures/static/fixtures/js/lookup-manage.js
index a20193a968d3..836871ba896c 100644
--- a/corehq/apps/fixtures/static/fixtures/js/lookup-manage.js
+++ b/corehq/apps/fixtures/static/fixtures/js/lookup-manage.js
@@ -9,6 +9,7 @@ hqDefine("fixtures/js/lookup-manage", [
     "hqwebapp/js/initial_page_data",
     "hqwebapp/js/bootstrap3/hq.helpers",
     "hqwebapp/js/bootstrap3/knockout_bindings.ko",
+    "commcarehq",
 ], function (
     $,
     _,
diff --git a/corehq/apps/fixtures/templates/fixtures/manage_tables.html b/corehq/apps/fixtures/templates/fixtures/manage_tables.html
index 00ad06822d08..7444f499eb8d 100644
--- a/corehq/apps/fixtures/templates/fixtures/manage_tables.html
+++ b/corehq/apps/fixtures/templates/fixtures/manage_tables.html
@@ -1,7 +1,8 @@
 {% extends 'fixtures/fixtures_base.html' %}
 {% load hq_shared_tags %}
 {% load i18n %}
-{% requirejs_main "fixtures/js/lookup-manage" %}
+
+{% js_entry_b3 "fixtures/js/lookup-manage" %}
 
 {% block page_title %}
   {% trans 'Manage Tables' %}

From d863c0132707c5fd8fd1575cae426462b687f713 Mon Sep 17 00:00:00 2001
From: Ethan Soergel <esoergel@gmail.com>
Date: Fri, 22 Nov 2024 14:55:08 -0500
Subject: [PATCH 134/159] Apply this restriction uniformly

restore_state.params.is_webapps - Normal restores from mobile devices
are app aware, and should hit the first branch of this conditional.
Further, this feature flag is only used by two projects, both USH, both
webapps only, so I'm not super concerned about knock-on effects.  I
think this is also a better fallback mechanism anyways - defaulting to
the more restrictive/secure option where there's doubt.

not restore_user.request_user.can_view_apps(restore_user.domain) - this
one is trickier.  The original logic for having this line here was
because app builders can access live preview, and from there they can
log in as any user, including those that don't have access to the app.
This I'd consider a bug, honestly, but I do think a better way to deal
with that situation is to _exclude_ the report fixtures from the
restricted restore user.  If an app builder tests an app with a user
that doesn't have access to a report fixture, they shouldn't have the
fixture either, so the app fails in the same way.  This will also be
useful in testing performance, as mobile UCR syncs will be the same
whether logged in directly as a user or using login-as with the same
user.  Another way this could fail is with app builders testing an app
they don't have access to without using login as.  This type of failure
feels similar to other considerations in user provisioning, such as
location assignment and user data setup.  It's reasonable to expect app
builders to test with a properly provisioned user.
---
 corehq/apps/app_manager/fixtures/mobile_ucr.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/corehq/apps/app_manager/fixtures/mobile_ucr.py b/corehq/apps/app_manager/fixtures/mobile_ucr.py
index dd557a7752a2..36842704397d 100644
--- a/corehq/apps/app_manager/fixtures/mobile_ucr.py
+++ b/corehq/apps/app_manager/fixtures/mobile_ucr.py
@@ -139,12 +139,7 @@ def _get_apps(self, restore_state, restore_user):
 
         if app_aware_sync_app:
             apps = [app_aware_sync_app]
-        elif (
-            toggles.RESTORE_ACCESSIBLE_REPORTS_ONLY.enabled(restore_user.domain)
-            and restore_state.params.is_webapps
-            # only way to reliably know that this is a web apps restore, not live preview
-            and not restore_user.request_user.can_view_apps(restore_user.domain)
-        ):
+        elif toggles.RESTORE_ACCESSIBLE_REPORTS_ONLY.enabled(restore_user.domain):
             apps = []
             for app in get_web_apps_available_to_user(restore_user.domain, restore_user._couch_user):
                 if not is_remote_app(app):

From facc17efd5671f706a29e9f0712e68408731c1c2 Mon Sep 17 00:00:00 2001
From: Daniel Roberts <droberts@dimagi.com>
Date: Fri, 22 Nov 2024 15:39:54 -0600
Subject: [PATCH 135/159] Add "backend_hq_api_id" to metrics

This is the particular integration plugin used to configure the gateway
e.g. TWILIO, TURN, TELERIVET, etc. Currently metrics only tagged with domain and arbitrary "name"
---
 corehq/apps/sms/api.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/corehq/apps/sms/api.py b/corehq/apps/sms/api.py
index 3bbae9c65008..03e21748ea3c 100644
--- a/corehq/apps/sms/api.py
+++ b/corehq/apps/sms/api.py
@@ -325,7 +325,7 @@ def send_message_via_backend(msg, backend=None, orig_phone_number=None):
             metrics_counter("commcare.sms.outbound_message", tags={
                 'domain': msg.domain,
                 'status': 'ok',
-                'backend': _get_backend_tag(backend),
+                **_get_backend_tags(backend)
             })
         else:
             raise BackendAuthorizationException(
@@ -340,7 +340,7 @@ def send_message_via_backend(msg, backend=None, orig_phone_number=None):
         metrics_counter("commcare.sms.outbound_message", tags={
             'domain': msg.domain,
             'status': 'error',
-            'backend': _get_backend_tag(backend),
+            **_get_backend_tags(backend),
         })
         should_log_exception = True
 
@@ -354,7 +354,7 @@ def send_message_via_backend(msg, backend=None, orig_phone_number=None):
 
 
 @quickcache(['backend_id'], skip_arg='backend')
-def _get_backend_tag(backend=None, backend_id=None):
+def _get_backend_tags(backend=None, backend_id=None):
     assert not (backend_id and backend)
     if backend_id:
         try:
@@ -363,11 +363,15 @@ def _get_backend_tag(backend=None, backend_id=None):
             backend = None
 
     if not backend:
-        return 'unknown'
-    elif backend.is_global:
-        return backend.name
+        return {
+            'backend': 'unknown',
+            'backend_hq_api_id': 'unknown',
+        }
     else:
-        return f'{backend.domain}/{backend.name}'
+        return {
+            'backend': backend.name if backend.is_global else f'{backend.domain}/{backend.name}',
+            'backend_hq_api_id': backend.hq_api_id,
+        }
 
 
 def should_log_exception_for_backend(backend, exception):
@@ -699,8 +703,8 @@ def process_incoming(msg):
         # - always report the metric even if it fails
         metrics_counter("commcare.sms.inbound_message", tags={
             'domain': msg.domain,
-            'backend': _get_backend_tag(backend_id=msg.backend_id),
             'status': status,
+            **_get_backend_tags(backend_id=msg.backend_id),
         })
 
 

From 9b7d7484b01f899f81944a872943bae2a63890b2 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Fri, 22 Nov 2024 16:50:34 -0500
Subject: [PATCH 136/159] Fixed lint errors

---
 .../static/fixtures/js/lookup-manage.js       | 74 ++++++++++---------
 1 file changed, 38 insertions(+), 36 deletions(-)

diff --git a/corehq/apps/fixtures/static/fixtures/js/lookup-manage.js b/corehq/apps/fixtures/static/fixtures/js/lookup-manage.js
index 836871ba896c..1fbe03981422 100644
--- a/corehq/apps/fixtures/static/fixtures/js/lookup-manage.js
+++ b/corehq/apps/fixtures/static/fixtures/js/lookup-manage.js
@@ -63,7 +63,7 @@ hqDefine("fixtures/js/lookup-manage", [
 
     function makeDataType(o, app) {
         var self = ko.mapping.fromJS(o),
-            raw_fields = self.fields();
+            rawFields = self.fields();
         self.original_tag = self.tag();
         self.original_visibility = self.is_global();
         self.isVisible = ko.observable(true);
@@ -77,7 +77,7 @@ hqDefine("fixtures/js/lookup-manage", [
         }, self);
         self.aboutToDelete = ko.observable(false);
         self.addField = function (data, event, o) {
-            var i, field;
+            var field;
             if (o) {
                 field = {
                     tag: ko.observable(o.tag),
@@ -98,7 +98,8 @@ hqDefine("fixtures/js/lookup-manage", [
                 };
             }
             field.isDuplicate = ko.computed(function () {
-                var j, noRepeats = true;
+                var j,
+                    noRepeats = true;
                 var curVal = field.tag();
                 for (j = 0; j < self.fields().length; j += 1) {
                     var thatField = self.fields()[j];
@@ -117,18 +118,18 @@ hqDefine("fixtures/js/lookup-manage", [
                 return curVal.startsWith('xml');
             });
             field.remove_if_new = function () {
-                if (field.is_new() == true) {
+                if (field.is_new()) {
                     self.fields.remove(field);
                 }
             };
             self.fields.push(field);
         };
-        for (var i = 0; i < raw_fields.length; i += 1) {
-            var tag = raw_fields[i].name();
-            var with_props = !!raw_fields[i].properties().length;
+        for (var i = 0; i < rawFields.length; i += 1) {
+            var tag = rawFields[i].name();
+            var withProps = !!rawFields[i].properties().length;
             self.addField(undefined, undefined, {
                 tag: tag,
-                with_props: with_props,
+                with_props: withProps,
             });
         }
 
@@ -145,13 +146,13 @@ hqDefine("fixtures/js/lookup-manage", [
                 data: JSON.stringify(self.serialize()),
                 dataType: 'json',
                 error: function (data) {
-                    var error_message;
-                    if (data.responseText == "DuplicateFixture") {
-                        error_message = "Can not create table with ID '" + self.tag() + "'. Table IDs should be unique.";
+                    var errorMessage;
+                    if (data.responseText === "DuplicateFixture") {
+                        errorMessage = _.template(gettext("Can not create table with ID '<% tag %>'. Table IDs should be unique."))({ tag: self.tag() });
                     } else {
-                        error_message = somethingWentWrong;
+                        errorMessage = somethingWentWrong;
                     }
-                    $("#FailText").text(error_message);
+                    $("#FailText").text(errorMessage);
                     $("#editFailure").removeClass('hide');
                     self.cancel();
                     self.saveState('saved');
@@ -223,13 +224,14 @@ hqDefine("fixtures/js/lookup-manage", [
                 is_global: self.is_global(),
                 description: self.description(),
                 fields: (function () {
-                    var fields = {},
-                        i;
-                    for (i = 0; i < self.fields().length; i += 1) {
+                    var fields = {};
+                    for (var i = 0; i < self.fields().length; i += 1) {
                         var field = self.fields()[i];
                         var patch;
-                        if (field.is_new() == true) {
-                            if (field.remove() == true) continue;
+                        if (field.is_new()) {
+                            if (field.remove()) {
+                                continue;
+                            }
                             patch = {
                                 "is_new": 1,
                             };
@@ -309,19 +311,20 @@ hqDefine("fixtures/js/lookup-manage", [
                 }
             }
             if ($elem.hasClass("select-bulk")) {
-                var table_id = $elem[0].value;
+                const tableId = $elem[0].value;
                 if ($elem[0].checked) {
-                    self.selectedTables.push(table_id);
+                    self.selectedTables.push(tableId);
                 } else {
-                    self.selectedTables.splice(self.selectedTables().indexOf(table_id), 1);
+                    self.selectedTables.splice(self.selectedTables().indexOf(tableId), 1);
                 }
             }
         };
 
-        self.downloadExcels = function (element, event) {
+        self.downloadExcels = function () {
             var tables = [];
-            if (self.selectedTables().length < 1)
+            if (self.selectedTables().length < 1) {
                 return;
+            }
             for (var i in self.selectedTables()) {
                 tables.push(self.selectedTables()[i]);
             }
@@ -338,7 +341,7 @@ hqDefine("fixtures/js/lookup-manage", [
                     success: function (response) {
                         self.setupDownload(response.download_url);
                     },
-                    error: function (response) {
+                    error: function () {
                         self.downloadError();
                     },
                 });
@@ -346,10 +349,10 @@ hqDefine("fixtures/js/lookup-manage", [
         };
 
         self.setupDownload = function (downloadUrl) {
-            var keep_polling = true;
+            var keepPolling = true;
             var serverSlowRetries = 0;
             function poll() {
-                if (keep_polling) {
+                if (keepPolling) {
                     $.ajax({
                         url: downloadUrl,
                         dataType: 'text',
@@ -359,21 +362,20 @@ hqDefine("fixtures/js/lookup-manage", [
                                 $("#downloading").addClass('hide');
                                 progress.removeClass('hide').html(resp);
                                 if (progress.find(".alert-success").length) {
-                                    keep_polling = false;
+                                    keepPolling = false;
                                 }
                             }
-                            if (keep_polling) {
+                            if (keepPolling) {
                                 setTimeout(poll, 2000);
                             }
                         },
                         error: function (resp) {
-                            if (resp.status === 502 && serverSlowRetries < 5){
+                            if (resp.status === 502 && serverSlowRetries < 5) {
                                 serverSlowRetries += 1;
                                 setTimeout(poll, 2000);
-                            }
-                            else {
+                            } else {
                                 self.downloadError();
-                                keep_polling = false;
+                                keepPolling = false;
                             }
                         },
                     });
@@ -381,7 +383,7 @@ hqDefine("fixtures/js/lookup-manage", [
             }
             $("#fixture-download").on("hide.bs.modal", function () {
                 // stop polling if dialog is closed
-                keep_polling = false;
+                keepPolling = false;
             });
             $("#download-progress").addClass('hide');
             $("#downloading").removeClass('hide');
@@ -389,9 +391,9 @@ hqDefine("fixtures/js/lookup-manage", [
         };
 
         self.downloadError = function () {
-            var error_message = gettext("Sorry, something went wrong with the download. If you see this repeatedly please report an issue.");
+            var errorMessage = gettext("Sorry, something went wrong with the download. If you see this repeatedly please report an issue.");
             $("#fixture-download").modal("hide");
-            $("#FailText").text(error_message);
+            $("#FailText").text(errorMessage);
             $("#editFailure").removeClass('hide');
         };
 
@@ -431,7 +433,7 @@ hqDefine("fixtures/js/lookup-manage", [
         $("#download-progress").addClass('hide');
         $("#download-complete").addClass('hide');
     });
-    $('.alert .close').on("click", function (e) {
+    $('.alert .close').on("click", function () {
         $(this).parent().addClass('hide');
     });
 });

From ffdb954eaee895b9db85a5ef27da742dcd8bc4ba Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Fri, 22 Nov 2024 16:55:04 -0500
Subject: [PATCH 137/159] Fixed template syntax

---
 corehq/apps/fixtures/static/fixtures/js/lookup-manage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/fixtures/static/fixtures/js/lookup-manage.js b/corehq/apps/fixtures/static/fixtures/js/lookup-manage.js
index 1fbe03981422..ace49da31263 100644
--- a/corehq/apps/fixtures/static/fixtures/js/lookup-manage.js
+++ b/corehq/apps/fixtures/static/fixtures/js/lookup-manage.js
@@ -148,7 +148,7 @@ hqDefine("fixtures/js/lookup-manage", [
                 error: function (data) {
                     var errorMessage;
                     if (data.responseText === "DuplicateFixture") {
-                        errorMessage = _.template(gettext("Can not create table with ID '<% tag %>'. Table IDs should be unique."))({ tag: self.tag() });
+                        errorMessage = _.template(gettext("Can not create table with ID '<%= tag %>'. Table IDs should be unique."))({ tag: self.tag() });
                     } else {
                         errorMessage = somethingWentWrong;
                     }

From 7264f0da01d330835d26224458de68b1e631e7da Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Wed, 20 Nov 2024 18:25:08 -0500
Subject: [PATCH 138/159] Migrated smsbillables app

---
 .../apps/domain/templates/domain/admin/global_sms_rates.html  | 2 +-
 corehq/apps/domain/templates/domain/admin/sms_rates.html      | 2 +-
 .../js/{smsbillables.rate_calc.js => rate_calc.js}            | 3 ++-
 webpack/appPaths.js                                           | 2 ++
 webpack/generateDetails.js                                    | 4 ++++
 5 files changed, 10 insertions(+), 3 deletions(-)
 rename corehq/apps/smsbillables/static/smsbillables/js/{smsbillables.rate_calc.js => rate_calc.js} (99%)

diff --git a/corehq/apps/domain/templates/domain/admin/global_sms_rates.html b/corehq/apps/domain/templates/domain/admin/global_sms_rates.html
index b60eba5477dc..9c30739c0247 100644
--- a/corehq/apps/domain/templates/domain/admin/global_sms_rates.html
+++ b/corehq/apps/domain/templates/domain/admin/global_sms_rates.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
-{% requirejs_main 'smsbillables/js/smsbillables.rate_calc' %}
+{% js_entry_b3 'smsbillables/js/rate_calc' %}
 
 {% block title %}{% trans "SMS Pricing" %}{% endblock %}
 
diff --git a/corehq/apps/domain/templates/domain/admin/sms_rates.html b/corehq/apps/domain/templates/domain/admin/sms_rates.html
index 9cf73ea711e5..2e520d03f6ce 100644
--- a/corehq/apps/domain/templates/domain/admin/sms_rates.html
+++ b/corehq/apps/domain/templates/domain/admin/sms_rates.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% load i18n %}
 
-{% requirejs_main 'smsbillables/js/smsbillables.rate_calc' %}
+{% js_entry_b3 'smsbillables/js/rate_calc' %}
 
 {% block page_content %}
   <div class="well">
diff --git a/corehq/apps/smsbillables/static/smsbillables/js/smsbillables.rate_calc.js b/corehq/apps/smsbillables/static/smsbillables/js/rate_calc.js
similarity index 99%
rename from corehq/apps/smsbillables/static/smsbillables/js/smsbillables.rate_calc.js
rename to corehq/apps/smsbillables/static/smsbillables/js/rate_calc.js
index da571320a3ed..e0c8745767a5 100644
--- a/corehq/apps/smsbillables/static/smsbillables/js/smsbillables.rate_calc.js
+++ b/corehq/apps/smsbillables/static/smsbillables/js/rate_calc.js
@@ -1,9 +1,10 @@
-hqDefine("smsbillables/js/smsbillables.rate_calc", [
+hqDefine("smsbillables/js/rate_calc", [
     'jquery',
     'knockout',
     'underscore',
     'hqwebapp/js/select2_handler',
     'hqwebapp/js/bootstrap3/widgets',  // the public sms page uses a .hqwebapp-select2 for country input
+    'commcarehq',
 ], function (
     $,
     ko,
diff --git a/webpack/appPaths.js b/webpack/appPaths.js
index 70b0f98e9df3..e6ec77fff259 100644
--- a/webpack/appPaths.js
+++ b/webpack/appPaths.js
@@ -17,6 +17,8 @@ const nonStandardAppPaths = {
     "soil": path.resolve(EX_SUBMODULES_PATH, 'soil'),
     "motech": MOTECH_PATH,
     "telerivet": path.resolve(MESSAGING_PATH, 'smsbackends', 'telerivet'),
+    // the path itself is standard, but the app has no templates so getStandardAppPaths filters it out
+    "smsbillables": path.resolve(APPS_PATH, 'smsbillables'),
     // motech apps:
     "dhis2": path.resolve(MOTECH_PATH, 'dhis2'),
     "generic_inbound": path.resolve(MOTECH_PATH, 'generic_inbound'),
diff --git a/webpack/generateDetails.js b/webpack/generateDetails.js
index 0c0d1665735a..55257c460076 100644
--- a/webpack/generateDetails.js
+++ b/webpack/generateDetails.js
@@ -31,6 +31,10 @@ const scanTemplates = function (dir, entryRegex, allAppPaths, details, isProdMod
      *                          being that entry filenames end in `.[contenthash].js`, which is necessary for
      *                          cache busting on production.
      */
+    if (!fs.existsSync(dir)) {      // some apps have javascript but no templates
+        return;
+    }
+
     const files = fs.readdirSync(dir);
 
     files.forEach((file) => {

From f6b719e1669e725cb203fd2c9e1977aff7062575 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Fri, 22 Nov 2024 18:00:33 -0500
Subject: [PATCH 139/159] Migrated enterprise permissions page

Seems I missed this one when doing the other enterprise pages
---
 .../enterprise/templates/enterprise/enterprise_permissions.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/apps/enterprise/templates/enterprise/enterprise_permissions.html b/corehq/apps/enterprise/templates/enterprise/enterprise_permissions.html
index 7801b0adbd89..f3fe9b0539af 100644
--- a/corehq/apps/enterprise/templates/enterprise/enterprise_permissions.html
+++ b/corehq/apps/enterprise/templates/enterprise/enterprise_permissions.html
@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 
-{% requirejs_main_b5 "hqwebapp/js/bootstrap5/widgets" %}
+{% js_entry "hqwebapp/js/bootstrap5/widgets" %}
 
 {% block page_content %}
   <p class="lead">

From f985bacb9c0bc8fbd7335605b34096509e8d62df Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 25 Nov 2024 09:34:36 -0500
Subject: [PATCH 140/159] Added jquery cookie dependency to hq.helpers.js

---
 .../hqwebapp/static/hqwebapp/js/bootstrap3/hq.helpers.js   | 1 +
 .../hqwebapp/static/hqwebapp/js/bootstrap5/hq.helpers.js   | 1 +
 .../javascript/hqwebapp/js/hq.helpers.js.diff.txt          | 7 ++++---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/hq.helpers.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/hq.helpers.js
index 4221f3fd8ea0..2ec600963bf9 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/hq.helpers.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/hq.helpers.js
@@ -4,6 +4,7 @@ hqDefine("hqwebapp/js/bootstrap3/hq.helpers", [
     'underscore',
     'analytix/js/google',
     'bootstrap',  // for popover constructor override
+    'jquery.cookie/jquery.cookie',  // $.cookie
 ], function (
     $,
     ko,
diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/hq.helpers.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/hq.helpers.js
index 070295d42cbe..a9c96d79e5c5 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/hq.helpers.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/hq.helpers.js
@@ -4,6 +4,7 @@ hqDefine("hqwebapp/js/bootstrap5/hq.helpers", [
     'underscore',
     'analytix/js/google',
     'es6!hqwebapp/js/bootstrap5_loader',
+    'jquery.cookie/jquery.cookie',  // $.cookie
 ], function (
     $,
     ko,
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/hq.helpers.js.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/hq.helpers.js.diff.txt
index cf67b47273ec..a72f367f2bf5 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/hq.helpers.js.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/javascript/hqwebapp/js/hq.helpers.js.diff.txt
@@ -1,6 +1,6 @@
 --- 
 +++ 
-@@ -1,14 +1,15 @@
+@@ -1,15 +1,16 @@
 -hqDefine("hqwebapp/js/bootstrap3/hq.helpers", [
 +hqDefine("hqwebapp/js/bootstrap5/hq.helpers", [
      'jquery',
@@ -9,6 +9,7 @@
      'analytix/js/google',
 -    'bootstrap',  // for popover constructor override
 +    'es6!hqwebapp/js/bootstrap5_loader',
+     'jquery.cookie/jquery.cookie',  // $.cookie
  ], function (
      $,
      ko,
@@ -19,7 +20,7 @@
  ) {
      // disable-on-submit is a class for form submit buttons so they're automatically disabled when the form is submitted
      $(document).on('submit', 'form', function (ev) {
-@@ -55,19 +56,6 @@
+@@ -56,19 +57,6 @@
          return false; // let default handler run
      };
  
@@ -39,7 +40,7 @@
      $.fn.hqHelp = function (opts) {
          var self = this;
          self.each(function (i) {
-@@ -84,22 +72,19 @@
+@@ -85,22 +73,19 @@
              if (opts) {
                  options = _.extend(options, opts);
              }

From 400990b159b6fcc6cd51d3cb60e1622c9f9319db Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 25 Nov 2024 08:59:51 -0500
Subject: [PATCH 141/159] Migrated all pages except for references page

---
 corehq/apps/hqmedia/static/hqmedia/js/bulk_upload.js       | 1 +
 corehq/apps/hqmedia/static/hqmedia/js/manage_paths_main.js | 1 +
 .../hqmedia/static/hqmedia/js/translations_coverage.js     | 6 ++++++
 .../apps/hqmedia/templates/hqmedia/audio_translator.html   | 6 +-----
 corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html     | 2 +-
 corehq/apps/hqmedia/templates/hqmedia/manage_paths.html    | 2 +-
 .../hqmedia/templates/hqmedia/translations_coverage.html   | 7 +------
 corehq/apps/hqmedia/templates/hqmedia/uploader_base.html   | 4 ----
 8 files changed, 12 insertions(+), 17 deletions(-)
 create mode 100644 corehq/apps/hqmedia/static/hqmedia/js/translations_coverage.js

diff --git a/corehq/apps/hqmedia/static/hqmedia/js/bulk_upload.js b/corehq/apps/hqmedia/static/hqmedia/js/bulk_upload.js
index eae53c88e8c0..b965f0554d7c 100644
--- a/corehq/apps/hqmedia/static/hqmedia/js/bulk_upload.js
+++ b/corehq/apps/hqmedia/static/hqmedia/js/bulk_upload.js
@@ -1,6 +1,7 @@
 hqDefine("hqmedia/js/bulk_upload", [
     "hqwebapp/js/bulk_upload_file",
     "app_manager/js/download_async_modal",
+    "commcarehq",
 ], function () {
     return 1;
 });
diff --git a/corehq/apps/hqmedia/static/hqmedia/js/manage_paths_main.js b/corehq/apps/hqmedia/static/hqmedia/js/manage_paths_main.js
index 1f8360667fc7..cff390c8cf43 100644
--- a/corehq/apps/hqmedia/static/hqmedia/js/manage_paths_main.js
+++ b/corehq/apps/hqmedia/static/hqmedia/js/manage_paths_main.js
@@ -3,6 +3,7 @@ hqDefine("hqmedia/js/manage_paths_main", [
     "knockout",
     "hqwebapp/js/assert_properties",
     "hqwebapp/js/components/select_toggle",
+    "commcarehq",
 ], function (
     $,
     ko,
diff --git a/corehq/apps/hqmedia/static/hqmedia/js/translations_coverage.js b/corehq/apps/hqmedia/static/hqmedia/js/translations_coverage.js
new file mode 100644
index 000000000000..4133a3371839
--- /dev/null
+++ b/corehq/apps/hqmedia/static/hqmedia/js/translations_coverage.js
@@ -0,0 +1,6 @@
+hqDefine("hqmedia/js/translations_coverage", [
+    'hqwebapp/js/bootstrap3/widgets',
+    'app_manager/js/widgets',
+], function () {
+    // nothing to do here, this module just groups the above dependencies
+});
diff --git a/corehq/apps/hqmedia/templates/hqmedia/audio_translator.html b/corehq/apps/hqmedia/templates/hqmedia/audio_translator.html
index 75c806fb087d..faef62fe58f2 100644
--- a/corehq/apps/hqmedia/templates/hqmedia/audio_translator.html
+++ b/corehq/apps/hqmedia/templates/hqmedia/audio_translator.html
@@ -3,11 +3,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% block js %}{{ block.super }}
-  {% compress js %}
-    <script src="{% static 'hqwebapp/js/bootstrap3/widgets.js' %}"></script>
-  {% endcompress js %}
-{% endblock js %}
+{% js_entry_b3 'hqwebapp/js/bootstrap3/widgets' %}
 
 {% block page_content %}
   <p class="lead">{{ current_page.page_name }}</p>
diff --git a/corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html b/corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
index d539a7b242ae..b26d3db745f4 100644
--- a/corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
+++ b/corehq/apps/hqmedia/templates/hqmedia/bulk_upload.html
@@ -1,7 +1,7 @@
 {% extends "hqmedia/uploader_base.html" %}
 {% load hq_shared_tags %}
 
-{% requirejs_main "hqmedia/js/bulk_upload" %}
+{% js_entry_b3 "hqmedia/js/bulk_upload" %}
 
 {% block page_content %}
   {% include "hqmedia/partials/bulk_upload.html" with include_modal=True %}
diff --git a/corehq/apps/hqmedia/templates/hqmedia/manage_paths.html b/corehq/apps/hqmedia/templates/hqmedia/manage_paths.html
index cf38863387d0..29201ba8de64 100644
--- a/corehq/apps/hqmedia/templates/hqmedia/manage_paths.html
+++ b/corehq/apps/hqmedia/templates/hqmedia/manage_paths.html
@@ -2,7 +2,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% requirejs_main 'hqmedia/js/manage_paths_main' %}
+{% js_entry_b3 'hqmedia/js/manage_paths_main' %}
 
 {% block page_content %}
   {% include "hqmedia/partials/manage_paths.html" %}
diff --git a/corehq/apps/hqmedia/templates/hqmedia/translations_coverage.html b/corehq/apps/hqmedia/templates/hqmedia/translations_coverage.html
index a8b0ac4627e4..ed3f554f7782 100644
--- a/corehq/apps/hqmedia/templates/hqmedia/translations_coverage.html
+++ b/corehq/apps/hqmedia/templates/hqmedia/translations_coverage.html
@@ -3,12 +3,7 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
-{% block js %}{{ block.super }}
-  {% compress js %}
-    <script src="{% static 'hqwebapp/js/bootstrap3/widgets.js' %}"></script>
-    <script src="{% static 'app_manager/js/widgets.js' %}"></script>
-  {% endcompress js %}
-{% endblock js %}
+{% js_entry_b3 'hqmedia/js/translations_coverage' %}
 
 {% block page_content %}
   {% registerurl "paginate_releases" domain app.get_id %}
diff --git a/corehq/apps/hqmedia/templates/hqmedia/uploader_base.html b/corehq/apps/hqmedia/templates/hqmedia/uploader_base.html
index b595977d43b0..723dd1db0228 100644
--- a/corehq/apps/hqmedia/templates/hqmedia/uploader_base.html
+++ b/corehq/apps/hqmedia/templates/hqmedia/uploader_base.html
@@ -4,7 +4,3 @@
 {% block page_navigation %}
   {% include 'hqwebapp/partials/bootstrap3/navigation_left_sidebar.html' with sections=navigation_sections %}
 {% endblock page_navigation %}
-
-{% block js %} {{ block.super }}
-  <script src="{% static "hqmedia/js/uploaders.js" %}"></script>
-{% endblock %}

From bd133b190283b7cd40c5e101c3299437eb653de3 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 25 Nov 2024 09:32:38 -0500
Subject: [PATCH 142/159] Migrated media references page

---
 .../static/hqmedia/js/references_main.js      | 28 +++++++++++++++----
 .../hqmedia/static/hqmedia/js/uploaders.js    | 15 +++++++---
 .../hqmedia/templates/hqmedia/references.html |  8 ++----
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/corehq/apps/hqmedia/static/hqmedia/js/references_main.js b/corehq/apps/hqmedia/static/hqmedia/js/references_main.js
index b00f16f4bb29..bc6868c25f2a 100644
--- a/corehq/apps/hqmedia/static/hqmedia/js/references_main.js
+++ b/corehq/apps/hqmedia/static/hqmedia/js/references_main.js
@@ -1,4 +1,20 @@
-hqDefine("hqmedia/js/references_main", function () {
+hqDefine("hqmedia/js/references_main", [
+    "jquery",
+    "knockout",
+    "underscore",
+    "hqwebapp/js/bootstrap3/alert_user",
+    "hqwebapp/js/initial_page_data",
+    "hqmedia/js/media_reference_models",
+    "app_manager/js/download_async_modal",    // for the 'Download ZIP' button
+    "hqwebapp/js/components/pagination",
+], function (
+    $,
+    ko,
+    _,
+    alertUser,
+    initialPageData,
+    mediaReferenceModels
+) {
     function MultimediaReferenceController() {
         var self = {};
         self.references = ko.observableArray();
@@ -28,7 +44,7 @@ hqDefine("hqmedia/js/references_main", function () {
             self.showPaginationSpinner(true);
             var includeTotal = page === 1;
             $.ajax({
-                url: hqImport("hqwebapp/js/initial_page_data").reverse('hqmedia_references'),
+                url: initialPageData.reverse('hqmedia_references'),
                 data: {
                     json: 1,
                     page: page,
@@ -45,15 +61,15 @@ hqDefine("hqmedia/js/references_main", function () {
                     self.references(_.map(data.references, function (ref) {
                         var objRef = data.object_map[ref.path];
                         if (ref.media_class === "CommCareImage") {
-                            var imageRef = hqImport('hqmedia/js/media_reference_models').ImageReference(ref);
+                            var imageRef = mediaReferenceModels.ImageReference(ref);
                             imageRef.setObjReference(objRef);
                             return imageRef;
                         } else if (ref.media_class === "CommCareAudio") {
-                            var audioRef = hqImport('hqmedia/js/media_reference_models').AudioReference(ref);
+                            var audioRef = mediaReferenceModels.AudioReference(ref);
                             audioRef.setObjReference(objRef);
                             return audioRef;
                         } else if (ref.media_class === "CommCareVideo") {
-                            var videoRef = hqImport('hqmedia/js/media_reference_models').VideoReference(ref);
+                            var videoRef = mediaReferenceModels.VideoReference(ref);
                             videoRef.setObjReference(objRef);
                             return videoRef;
                         }
@@ -69,7 +85,7 @@ hqDefine("hqmedia/js/references_main", function () {
                 },
                 error: function () {
                     self.showPaginationSpinner(false);
-                    hqImport('hqwebapp/js/bootstrap3/alert_user').alert_user(gettext("Error fetching multimedia, " +
+                    alertUser.alert_user(gettext("Error fetching multimedia, " +
                         "please try again or report an issue if the problem persists."), 'danger');
                 },
             });
diff --git a/corehq/apps/hqmedia/static/hqmedia/js/uploaders.js b/corehq/apps/hqmedia/static/hqmedia/js/uploaders.js
index 1ede359872c4..fe2d6396f120 100644
--- a/corehq/apps/hqmedia/static/hqmedia/js/uploaders.js
+++ b/corehq/apps/hqmedia/static/hqmedia/js/uploaders.js
@@ -1,7 +1,14 @@
-hqDefine("hqmedia/js/uploaders", function () {
-    const assertProperties = hqImport("hqwebapp/js/assert_properties"),
-        initialPageData = hqImport("hqwebapp/js/initial_page_data");
-
+hqDefine("hqmedia/js/uploaders", [
+    "jquery",
+    "underscore",
+    "hqwebapp/js/assert_properties",
+    "hqwebapp/js/initial_page_data",
+], function (
+    $,
+    _,
+    assertProperties,
+    initialPageData
+) {
     const uploader = function (slug, options) {
         assertProperties.assertRequired(options, [
             'uploadURL', 'uploadParams',
diff --git a/corehq/apps/hqmedia/templates/hqmedia/references.html b/corehq/apps/hqmedia/templates/hqmedia/references.html
index dcab1e209d6b..c68f012ea606 100644
--- a/corehq/apps/hqmedia/templates/hqmedia/references.html
+++ b/corehq/apps/hqmedia/templates/hqmedia/references.html
@@ -2,6 +2,8 @@
 {% load hq_shared_tags %}
 {% load i18n %}
 
+{% js_entry_b3 'hqmedia/js/references_main' %}
+
 {% block stylesheets %}{{ block.super }}
   <style type="text/css">
     .media-type-icon,
@@ -11,12 +13,6 @@
   </style>
 {% endblock %}
 
-{% block js %} {{ block.super }}
-  <script src="{% static 'hqmedia/js/media_reference_models.js' %}"></script>
-  <script src="{% static 'hqmedia/js/references_main.js' %}"></script>
-  <script src="{% static 'app_manager/js/download_async_modal.js' %}"></script>
-{% endblock %}
-
 {% block page_content %}
   {% initial_page_data 'uploaders' uploaders_js %}
   {% registerurl 'hqmedia_references' app.domain app.id %}

From 01d70aa4151966bce5ff554af7b85543e8684241 Mon Sep 17 00:00:00 2001
From: Biyeun Buczyk <biyeun@dimagi.com>
Date: Thu, 21 Nov 2024 20:41:19 +0100
Subject: [PATCH 143/159] fix issue with missing default error template and any
 actionable template context

---
 .../hqwebapp/htmx/htmx_action_error.html          |  5 +++++
 corehq/util/htmx_action.py                        | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 corehq/apps/hqwebapp/templates/hqwebapp/htmx/htmx_action_error.html

diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/htmx/htmx_action_error.html b/corehq/apps/hqwebapp/templates/hqwebapp/htmx/htmx_action_error.html
new file mode 100644
index 000000000000..c43e1bfac07a
--- /dev/null
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/htmx/htmx_action_error.html
@@ -0,0 +1,5 @@
+{% load i18n %}
+
+{% blocktrans %}
+  Encountered error "{{ htmx_error }}" while performing action {{ action }}.
+{% endblocktrans %}
diff --git a/corehq/util/htmx_action.py b/corehq/util/htmx_action.py
index d7badd274f82..2eb330a02a20 100644
--- a/corehq/util/htmx_action.py
+++ b/corehq/util/htmx_action.py
@@ -49,14 +49,20 @@ def make_edit(request, *args, **kwargs):
     Example docs here: commcarehq.org/styleguide/b5/htmx_alpine/
     See working demo here: commcarehq.org/styleguide/demo/htmx_todo/
     """
-    default_htmx_error_template = "prototype/htmx/partials/htmx_action_error.html"
+    default_htmx_error_template = ""
 
-    def get_htmx_error_context(self, **kwargs):
+    def get_htmx_error_context(self, action, htmx_error, **kwargs):
         """
         Use this method to return the context for the HTMX error template.
+
+        :param action: string (the slug for the HTMX action taken)
+        :param htmx_error: HtmxResponseException
         :return: dict
         """
-        return {}
+        return {
+            "action": action,
+            "htmx_error": htmx_error,
+        }
 
     def get_htmx_error_template(self, action, htmx_error):
         """
@@ -117,8 +123,7 @@ def dispatch(self, request, *args, **kwargs):
         try:
             response = handler(request, *args, **kwargs)
         except HtmxResponseException as err:
-            context = self.get_htmx_error_context(**kwargs)
-            context["htmx_error"] = err
+            context = self.get_htmx_error_context(action, err, **kwargs)
             self.template_name = self.get_htmx_error_template(action, err)
             return self.render_to_response(context)
         return response

From a13cb2abe51d8f4670d47dfd0a5072cead49068b Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 25 Nov 2024 11:32:14 -0500
Subject: [PATCH 144/159] Removed ace script tags from motech pages

---
 .../dhis2/templates/dhis2/dataset_map_json.html       | 11 -----------
 .../motech/openmrs/templates/openmrs/edit_config.html | 11 ++---------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/corehq/motech/dhis2/templates/dhis2/dataset_map_json.html b/corehq/motech/dhis2/templates/dhis2/dataset_map_json.html
index b69d15786bab..f4de2db0e020 100644
--- a/corehq/motech/dhis2/templates/dhis2/dataset_map_json.html
+++ b/corehq/motech/dhis2/templates/dhis2/dataset_map_json.html
@@ -2,17 +2,6 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 
-{# Required to define ACE #}
-{% load compress %}
-{% block js %}{{ block.super }}
-  {% compress js %}
-    <script src="{% static 'ace-builds/src-min-noconflict/ace.js' %}"></script>
-    <script src="{% static 'ace-builds/src-min-noconflict/mode-json.js' %}"></script>
-    <script src="{% static 'ace-builds/src-min-noconflict/mode-xml.js' %}"></script>
-    <script src="{% static 'ace-builds/src-min-noconflict/ext-searchbox.js' %}"></script>
-  {% endcompress %}
-{% endblock %}
-
 {% js_entry "dhis2/js/dataset_map_json" %}
 
 {% block page_content %}
diff --git a/corehq/motech/openmrs/templates/openmrs/edit_config.html b/corehq/motech/openmrs/templates/openmrs/edit_config.html
index cee7002b49b1..b7aea47a3df7 100644
--- a/corehq/motech/openmrs/templates/openmrs/edit_config.html
+++ b/corehq/motech/openmrs/templates/openmrs/edit_config.html
@@ -3,15 +3,8 @@
 {% load crispy_forms_tags %}
 {% load hq_shared_tags %}
 {% block title %}Edit Config : OpenMRS :: {% endblock %}
-{% block js %}{{ block.super }}
-  {% compress js %}
-    <script src="{% static 'ace-builds/src-min-noconflict/ace.js' %}"></script>
-    <script src="{% static 'ace-builds/src-min-noconflict/mode-json.js' %}"></script>
-    <script src="{% static 'ace-builds/src-min-noconflict/mode-xml.js' %}"></script>
-    <script src="{% static 'ace-builds/src-min-noconflict/ext-searchbox.js' %}"></script>
-    <script src="{% static 'hqwebapp/js/base_ace.js' %}"></script>
-  {% endcompress %}
-{% endblock %}
+
+{% js_entry 'hqwebapp/js/base_ace' %}
 
 {% block page_content %}
   {% crispy form %}

From cb549aadfeb7972c1d6051694134495f723861bd Mon Sep 17 00:00:00 2001
From: Biyeun Buczyk <biyeun@dimagi.com>
Date: Mon, 25 Nov 2024 21:00:09 +0100
Subject: [PATCH 145/159] update default error template to
 hqwebapp/htmx/htmx_action_error.html

---
 corehq/util/htmx_action.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/corehq/util/htmx_action.py b/corehq/util/htmx_action.py
index 2eb330a02a20..7d184bc53183 100644
--- a/corehq/util/htmx_action.py
+++ b/corehq/util/htmx_action.py
@@ -49,7 +49,7 @@ def make_edit(request, *args, **kwargs):
     Example docs here: commcarehq.org/styleguide/b5/htmx_alpine/
     See working demo here: commcarehq.org/styleguide/demo/htmx_todo/
     """
-    default_htmx_error_template = ""
+    default_htmx_error_template = "hqwebapp/htmx/htmx_action_error.html"
 
     def get_htmx_error_context(self, action, htmx_error, **kwargs):
         """

From 59f1cada29f5797a96895d879fa14bb64f0bcc3e Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 25 Nov 2024 20:31:02 +0000
Subject: [PATCH 146/159] "Bootstrap 5 Migration - Rebuilt diffs"

---
 .../domain/admin/global_sms_rates.html.diff.txt                 | 2 +-
 .../data/bootstrap5_diffs/domain/admin/sms_rates.html.diff.txt  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/global_sms_rates.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/global_sms_rates.html.diff.txt
index e12d49307352..ee865cfebb64 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/global_sms_rates.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/global_sms_rates.html.diff.txt
@@ -7,7 +7,7 @@
  {% load crispy_forms_tags %}
  {% load i18n %}
  
--{% requirejs_main 'smsbillables/js/smsbillables.rate_calc' %}
+-{% js_entry_b3 'smsbillables/js/rate_calc' %}
 +{% requirejs_main_b5 'smsbillables/js/smsbillables.rate_calc' %}
  
  {% block title %}{% trans "SMS Pricing" %}{% endblock %}
diff --git a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_rates.html.diff.txt b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_rates.html.diff.txt
index 81b11895e924..6e7b60024091 100644
--- a/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_rates.html.diff.txt
+++ b/corehq/apps/hqwebapp/tests/data/bootstrap5_diffs/domain/admin/sms_rates.html.diff.txt
@@ -7,7 +7,7 @@
  {% load crispy_forms_tags %}
  {% load i18n %}
  
--{% requirejs_main 'smsbillables/js/smsbillables.rate_calc' %}
+-{% js_entry_b3 'smsbillables/js/rate_calc' %}
 +{% requirejs_main_b5 'smsbillables/js/smsbillables.rate_calc' %}
  
  {% block page_content %}

From cc75f17a85297078108d809547510014680dddc9 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 25 Nov 2024 19:31:22 -0500
Subject: [PATCH 147/159] Updated misleading comments

---
 corehq/apps/hqwebapp/static/hqwebapp/js/atwho.js                | 2 +-
 .../reports/js/filters/case_list_explorer_knockout_bindings.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/atwho.js b/corehq/apps/hqwebapp/static/hqwebapp/js/atwho.js
index e1f60e605e38..d15abb125209 100644
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/atwho.js
+++ b/corehq/apps/hqwebapp/static/hqwebapp/js/atwho.js
@@ -73,7 +73,7 @@ function (
         init: function (element) {
             var $element = $(element);
             if (!$element.atwho) {
-                throw new Error("The typeahead binding requires Atwho.js and Caret.js");
+                throw new Error("The autocompleteAtwho binding requires Atwho.js and Caret.js");
             }
 
             init($element, {
diff --git a/corehq/apps/reports/static/reports/js/filters/case_list_explorer_knockout_bindings.js b/corehq/apps/reports/static/reports/js/filters/case_list_explorer_knockout_bindings.js
index 0eb99ee10073..9e8ed1c59e65 100644
--- a/corehq/apps/reports/static/reports/js/filters/case_list_explorer_knockout_bindings.js
+++ b/corehq/apps/reports/static/reports/js/filters/case_list_explorer_knockout_bindings.js
@@ -91,7 +91,7 @@ hqDefine("reports/js/filters/case_list_explorer_knockout_bindings", ['jquery', '
         init: function (element) {
             var $element = $(element);
             if (!$element.atwho) {
-                throw new Error("The typeahead binding requires Atwho.js and Caret.js");
+                throw new Error("The explorerColumnsAutocomplete binding requires Atwho.js and Caret.js");
             }
 
             atwho.init($element, {

From f64100c00b58e5576fa735eb6595ff7108ec1dcd Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 25 Nov 2024 19:57:15 -0500
Subject: [PATCH 148/159] Updated releases SMS area to use select2+select2
 instead of input+typeahead

---
 .../app_manager/app_view_release_manager.html          |  1 -
 .../app_manager/templates/app_manager/apps_base.html   |  2 --
 .../partials/releases/releases_deploy_modal_sms.html   | 10 +++++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/corehq/apps/app_manager/templates/app_manager/app_view_release_manager.html b/corehq/apps/app_manager/templates/app_manager/app_view_release_manager.html
index 97bd7effe71f..02f4a7979d41 100644
--- a/corehq/apps/app_manager/templates/app_manager/app_view_release_manager.html
+++ b/corehq/apps/app_manager/templates/app_manager/app_view_release_manager.html
@@ -38,7 +38,6 @@
   {% initial_page_data 'intro_only' intro_only %}
   {% initial_page_data 'langs' app.langs %}
   {% initial_page_data 'latest_build_id' latest_build_id %}
-  {% initial_page_data 'sms_contacts' sms_contacts %}
   {% initial_page_data 'confirm' confirm %}
   {% initial_page_data 'upstream_url' upstream_url_template %}
   {% initial_page_data 'show_release_mode' show_release_mode %}
diff --git a/corehq/apps/app_manager/templates/app_manager/apps_base.html b/corehq/apps/app_manager/templates/app_manager/apps_base.html
index 36d8fd9304f3..5f60ee676667 100644
--- a/corehq/apps/app_manager/templates/app_manager/apps_base.html
+++ b/corehq/apps/app_manager/templates/app_manager/apps_base.html
@@ -62,8 +62,6 @@
   {% endcompress %}
 
   {% include 'hqwebapp/includes/atwho.html' %}
-  <script src="{% static 'bootstrap3-typeahead/bootstrap3-typeahead.min.js' %}"></script>
-  <script src="{% static 'hqwebapp/js/bootstrap-multi-typeahead.js' %}"></script>
 
   {% include 'hqwebapp/includes/ui_element_js.html' %}
   {% compress js %}
diff --git a/corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal_sms.html b/corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal_sms.html
index b06eae5f116a..3930b79d85e7 100644
--- a/corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal_sms.html
+++ b/corehq/apps/app_manager/templates/app_manager/partials/releases/releases_deploy_modal_sms.html
@@ -12,11 +12,15 @@
               </span>
       </label>
     </div>
-    <form method="post" action="{% url "send_to_recipients" domain %}">{% csrf_token %}
+    <form method="post" action="{% url "send_to_recipients" domain %}">
+      {% csrf_token %}
       <div class="form-group">
         <label>{% trans "Send to" %}</label>
-        <input type="text" name="recipients" value="" class="form-control"
-               data-bind="multiTypeahead: $root.recipients" />
+        <select name="recipients" id="sms-recipients" class="form-control" multiple data-bind="staticSelect2: {}">
+          {% for contact in sms_contacts %}
+            <option>{{ contact }}</option>
+          {% endfor %}
+        </select>
       </div>
       <div class="form-group">
                 <textarea class="bitly form-control vertical-resize" name="message"

From 07a1ce86958e0592f5cae63afd7679c9a47152c1 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 25 Nov 2024 20:12:49 -0500
Subject: [PATCH 149/159] Updated SMS compose page to use select2+select2
 instead of input+typeahead

---
 corehq/apps/sms/forms.py                   | 12 ++++++++----
 corehq/apps/sms/static/sms/js/compose.js   |  8 ++------
 corehq/apps/sms/templates/sms/compose.html |  1 -
 corehq/apps/sms/views.py                   |  6 ------
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/corehq/apps/sms/forms.py b/corehq/apps/sms/forms.py
index 7db5da8d4cb0..2051e088ff46 100644
--- a/corehq/apps/sms/forms.py
+++ b/corehq/apps/sms/forms.py
@@ -1296,19 +1296,23 @@ def save(self, commtrack_settings):
 
 
 class ComposeMessageForm(forms.Form):
-
-    recipients = forms.CharField(widget=forms.Textarea(attrs={"class": "vertical-resize"}),
-                                 help_text=gettext_lazy("Type a username, group name or 'send to all'"))
+    recipients = forms.MultipleChoiceField(
+        widget=forms.SelectMultiple(attrs={'class': 'hqwebapp-select2'}),
+    )
     message = forms.CharField(widget=forms.Textarea(attrs={"class": "vertical-resize"}),
     help_text=gettext_lazy('0 characters (160 max)'))
 
     def __init__(self, *args, **kwargs):
         domain = kwargs.pop('domain')
         super(ComposeMessageForm, self).__init__(*args, **kwargs)
+
+        from corehq.apps.sms.views import get_sms_autocomplete_context
+        self.fields['recipients'].choices = [(contact, contact) for contact in get_sms_autocomplete_context(None, domain)['sms_contacts']]
+
         self.helper = HQFormHelper()
         self.helper.form_action = reverse('send_to_recipients', args=[domain])
         self.helper.layout = crispy.Layout(
-            crispy.Field('recipients', rows=2, css_class='sms-typeahead'),
+            crispy.Field('recipients'),
             crispy.Field('message', rows=2),
             hqcrispy.FormActions(
                 twbscrispy.StrictButton(
diff --git a/corehq/apps/sms/static/sms/js/compose.js b/corehq/apps/sms/static/sms/js/compose.js
index 1e40798262cc..ff32a8e14dca 100644
--- a/corehq/apps/sms/static/sms/js/compose.js
+++ b/corehq/apps/sms/static/sms/js/compose.js
@@ -1,8 +1,8 @@
 hqDefine("sms/js/compose",[
     "jquery",
     "hqwebapp/js/initial_page_data",
-    'jquery-ui/ui/widgets/sortable',
-    "hqwebapp/js/bootstrap-multi-typeahead",
+    "hqwebapp/js/bootstrap3/widgets",
+    "jquery-ui/ui/widgets/sortable",
     "commcarehq",
 ], function ($, intialPageData) {
     $(function () {
@@ -26,9 +26,5 @@ hqDefine("sms/js/compose",[
             message = message + " (" + maxChar + " max)";
             $charCount.text(message);
         });
-
-        $('.sms-typeahead').multiTypeahead({
-            source: intialPageData.get('sms_contacts'),
-        }).focus();
     });
 });
diff --git a/corehq/apps/sms/templates/sms/compose.html b/corehq/apps/sms/templates/sms/compose.html
index c0455d1a7ef4..38b524a433c9 100644
--- a/corehq/apps/sms/templates/sms/compose.html
+++ b/corehq/apps/sms/templates/sms/compose.html
@@ -6,6 +6,5 @@
 {% js_entry_b3 "sms/js/compose" %}
 
 {% block page_content %}
-  {% initial_page_data 'sms_contacts' sms_contacts %}
   {% crispy form %}
 {% endblock %}
diff --git a/corehq/apps/sms/views.py b/corehq/apps/sms/views.py
index f516c7d9f4c8..cb61d41efaf2 100644
--- a/corehq/apps/sms/views.py
+++ b/corehq/apps/sms/views.py
@@ -67,7 +67,6 @@
     use_datatables,
     use_jquery_ui,
     use_timepicker,
-    use_typeahead,
 )
 from corehq.apps.hqwebapp.utils import get_bulk_upload_form
 from corehq.apps.hqwebapp.views import CRUDPaginatedViewMixin
@@ -202,13 +201,8 @@ def page_context(self):
             'timezone_now': datetime.now(tz=tz),
             'form': ComposeMessageForm(domain=self.domain)
         })
-        page_context.update(get_sms_autocomplete_context(self.request, self.domain))
         return page_context
 
-    @use_typeahead
-    def dispatch(self, *args, **kwargs):
-        return super(ComposeMessageView, self).dispatch(*args, **kwargs)
-
 
 def get_sms_autocomplete_context(request, domain):
     """A helper view for sms autocomplete"""

From adc68856f0129a5abebe926dc5f465bd7310c951 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 25 Nov 2024 20:17:02 -0500
Subject: [PATCH 150/159] Removed use_typeahead decorator

---
 corehq/apps/hqwebapp/decorators.py                | 14 --------------
 corehq/apps/hqwebapp/templates/hqwebapp/base.html |  7 -------
 2 files changed, 21 deletions(-)

diff --git a/corehq/apps/hqwebapp/decorators.py b/corehq/apps/hqwebapp/decorators.py
index a1b8f47a2096..6fe777e42de4 100644
--- a/corehq/apps/hqwebapp/decorators.py
+++ b/corehq/apps/hqwebapp/decorators.py
@@ -89,20 +89,6 @@ def dispatch(self, request, *args, **kwargs):
     return set_request_flag(view_func, 'use_datatables')
 
 
-def use_typeahead(view_func):
-    """Use this decorator on the dispatch method of a TemplateView subclass
-    to enable the inclusion of the typeahead library at the base template
-    level.
-
-    Example:
-
-    @use_typeahead
-    def dispatch(self, request, *args, **kwargs):
-        return super(MyView, self).dispatch(request, *args, **kwargs)
-    """
-    return set_request_flag(view_func, 'use_typeahead')
-
-
 def use_timepicker(view_func):
     """Use this decorator on the dispatch method of a TemplateView subclass
     to enable the inclusion of the timepicker library at the base template
diff --git a/corehq/apps/hqwebapp/templates/hqwebapp/base.html b/corehq/apps/hqwebapp/templates/hqwebapp/base.html
index 7c124e8154d2..817a1be63eed 100644
--- a/corehq/apps/hqwebapp/templates/hqwebapp/base.html
+++ b/corehq/apps/hqwebapp/templates/hqwebapp/base.html
@@ -415,13 +415,6 @@
       {% endif %}
     {% endif %}
 
-    {% if request.use_typeahead and not use_js_bundler and not use_bootstrap5 %}
-      {% compress js %}
-        <script src="{% static 'bootstrap3-typeahead/bootstrap3-typeahead.min.js' %}"></script>
-        <script src="{% static 'hqwebapp/js/bootstrap-multi-typeahead.js' %}"></script>
-      {% endcompress %}
-    {% endif %}
-
     {% if request.use_timepicker and not use_js_bundler and not use_bootstrap5 %}
       {% compress js %}
         <script src="{% static 'bootstrap-timepicker/js/bootstrap-timepicker.js' %}"></script>

From 33765473f7629c16165f5fc0e69b01b0dbf2981b Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 25 Nov 2024 20:17:23 -0500
Subject: [PATCH 151/159] Removed js library

---
 .../hqwebapp/js/bootstrap-multi-typeahead.js  | 63 -------------------
 package.json                                  |  1 -
 yarn.lock                                     |  4 --
 3 files changed, 68 deletions(-)
 delete mode 100644 corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap-multi-typeahead.js

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap-multi-typeahead.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap-multi-typeahead.js
deleted file mode 100644
index ffe6b725d028..000000000000
--- a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap-multi-typeahead.js
+++ /dev/null
@@ -1,63 +0,0 @@
-hqDefine("hqwebapp/js/bootstrap-multi-typeahead",[
-    "jquery",
-    "bootstrap3-typeahead/bootstrap3-typeahead.min",
-],function ($) {
-    "use strict";
-    // http://stackoverflow.com/a/3561711
-    var regExpEscape = function (s) {
-        return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
-    };
-
-    $.fn.multiTypeahead = function (options) {
-        /**
-         * An extension of the Bootstrap typeahead jQuery plugin that handles
-         * creating a comma-separated list and prevents duplicate values.
-         *
-         * @author mwhite
-         */
-
-        function currentValAndInput(string) {
-        /* split the current value and the current input (the latter to be
-           matched against.) Handles when users manually edit the input such
-           that the number of spaces after a comma is not 1 */
-            var index = string.lastIndexOf(',');
-            if (index === -1) {
-                return ['', ''];
-            } else {
-                index++;
-                while (string.charAt(index) === ' ') {
-                    index++;
-                }
-                return [string.substring(0, index), string.substring(index)];
-            }
-        }
-
-        options = $.extend(options, {
-            matcher: function (item) {
-                var split = currentValAndInput(this.$element.val()),
-                    currentVal = split[0],
-                    currentInput = split[1];
-
-                var pattern = new RegExp("(?:^|,\\s*)" + regExpEscape(item) + "(?:\\s*,?|$)");
-                if (currentVal.match(pattern)) {
-                    return 0;
-                }
-
-                return ~item.toLowerCase().indexOf(currentInput.toLowerCase());
-            },
-            updater: function (item) {
-                var split = currentValAndInput(this.$element.val()),
-                    currentVal = split[0];
-
-                this.$element.focus();
-                return currentVal + item + ', ';
-            },
-        });
-
-        return this.each(function (i, v) {
-            $(v).typeahead(options);
-        });
-    };
-
-
-});
diff --git a/package.json b/package.json
index 6dc0233c947e..0d189c348883 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,6 @@
         "bootstrap": "3.4.1",
         "bootstrap-daterangepicker": "3.0.3",
         "bootstrap-timepicker": "0.5.1",
-        "bootstrap3-typeahead": "bassjobsen/Bootstrap-3-Typeahead#~3.1.1",
         "bootstrap5": "npm:bootstrap@5.3.1",
         "calendars": "kbwood/calendars#2.1.2",
         "clipboard": "1.5.15",
diff --git a/yarn.lock b/yarn.lock
index da660f1a7981..4c98a3197df1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1930,10 +1930,6 @@ bootstrap-timepicker@0.5.1:
   resolved "https://registry.yarnpkg.com/bootstrap-timepicker/-/bootstrap-timepicker-0.5.1.tgz#1ee36b4a7c27904c7c96da0988b711c9ee9e99b7"
   integrity sha1-HuNrSnwnkEx8ltoJiLcRye6embc=
 
-bootstrap3-typeahead@bassjobsen/Bootstrap-3-Typeahead#~3.1.1:
-  version "3.1.1"
-  resolved "https://codeload.github.com/bassjobsen/Bootstrap-3-Typeahead/tar.gz/c65c829fe8411f6eadb88415d09c1e85bb4603d0"
-
 "bootstrap5@npm:bootstrap@5.3.1":
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.3.1.tgz#8ca07040ad15d7f75891d1504cf14c5dedfb1cfe"

From b24fc4411c6c9c90446740f4f2731891d9849380 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 25 Nov 2024 20:20:41 -0500
Subject: [PATCH 152/159] Simplified get_sms_autocomplete_context

---
 corehq/apps/app_manager/views/releases.py | 5 +----
 corehq/apps/sms/forms.py                  | 4 +++-
 corehq/apps/sms/views.py                  | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/corehq/apps/app_manager/views/releases.py b/corehq/apps/app_manager/views/releases.py
index f8446951c3ea..fbf517406a9e 100644
--- a/corehq/apps/app_manager/views/releases.py
+++ b/corehq/apps/app_manager/views/releases.py
@@ -208,10 +208,7 @@ def get_releases_context(request, domain, app_id):
         'can_view_cloudcare': has_privilege(request, privileges.CLOUDCARE),
         'has_mobile_workers': get_doc_count_in_domain_by_class(domain, CommCareUser) > 0,
         'latest_released_version': get_latest_released_app_version(domain, app_id),
-        'sms_contacts': (
-            get_sms_autocomplete_context(request, domain)['sms_contacts']
-            if can_send_sms else []
-        ),
+        'sms_contacts': get_sms_autocomplete_context(domain) if can_send_sms else [],
         'build_profile_access': build_profile_access,
         'application_profile_url': reverse(LanguageProfilesView.urlname, args=[domain, app_id]),
         'latest_build_id': get_latest_build_id(domain, app_id),
diff --git a/corehq/apps/sms/forms.py b/corehq/apps/sms/forms.py
index 2051e088ff46..6bce5a5747fa 100644
--- a/corehq/apps/sms/forms.py
+++ b/corehq/apps/sms/forms.py
@@ -1307,7 +1307,9 @@ def __init__(self, *args, **kwargs):
         super(ComposeMessageForm, self).__init__(*args, **kwargs)
 
         from corehq.apps.sms.views import get_sms_autocomplete_context
-        self.fields['recipients'].choices = [(contact, contact) for contact in get_sms_autocomplete_context(None, domain)['sms_contacts']]
+        self.fields['recipients'].choices = [
+            (contact, contact) for contact in get_sms_autocomplete_context(domain)
+        ]
 
         self.helper = HQFormHelper()
         self.helper.form_action = reverse('send_to_recipients', args=[domain])
diff --git a/corehq/apps/sms/views.py b/corehq/apps/sms/views.py
index cb61d41efaf2..0161ca977edc 100644
--- a/corehq/apps/sms/views.py
+++ b/corehq/apps/sms/views.py
@@ -204,7 +204,7 @@ def page_context(self):
         return page_context
 
 
-def get_sms_autocomplete_context(request, domain):
+def get_sms_autocomplete_context(domain):
     """A helper view for sms autocomplete"""
     phone_users = CouchUser.view("users/phone_users_by_domain",
         startkey=[domain], endkey=[domain, {}], include_docs=True
@@ -219,7 +219,7 @@ def get_sms_autocomplete_context(request, domain):
             continue
         contacts.append(user.username)
         user_id = user._id
-    return {"sms_contacts": contacts}
+    return contacts
 
 
 @login_and_domain_required

From 3d56205e66cecc4ac47fcf78bdc77abf931f6e75 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 25 Nov 2024 20:26:37 -0500
Subject: [PATCH 153/159] Updated send_to_recipients to expect a list, not a
 string

---
 corehq/apps/sms/views.py | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/corehq/apps/sms/views.py b/corehq/apps/sms/views.py
index 0161ca977edc..69fe22c286f1 100644
--- a/corehq/apps/sms/views.py
+++ b/corehq/apps/sms/views.py
@@ -230,14 +230,13 @@ def send_to_recipients(request, domain):
     # Currently the permission to publish an app is just the login_and_domain_required
     # decorator, and this view matches that.
 
-    recipients = request.POST.get('recipients')
+    recipients = request.POST.getlist('recipients')
     message = request.POST.get('message')
     if not recipients:
         messages.error(request, _("You didn't specify any recipients"))
     elif not message:
         messages.error(request, _("You can't send an empty message"))
     else:
-        recipients = [x.strip() for x in recipients.split(',') if x.strip()]
         phone_numbers = []
         # formats: GroupName (group), "Username", +15555555555
         group_names = []
@@ -332,14 +331,9 @@ def wrap_user_by_type(u):
 
         logged_event.completed()
 
-        def comma_reminder():
-            messages.error(request, _("Please remember to separate recipients"
-                " with a comma."))
-
         if empty_groups or failed_numbers or unknown_usernames or no_numbers:
             if empty_groups:
                 messages.error(request, _("The following groups don't exist: ") + (', '.join(empty_groups)))
-                comma_reminder()
             if no_numbers:
                 messages.error(request,
                     _("The following users don't have phone numbers: ") + (', '.join(no_numbers)))
@@ -349,7 +343,6 @@ def comma_reminder():
             if unknown_usernames:
                 messages.error(request,
                     _("Couldn't find the following user(s): ") + (', '.join(unknown_usernames)))
-                comma_reminder()
             if sent:
                 messages.success(request, _("Successfully sent: ") + (', '.join(sent)))
             else:

From 992612c2ec2cb334f9a4eda87d5e089f44d68880 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 25 Nov 2024 21:21:16 -0500
Subject: [PATCH 154/159] Removed ui-select library

---
 package.json | 1 -
 yarn.lock    | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/package.json b/package.json
index 6dc0233c947e..4c4bd1e78412 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,6 @@
         "string-replace-loader": "3.1.0",
         "topojson": "3.0.2",
         "uglify-js": "3",
-        "ui-select": "npm:ui-select#0.13.2",
         "underscore": "1.13.1",
         "url-polyfill": "1.1.10",
         "webpack": "5.94.0",
diff --git a/yarn.lock b/yarn.lock
index da660f1a7981..672cebe2404d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6720,11 +6720,6 @@ uglify-js@3:
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.1.tgz#e2cb9fe34db9cb4cf7e35d1d26dfea28e09a7d06"
   integrity sha512-JhS3hmcVaXlp/xSo3PKY5R0JqKs5M3IV+exdLHW99qKvKivPO4Z8qbej6mte17SOPqAOVMjt/XGgWacnFSzM3g==
 
-"ui-select@npm:ui-select#0.13.2":
-  version "0.19.8"
-  resolved "https://registry.yarnpkg.com/ui-select/-/ui-select-0.19.8.tgz#74860848a7fd8bc494d9856d2f62776ea98637c1"
-  integrity sha1-dIYISKf9i8SU2YVtL2J3bqmGN8E=
-
 unbzip2-stream@1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"

From 9f8e6c2c49d9b529ed9d78463ecd1a9403c62181 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 25 Nov 2024 21:23:51 -0500
Subject: [PATCH 155/159] Removed unused dependency

---
 corehq/apps/sms/static/sms/js/compose.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/corehq/apps/sms/static/sms/js/compose.js b/corehq/apps/sms/static/sms/js/compose.js
index ff32a8e14dca..15b5d3065353 100644
--- a/corehq/apps/sms/static/sms/js/compose.js
+++ b/corehq/apps/sms/static/sms/js/compose.js
@@ -1,10 +1,9 @@
 hqDefine("sms/js/compose",[
     "jquery",
-    "hqwebapp/js/initial_page_data",
     "hqwebapp/js/bootstrap3/widgets",
     "jquery-ui/ui/widgets/sortable",
     "commcarehq",
-], function ($, intialPageData) {
+], function ($) {
     $(function () {
         $("#hint_id_recipients").addClass("alert alert-info");
         $("#hint_id_message").addClass("alert alert-info");

From 9d8f431b93cfd9d4726fc45da658c96066c801c2 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 25 Nov 2024 21:28:22 -0500
Subject: [PATCH 156/159] Removed topojson library

---
 package.json |  1 -
 yarn.lock    | 48 +++++-------------------------------------------
 2 files changed, 5 insertions(+), 44 deletions(-)

diff --git a/package.json b/package.json
index 6dc0233c947e..a863648cc8a5 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,6 @@
         "select2": "4.1.0-rc.0",
         "signature_pad": "^5.0.4",
         "string-replace-loader": "3.1.0",
-        "topojson": "3.0.2",
         "uglify-js": "3",
         "ui-select": "npm:ui-select#0.13.2",
         "underscore": "1.13.1",
diff --git a/yarn.lock b/yarn.lock
index da660f1a7981..0ea92889d6b6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2382,11 +2382,6 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2, commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
 commander@2.15.1:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
@@ -2397,6 +2392,11 @@ commander@^10.0.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
   integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
 
+commander@^2.20.0:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
 common-ancestor-path@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz#4f7d2d1394d91b7abdf51871c62f71eadb0182a7"
@@ -6572,44 +6572,6 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
-topojson-client@3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/topojson-client/-/topojson-client-3.1.0.tgz#22e8b1ed08a2b922feeb4af6f53b6ef09a467b99"
-  integrity sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==
-  dependencies:
-    commander "2"
-
-topojson-client@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/topojson-client/-/topojson-client-3.0.0.tgz#1f99293a77ef42a448d032a81aa982b73f360d2f"
-  integrity sha1-H5kpOnfvQqRI0DKoGqmCtz82DS8=
-  dependencies:
-    commander "2"
-
-topojson-server@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/topojson-server/-/topojson-server-3.0.0.tgz#378e78e87c3972a7b5be2c5d604369b6bae69c5e"
-  integrity sha1-N4546Hw5cqe1vixdYENptrrmnF4=
-  dependencies:
-    commander "2"
-
-topojson-simplify@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/topojson-simplify/-/topojson-simplify-3.0.2.tgz#8a2403e639531500fafa0c6594e8b0fadebc2c02"
-  integrity sha512-gyYSVRt4jO/0RJXKZQPzTDQRWV+D/nOfiljNUv0HBXslFLtq3yxRHrl7jbrjdbda5Ytdr7M8BZUI4OxU7tnbRQ==
-  dependencies:
-    commander "2"
-    topojson-client "3"
-
-topojson@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/topojson/-/topojson-3.0.2.tgz#fcb927306c3e0fa76656fa58deed4555d2346fb4"
-  integrity sha512-u3zeuL6WEVL0dmsRn7uHZKc4Ao4gpW3sORUv+N3ezLTvY3JdCuyg0hvpWiIfFw8p/JwVN++SvAsFgcFEeR15rQ==
-  dependencies:
-    topojson-client "3.0.0"
-    topojson-server "3.0.0"
-    topojson-simplify "3.0.2"
-
 tough-cookie@^4.1.3, tough-cookie@~2.5.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"

From 70bc3c03a891ca7fce21dcf6886077881bc62520 Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Tue, 26 Nov 2024 08:10:45 -0500
Subject: [PATCH 157/159] Wrap docker test invocation to multiple lines

---
 .github/workflows/tests.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 658db16b1652..8dab6eacb7d2 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -50,7 +50,15 @@ jobs:
         JS_SETUP: yes
         KAFKA_HOSTNAME: kafka
         STRIPE_PRIVATE_KEY: ${{ secrets.STRIPE_PRIVATE_KEY }}
-      run: scripts/docker test --exitfirst -vv --reusedb=1 --divided-we-run=${{ matrix.DIVIDED_WE_RUN }} --showlocals --max-test-time=29 -p no:cacheprovider
+      run: >-
+        scripts/docker test
+        --exitfirst
+        -vv
+        --reusedb=1
+        --divided-we-run=${{ matrix.DIVIDED_WE_RUN }}
+        --showlocals
+        --max-test-time=29
+        -p no:cacheprovider
     - name: "Codecov upload"
       env:
         TOKEN: ${{ secrets.CODECOV_TOKEN }}

From ca289bfe285064e9af5f25e7145572f8fce2c782 Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Tue, 26 Nov 2024 08:12:26 -0500
Subject: [PATCH 158/159] -vv -> --verbosity=2

They are equivalent, and --verbosity=2 is more consistent with other options.
---
 .github/workflows/tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8dab6eacb7d2..7cc3aa44f2d4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -53,7 +53,7 @@ jobs:
       run: >-
         scripts/docker test
         --exitfirst
-        -vv
+        --verbosity=2
         --reusedb=1
         --divided-we-run=${{ matrix.DIVIDED_WE_RUN }}
         --showlocals

From 15691732fd5bf414b107d90b7a7a39606357953f Mon Sep 17 00:00:00 2001
From: Daniel Miller <dmiller@dimagi.com>
Date: Tue, 26 Nov 2024 09:20:07 -0500
Subject: [PATCH 159/159] Skip migrations when running pytest

Migrations are run on the python-sharded-and-javascript test node.
See `./manage.py migrate` in run.sh _test_javascript.
---
 .github/workflows/tests.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7cc3aa44f2d4..a1b290f04c7f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -55,6 +55,7 @@ jobs:
         --exitfirst
         --verbosity=2
         --reusedb=1
+        --no-migrations
         --divided-we-run=${{ matrix.DIVIDED_WE_RUN }}
         --showlocals
         --max-test-time=29