From 301ed7dc90659cca041db68c08009beae16d8f43 Mon Sep 17 00:00:00 2001
From: Jenny Schweers <jschweers@dimagi.com>
Date: Mon, 25 Nov 2024 17:37:53 -0500
Subject: [PATCH] Migrated UCR expression pages

---
 corehq/apps/userreports/static/userreports/js/ucr_expression.js | 1 +
 .../apps/userreports/static/userreports/js/ucr_expressions.js   | 1 +
 .../apps/userreports/templates/userreports/ucr_expression.html  | 2 +-
 .../apps/userreports/templates/userreports/ucr_expressions.html | 2 +-
 .../users/templates/users/commcare_user_confirm_account.html    | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/corehq/apps/userreports/static/userreports/js/ucr_expression.js b/corehq/apps/userreports/static/userreports/js/ucr_expression.js
index f5d49b4f3319..db22411cb913 100644
--- a/corehq/apps/userreports/static/userreports/js/ucr_expression.js
+++ b/corehq/apps/userreports/static/userreports/js/ucr_expression.js
@@ -5,6 +5,7 @@ hqDefine("userreports/js/ucr_expression", [
     'hqwebapp/js/initial_page_data',
     'hqwebapp/js/base_ace',
     'hqwebapp/js/bootstrap3/alert_user',
+    'commcarehq',
 ], function (
     moment,
     ko,
diff --git a/corehq/apps/userreports/static/userreports/js/ucr_expressions.js b/corehq/apps/userreports/static/userreports/js/ucr_expressions.js
index 2fb0545b7c50..895d408d7cf6 100644
--- a/corehq/apps/userreports/static/userreports/js/ucr_expressions.js
+++ b/corehq/apps/userreports/static/userreports/js/ucr_expressions.js
@@ -3,6 +3,7 @@ hqDefine('userreports/js/ucr_expressions', [
     "hqwebapp/js/initial_page_data",
     "hqwebapp/js/bootstrap3/crud_paginated_list_init",
     'hqwebapp/js/base_ace',
+    'commcarehq',
 ], function () {
     // used to include base_ace on the ucr_statements page
 
diff --git a/corehq/apps/userreports/templates/userreports/ucr_expression.html b/corehq/apps/userreports/templates/userreports/ucr_expression.html
index 85f1b7592943..2407d2d34b0f 100644
--- a/corehq/apps/userreports/templates/userreports/ucr_expression.html
+++ b/corehq/apps/userreports/templates/userreports/ucr_expression.html
@@ -13,7 +13,7 @@
   {% endcompress %}
 {% endblock %}
 
-{% requirejs_main "userreports/js/ucr_expression" %}
+{% js_entry_b3 "userreports/js/ucr_expression" %}
 
 {% block page_content %}
 {% initial_page_data "expression" expression %}
diff --git a/corehq/apps/userreports/templates/userreports/ucr_expressions.html b/corehq/apps/userreports/templates/userreports/ucr_expressions.html
index d66ef472a830..2d8af316455f 100644
--- a/corehq/apps/userreports/templates/userreports/ucr_expressions.html
+++ b/corehq/apps/userreports/templates/userreports/ucr_expressions.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load hq_shared_tags %}
 
-{% requirejs_main "userreports/js/ucr_expressions" %}
+{% js_entry_b3 "userreports/js/ucr_expressions" %}
 
 {% block pagination_templates %}
 <script type="text/html" id="base-ucr-statement-template">
diff --git a/corehq/apps/users/templates/users/commcare_user_confirm_account.html b/corehq/apps/users/templates/users/commcare_user_confirm_account.html
index 5578a32575bf..3ce0a36a9819 100644
--- a/corehq/apps/users/templates/users/commcare_user_confirm_account.html
+++ b/corehq/apps/users/templates/users/commcare_user_confirm_account.html
@@ -3,7 +3,7 @@
 {% load field_tags %}
 {% load hq_shared_tags %}
 
-{% requirejs_main 'users/js/accept_invite' %}
+{% js_entry_b3 'users/js/accept_invite' %}
 
 {% block title %}{% blocktrans %}Confirm your account to join the {{ domain_name }} project{% endblocktrans %}{% endblock title %}
 {% block tabs %}{% endblock %}