From 1750e65c19a11a318b4ec7e90c7f8febc497f1d5 Mon Sep 17 00:00:00 2001
From: Christina Lin <44586776+chrstinalin@users.noreply.github.com>
Date: Thu, 17 Oct 2024 14:20:45 -0400
Subject: [PATCH 01/16] Modified button behaviour when enable-submissions flag
 is disabled

---
 .../devhub/templates/devhub/addons/submit/upload.html |  9 +++++++--
 .../devhub/templates/devhub/addons/submit/wizard.html |  7 ++++++-
 src/olympia/devhub/views.py                           |  4 +++-
 static/css/zamboni/developers.css                     |  4 ++++
 static/js/zamboni/devhub.js                           | 11 +++++++++++
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/olympia/devhub/templates/devhub/addons/submit/upload.html b/src/olympia/devhub/templates/devhub/addons/submit/upload.html
index fb20c82ae853..018ba7147cdc 100644
--- a/src/olympia/devhub/templates/devhub/addons/submit/upload.html
+++ b/src/olympia/devhub/templates/devhub/addons/submit/upload.html
@@ -35,7 +35,13 @@ <h3>{{ _('Upload Version') }}</h3>
   The maximum file size accepted is {{ max_size }}. If your add-on is larger than {{ max_size }}, it will fail validation.
   {% endtrans %}
   </p>
-  <section id="upload-file">
+  <section
+  id="upload-file"
+  data-submissions-enabled="{{ submissions_enabled|json }}"
+  {% if reason %}
+    data-disabled-reason="{{ reason }}"
+  {% endif %}
+  >
 
   <div class="hidden">
     {{ new_addon_form.upload }}
@@ -51,7 +57,6 @@ <h3>{{ _('Upload Version') }}</h3>
     {% endif %}
   {% endif %}
   data-max-upload-size="{{ max_upload_size }}"
-  data-submissions-enabled="{{ submissions_enabled|json }}"
   >
   {{ new_addon_form.theme_specific }}
   {{ new_addon_form.non_field_errors() }}
diff --git a/src/olympia/devhub/templates/devhub/addons/submit/wizard.html b/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
index 15e5f0ffd485..01ff166dfe8e 100644
--- a/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
+++ b/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
@@ -8,7 +8,12 @@
 
 {% block primary %}
   <h3>{{ _('Theme generator') }}</h3>
-  <div id="theme-wizard" data-version="{{ version_number }}">
+  <div id="theme-wizard" data-version="{{ version_number }}"
+  data-submissions-enabled="{{ submissions_enabled|json }}"
+  {% if reason %}
+    data-disabled-reason="{{ reason }}"
+  {% endif %}
+  >
     {% if unsupported_properties %}
       <div class="notification-box error">
           {{ _('Warning: the following manifest properties that your most recent version '
diff --git a/src/olympia/devhub/views.py b/src/olympia/devhub/views.py
index 573f2b1ee213..4515a85506c7 100644
--- a/src/olympia/devhub/views.py
+++ b/src/olympia/devhub/views.py
@@ -1594,6 +1594,7 @@ def _submit_upload(
         wizard_url = reverse('devhub.submit.wizard', args=[channel_text])
     else:
         wizard_url = None
+    flag = waffle.get_waffle_flag_model().get('enable-submissions')
     return TemplateResponse(
         request,
         template,
@@ -1612,7 +1613,8 @@ def _submit_upload(
             'version_number': get_next_version_number(addon) if wizard else None,
             'wizard_url': wizard_url,
             'max_upload_size': settings.MAX_UPLOAD_SIZE,
-            'submissions_enabled': waffle.flag_is_active(request, 'enable-submissions'),
+            'submissions_enabled': flag.is_active(request),
+            'reason': flag.note if hasattr(flag, 'note') else None
         },
     )
 
diff --git a/static/css/zamboni/developers.css b/static/css/zamboni/developers.css
index f4704fa7612d..669048ad79b4 100644
--- a/static/css/zamboni/developers.css
+++ b/static/css/zamboni/developers.css
@@ -425,6 +425,10 @@ form .char-count b {
 
 .addon-submission-process form div.addon-submission-field {
     margin-bottom: 1em;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 1em;
 }
 
 .clear-info-request label {
diff --git a/static/js/zamboni/devhub.js b/static/js/zamboni/devhub.js
index 867fa2a5f76d..8c27b3f380b3 100644
--- a/static/js/zamboni/devhub.js
+++ b/static/js/zamboni/devhub.js
@@ -47,12 +47,23 @@ $(document).ready(function () {
     initUploadPreview();
   });
 
+  // disable buttons if submission is disabled
+  const submissionsDisabled = !$('#upload-file').data('submissions-enabled');
+  const reason = $('#upload-file').data('disabled-reason');
+  
+  $('.submission-buttons .button').toggleClass('disabled', submissionsDisabled);
+  const error = $('<div>').text(gettext('Add-on uploads are temporarily unavailable.'))
+  const tooltip = $('<span>?</span>').addClass('tip tooltip').attr('title', reason);
+  reason && error.append(tooltip);
+  submissionsDisabled && $('.addon-submission-field').append(error)
+
   // Add-on uploader
   var $uploadAddon = $('#upload-addon');
   if ($('#upload-addon').length) {
     var opt = {
       cancel: $('.upload-file-cancel'),
       maxSize: $uploadAddon.data('max-upload-size'),
+      submissionsDisabled
     };
     opt.appendFormData = function (formData) {
       if ($('#addon-compat-upload').length) {

From 85bcb3bf39ca191e47ae96efded20c6df0d22f3d Mon Sep 17 00:00:00 2001
From: Christina Lin <44586776+chrstinalin@users.noreply.github.com>
Date: Thu, 17 Oct 2024 14:47:22 -0400
Subject: [PATCH 02/16] wizard

---
 .../devhub/templates/devhub/addons/submit/upload.html | 11 +++++++----
 .../devhub/templates/devhub/addons/submit/wizard.html | 11 +++++++----
 src/olympia/devhub/views.py                           |  2 +-
 static/css/zamboni/developers.css                     |  8 ++++----
 static/js/common/upload-addon.js                      |  9 +--------
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/olympia/devhub/templates/devhub/addons/submit/upload.html b/src/olympia/devhub/templates/devhub/addons/submit/upload.html
index 018ba7147cdc..2f91ec4f7bd0 100644
--- a/src/olympia/devhub/templates/devhub/addons/submit/upload.html
+++ b/src/olympia/devhub/templates/devhub/addons/submit/upload.html
@@ -37,10 +37,6 @@ <h3>{{ _('Upload Version') }}</h3>
   </p>
   <section
   id="upload-file"
-  data-submissions-enabled="{{ submissions_enabled|json }}"
-  {% if reason %}
-    data-disabled-reason="{{ reason }}"
-  {% endif %}
   >
 
   <div class="hidden">
@@ -107,4 +103,11 @@ <h3>{{ _('Create a Theme Version') }}</h3>
     </div>
   </section>
 </form>
+<span
+id="submissions"
+class="hidden"
+data-submissions-enabled="{{ submissions_enabled|json }}"
+{% if reason %}
+  data-disabled-reason="{{ reason }}"
+{% endif %}></span>
 {% endblock primary %}
diff --git a/src/olympia/devhub/templates/devhub/addons/submit/wizard.html b/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
index 01ff166dfe8e..2971948bba81 100644
--- a/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
+++ b/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
@@ -9,10 +9,6 @@
 {% block primary %}
   <h3>{{ _('Theme generator') }}</h3>
   <div id="theme-wizard" data-version="{{ version_number }}"
-  data-submissions-enabled="{{ submissions_enabled|json }}"
-  {% if reason %}
-    data-disabled-reason="{{ reason }}"
-  {% endif %}
   >
     {% if unsupported_properties %}
       <div class="notification-box error">
@@ -123,4 +119,11 @@ <h3>{{ _('Browser preview') }}</h3>
       </div>
     </form>
   </div>
+  <span
+  id="submissions"
+  class="hidden"
+  data-submissions-enabled="{{ submissions_enabled|json }}"
+  {% if reason %}
+    data-disabled-reason="{{ reason }}"
+  {% endif %}></span>
 {% endblock %}
diff --git a/src/olympia/devhub/views.py b/src/olympia/devhub/views.py
index 4515a85506c7..afc0c1391ce6 100644
--- a/src/olympia/devhub/views.py
+++ b/src/olympia/devhub/views.py
@@ -1614,7 +1614,7 @@ def _submit_upload(
             'wizard_url': wizard_url,
             'max_upload_size': settings.MAX_UPLOAD_SIZE,
             'submissions_enabled': flag.is_active(request),
-            'reason': flag.note if hasattr(flag, 'note') else None
+            'reason': flag.note if hasattr(flag, 'note') else None,
         },
     )
 
diff --git a/static/css/zamboni/developers.css b/static/css/zamboni/developers.css
index 669048ad79b4..6998d722c0f1 100644
--- a/static/css/zamboni/developers.css
+++ b/static/css/zamboni/developers.css
@@ -425,10 +425,10 @@ form .char-count b {
 
 .addon-submission-process form div.addon-submission-field {
     margin-bottom: 1em;
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    gap: 1em;
+}
+
+div.addon-submission-field .submissions-disabled-error {
+    padding: 1em 0em;
 }
 
 .clear-info-request label {
diff --git a/static/js/common/upload-addon.js b/static/js/common/upload-addon.js
index 569fb195d5c0..c3701e1c0d6e 100644
--- a/static/js/common/upload-addon.js
+++ b/static/js/common/upload-addon.js
@@ -36,6 +36,7 @@
       getErrors: getErrors,
       cancel: $(),
       maxSize: null, // Dynamically set by devhub.js
+      submissionsDisabled: false,
     };
 
     if (options) {
@@ -79,17 +80,9 @@
           text: gettext('Your add-on should end with .zip, .xpi or .crx'),
         });
 
-      const submissionsDisabled = !$(this).data('submissions-enabled');
       ui_link.toggleClass('disabled', submissionsDisabled);
       $upload_field.prop('disabled', submissionsDisabled);
 
-      $upload_field.attr(
-        'title',
-        submissionsDisabled
-          ? gettext('Add-on uploads are temporarily unavailable.')
-          : $upload_field.attr('title'),
-      );
-
       $upload_field.wrap(ui_parent);
       $upload_field.before(ui_link);
       $upload_field.parent().after(ui_details);

From f2d088c33875066468687b0835cc5a3a68c340d9 Mon Sep 17 00:00:00 2001
From: Christina Lin <44586776+chrstinalin@users.noreply.github.com>
Date: Thu, 17 Oct 2024 14:52:16 -0400
Subject: [PATCH 03/16] formatting

---
 .../devhub/addons/submit/upload.html          | 18 +++++++--------
 .../devhub/addons/submit/wizard.html          | 16 ++++++-------
 static/js/zamboni/devhub.js                   | 23 +++++++++++++------
 3 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/olympia/devhub/templates/devhub/addons/submit/upload.html b/src/olympia/devhub/templates/devhub/addons/submit/upload.html
index 2f91ec4f7bd0..5916a01cb40a 100644
--- a/src/olympia/devhub/templates/devhub/addons/submit/upload.html
+++ b/src/olympia/devhub/templates/devhub/addons/submit/upload.html
@@ -35,10 +35,7 @@ <h3>{{ _('Upload Version') }}</h3>
   The maximum file size accepted is {{ max_size }}. If your add-on is larger than {{ max_size }}, it will fail validation.
   {% endtrans %}
   </p>
-  <section
-  id="upload-file"
-  >
-
+  <section id="upload-file">
   <div class="hidden">
     {{ new_addon_form.upload }}
   </div>
@@ -104,10 +101,11 @@ <h3>{{ _('Create a Theme Version') }}</h3>
   </section>
 </form>
 <span
-id="submissions"
-class="hidden"
-data-submissions-enabled="{{ submissions_enabled|json }}"
-{% if reason %}
-  data-disabled-reason="{{ reason }}"
-{% endif %}></span>
+  class="hidden"
+  id="submissions"
+  data-submissions-enabled="{{ submissions_enabled|json }}"
+  {% if reason %}
+    data-disabled-reason="{{ reason }}"
+  {% endif %}>
+</span>
 {% endblock primary %}
diff --git a/src/olympia/devhub/templates/devhub/addons/submit/wizard.html b/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
index 2971948bba81..46b831a93d7c 100644
--- a/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
+++ b/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
@@ -8,8 +8,7 @@
 
 {% block primary %}
   <h3>{{ _('Theme generator') }}</h3>
-  <div id="theme-wizard" data-version="{{ version_number }}"
-  >
+  <div id="theme-wizard" data-version="{{ version_number }}">
     {% if unsupported_properties %}
       <div class="notification-box error">
           {{ _('Warning: the following manifest properties that your most recent version '
@@ -120,10 +119,11 @@ <h3>{{ _('Browser preview') }}</h3>
     </form>
   </div>
   <span
-  id="submissions"
-  class="hidden"
-  data-submissions-enabled="{{ submissions_enabled|json }}"
-  {% if reason %}
-    data-disabled-reason="{{ reason }}"
-  {% endif %}></span>
+    class="hidden"
+    id="submissions"
+    data-submissions-enabled="{{ submissions_enabled|json }}"
+    {% if reason %}
+      data-disabled-reason="{{ reason }}"
+    {% endif %}>
+  </span>
 {% endblock %}
diff --git a/static/js/zamboni/devhub.js b/static/js/zamboni/devhub.js
index 8c27b3f380b3..0b073655fce7 100644
--- a/static/js/zamboni/devhub.js
+++ b/static/js/zamboni/devhub.js
@@ -48,14 +48,23 @@ $(document).ready(function () {
   });
 
   // disable buttons if submission is disabled
-  const submissionsDisabled = !$('#upload-file').data('submissions-enabled');
-  const reason = $('#upload-file').data('disabled-reason');
-  
+
+  // if upload-file exists
+
+  const submissionField = $('#submissions');
+  const submissionsDisabled =
+    submissionField && !submissionField.data('submissions-enabled');
+  const reason = submissionField.data('disabled-reason');
+
   $('.submission-buttons .button').toggleClass('disabled', submissionsDisabled);
-  const error = $('<div>').text(gettext('Add-on uploads are temporarily unavailable.'))
-  const tooltip = $('<span>?</span>').addClass('tip tooltip').attr('title', reason);
+  const error = $('<div>')
+    .addClass('submissions-disabled-error')
+    .text(gettext('Add-on uploads are temporarily unavailable.'));
+  const tooltip = $('<span>?</span>')
+    .addClass('tip tooltip')
+    .attr('title', reason);
   reason && error.append(tooltip);
-  submissionsDisabled && $('.addon-submission-field').append(error)
+  submissionsDisabled && $('.addon-submission-field').append(error);
 
   // Add-on uploader
   var $uploadAddon = $('#upload-addon');
@@ -63,7 +72,7 @@ $(document).ready(function () {
     var opt = {
       cancel: $('.upload-file-cancel'),
       maxSize: $uploadAddon.data('max-upload-size'),
-      submissionsDisabled
+      submissionsDisabled,
     };
     opt.appendFormData = function (formData) {
       if ($('#addon-compat-upload').length) {

From f02493c27f79068aa9b71f9b0f5285de0699fd64 Mon Sep 17 00:00:00 2001
From: Christina Lin <44586776+chrstinalin@users.noreply.github.com>
Date: Thu, 17 Oct 2024 14:54:15 -0400
Subject: [PATCH 04/16] extra comment

---
 src/olympia/devhub/templates/devhub/addons/submit/upload.html | 3 ++-
 static/js/zamboni/devhub.js                                   | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/olympia/devhub/templates/devhub/addons/submit/upload.html b/src/olympia/devhub/templates/devhub/addons/submit/upload.html
index 5916a01cb40a..0d5bec2e7f91 100644
--- a/src/olympia/devhub/templates/devhub/addons/submit/upload.html
+++ b/src/olympia/devhub/templates/devhub/addons/submit/upload.html
@@ -31,11 +31,12 @@ <h3>{{ _('Upload Version') }}</h3>
     Use the fields below to upload your add-on package. After upload, a series
     of automated validation tests will be run on your file.
   {% endtrans %}
-  {% trans max_size=max_upload_size|filesizeformat %}
+  {% trans max_size=mzax_upload_size|filesizeformat %}
   The maximum file size accepted is {{ max_size }}. If your add-on is larger than {{ max_size }}, it will fail validation.
   {% endtrans %}
   </p>
   <section id="upload-file">
+
   <div class="hidden">
     {{ new_addon_form.upload }}
   </div>
diff --git a/static/js/zamboni/devhub.js b/static/js/zamboni/devhub.js
index 0b073655fce7..e06d26cf68fc 100644
--- a/static/js/zamboni/devhub.js
+++ b/static/js/zamboni/devhub.js
@@ -48,9 +48,6 @@ $(document).ready(function () {
   });
 
   // disable buttons if submission is disabled
-
-  // if upload-file exists
-
   const submissionField = $('#submissions');
   const submissionsDisabled =
     submissionField && !submissionField.data('submissions-enabled');

From 517513b235fa3e2141bab9363a211b0e0675bc4b Mon Sep 17 00:00:00 2001
From: Christina Lin <44586776+chrstinalin@users.noreply.github.com>
Date: Thu, 17 Oct 2024 14:55:01 -0400
Subject: [PATCH 05/16] typo

---
 src/olympia/devhub/templates/devhub/addons/submit/upload.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/olympia/devhub/templates/devhub/addons/submit/upload.html b/src/olympia/devhub/templates/devhub/addons/submit/upload.html
index 0d5bec2e7f91..bef8a85d26f4 100644
--- a/src/olympia/devhub/templates/devhub/addons/submit/upload.html
+++ b/src/olympia/devhub/templates/devhub/addons/submit/upload.html
@@ -31,7 +31,7 @@ <h3>{{ _('Upload Version') }}</h3>
     Use the fields below to upload your add-on package. After upload, a series
     of automated validation tests will be run on your file.
   {% endtrans %}
-  {% trans max_size=mzax_upload_size|filesizeformat %}
+  {% trans max_size=max_upload_size|filesizeformat %}
   The maximum file size accepted is {{ max_size }}. If your add-on is larger than {{ max_size }}, it will fail validation.
   {% endtrans %}
   </p>

From e4917086be08895b30066e93ef3614b33686f317 Mon Sep 17 00:00:00 2001
From: Christina Lin <44586776+chrstinalin@users.noreply.github.com>
Date: Thu, 17 Oct 2024 15:41:30 -0400
Subject: [PATCH 06/16] test

---
 src/olympia/devhub/tests/test_views_submit.py | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/olympia/devhub/tests/test_views_submit.py b/src/olympia/devhub/tests/test_views_submit.py
index fc1e0d46c3a9..4ae87c253ea1 100644
--- a/src/olympia/devhub/tests/test_views_submit.py
+++ b/src/olympia/devhub/tests/test_views_submit.py
@@ -3016,6 +3016,21 @@ def setUp(self):
         addon = self.get_addon()
         self.version = version_factory(addon=addon)
 
+    def _test_submissions_disabled_variables(self, viewname, args=None):
+        args = args or []
+        self.create_flag('enable-submissions', note=':-(', everyone=False)
+        url = reverse(viewname, args=args)
+        response = self.client.post(url)
+        submissionsField = pq(response.content)('#submissions')
+        assert submissionsField
+        assert submissionsField.attr('data-submissions-enabled') == 'false'
+        assert submissionsField.attr('data-disabled-reason') == ':-('
+
+    def _test_submissions_disabled_variables_by_list_type(self, viewname, args=None):
+        args = args or []
+        self._test_submissions_disabled_variables(viewname, args + ['listed'])
+        self._test_submissions_disabled_variables(viewname, args + ['unlisted'])
+
     def _test_submissions_disabled(self, viewname, args=None):
         args = args or []
         self.create_flag('enable-submissions', note=':-(', everyone=False)
@@ -3028,8 +3043,8 @@ def _test_submissions_disabled(self, viewname, args=None):
 
     def _test_submissions_disabled_by_list_type(self, viewname, args=None):
         args = args or []
-        self._test_submissions_disabled(viewname, args=args + ['listed'])
-        self._test_submissions_disabled(viewname, args=args + ['unlisted'])
+        self._test_submissions_disabled(viewname, args + ['listed'])
+        self._test_submissions_disabled(viewname, args + ['unlisted'])
 
     def test_submissions_disabled_submit_details(self):
         self._test_submissions_disabled('devhub.submit.details', args=['a3615'])
@@ -3046,3 +3061,9 @@ def test_submissions_disabled_version_finish(self):
         self._test_submissions_disabled(
             'devhub.submit.version.finish', args=[self.addon.slug, self.version.pk]
         )
+
+    def test_submissions_disabled_upload(self):
+        self._test_submissions_disabled_variables_by_list_type('devhub.submit.upload')
+
+    def test_submissions_disabled_wizard(self):
+        self._test_submissions_disabled_variables_by_list_type('devhub.submit.wizard')

From 9eab1a1ef2d97e2c0507ff4256f182cfb70f3ac5 Mon Sep 17 00:00:00 2001
From: Christina Lin <44586776+chrstinalin@users.noreply.github.com>
Date: Thu, 17 Oct 2024 15:43:01 -0400
Subject: [PATCH 07/16] redundancy

---
 src/olympia/devhub/tests/test_views_submit.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/olympia/devhub/tests/test_views_submit.py b/src/olympia/devhub/tests/test_views_submit.py
index 4ae87c253ea1..c97537d4bb78 100644
--- a/src/olympia/devhub/tests/test_views_submit.py
+++ b/src/olympia/devhub/tests/test_views_submit.py
@@ -3043,8 +3043,8 @@ def _test_submissions_disabled(self, viewname, args=None):
 
     def _test_submissions_disabled_by_list_type(self, viewname, args=None):
         args = args or []
-        self._test_submissions_disabled(viewname, args + ['listed'])
-        self._test_submissions_disabled(viewname, args + ['unlisted'])
+        self._test_submissions_disabled(viewname, args=args + ['listed'])
+        self._test_submissions_disabled(viewname, args=args + ['unlisted'])
 
     def test_submissions_disabled_submit_details(self):
         self._test_submissions_disabled('devhub.submit.details', args=['a3615'])

From 0ecc38b7ef13a86705fad08268e55b1d3f6e81a5 Mon Sep 17 00:00:00 2001
From: Christina Lin <44586776+chrstinalin@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:35:59 -0400
Subject: [PATCH 08/16] what was i doing

---
 .../templates/devhub/addons/submit/upload.html | 18 +++++++++---------
 .../templates/devhub/addons/submit/wizard.html | 18 +++++++++---------
 static/js/zamboni/devhub.js                    | 13 ++-----------
 3 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/src/olympia/devhub/templates/devhub/addons/submit/upload.html b/src/olympia/devhub/templates/devhub/addons/submit/upload.html
index bef8a85d26f4..9fec9fa32a4c 100644
--- a/src/olympia/devhub/templates/devhub/addons/submit/upload.html
+++ b/src/olympia/devhub/templates/devhub/addons/submit/upload.html
@@ -94,19 +94,19 @@ <h3>{{ _('Create a Theme Version') }}</h3>
     </p>
     {% endif %}
 
-    <div class="submission-buttons addon-submission-field">
+    <div id="submissions" class="submission-buttons addon-submission-field" data-submissions-enabled="{{ submissions_enabled|json }}">
       <button class="addon-upload-dependant" id="submit-upload-file-finish" disabled=disabled type="submit">
         {{ _('Continue') }}
       </button>
+      {% if not submissions_enabled %}
+          <div class="submissions-disabled-error">
+            Add-on uploads are temporarily unavailable.
+            {% if reason %}
+            <span class="tip tooltip" title="{{ reason }}">?</span>
+            {% endif %}
+          </div>
+      {% endif %}
     </div>
   </section>
 </form>
-<span
-  class="hidden"
-  id="submissions"
-  data-submissions-enabled="{{ submissions_enabled|json }}"
-  {% if reason %}
-    data-disabled-reason="{{ reason }}"
-  {% endif %}>
-</span>
 {% endblock primary %}
diff --git a/src/olympia/devhub/templates/devhub/addons/submit/wizard.html b/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
index 46b831a93d7c..45d05f759294 100644
--- a/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
+++ b/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
@@ -96,7 +96,7 @@ <h3>{{ _('Browser preview') }}</h3>
       {{ new_addon_form.compatible_apps.errors }}
       {{ new_addon_form.upload.errors }}
       {{ new_addon_form.non_field_errors() }}
-      <div class="submission-buttons addon-submission-field">
+      <div id="submissions" class="submission-buttons addon-submission-field" data-submissions-enabled="{{ submissions_enabled|json }}">
         <button class="button upload"
             {% if addon %}
                 formaction="{{ url('devhub.upload_for_version', addon.slug, channel_param) }}"
@@ -115,15 +115,15 @@ <h3>{{ _('Browser preview') }}</h3>
             {% endif %}
             >{{ _('Back') }}
         </button>
+        {% if not submissions_enabled %}
+          <div class="submissions-disabled-error">
+            Add-on uploads are temporarily unavailable.
+            {% if reason %}
+              <span class="tip tooltip" title="{{ reason }}">?</span>
+            {% endif %}
+          </div>
+        {% endif %}
       </div>
     </form>
   </div>
-  <span
-    class="hidden"
-    id="submissions"
-    data-submissions-enabled="{{ submissions_enabled|json }}"
-    {% if reason %}
-      data-disabled-reason="{{ reason }}"
-    {% endif %}>
-  </span>
 {% endblock %}
diff --git a/static/js/zamboni/devhub.js b/static/js/zamboni/devhub.js
index e06d26cf68fc..501b4cb88a89 100644
--- a/static/js/zamboni/devhub.js
+++ b/static/js/zamboni/devhub.js
@@ -51,17 +51,8 @@ $(document).ready(function () {
   const submissionField = $('#submissions');
   const submissionsDisabled =
     submissionField && !submissionField.data('submissions-enabled');
-  const reason = submissionField.data('disabled-reason');
-
-  $('.submission-buttons .button').toggleClass('disabled', submissionsDisabled);
-  const error = $('<div>')
-    .addClass('submissions-disabled-error')
-    .text(gettext('Add-on uploads are temporarily unavailable.'));
-  const tooltip = $('<span>?</span>')
-    .addClass('tip tooltip')
-    .attr('title', reason);
-  reason && error.append(tooltip);
-  submissionsDisabled && $('.addon-submission-field').append(error);
+
+  // $('.submission-buttons .button').toggleClass('disabled', submissionsDisabled);
 
   // Add-on uploader
   var $uploadAddon = $('#upload-addon');

From 9308a8604694b32c6f94530e7465f29689b578ae Mon Sep 17 00:00:00 2001
From: Christina Lin <44586776+chrstinalin@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:48:37 -0400
Subject: [PATCH 09/16] variable, button toggle

---
 static/js/common/upload-addon.js | 4 ++--
 static/js/zamboni/devhub.js      | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/static/js/common/upload-addon.js b/static/js/common/upload-addon.js
index c3701e1c0d6e..c4c9a6d65f7d 100644
--- a/static/js/common/upload-addon.js
+++ b/static/js/common/upload-addon.js
@@ -80,8 +80,8 @@
           text: gettext('Your add-on should end with .zip, .xpi or .crx'),
         });
 
-      ui_link.toggleClass('disabled', submissionsDisabled);
-      $upload_field.prop('disabled', submissionsDisabled);
+      ui_link.toggleClass('disabled', settings.submissionsDisabled);
+      $upload_field.prop('disabled', settings.submissionsDisabled);
 
       $upload_field.wrap(ui_parent);
       $upload_field.before(ui_link);
diff --git a/static/js/zamboni/devhub.js b/static/js/zamboni/devhub.js
index 501b4cb88a89..7ed3b08557a2 100644
--- a/static/js/zamboni/devhub.js
+++ b/static/js/zamboni/devhub.js
@@ -51,8 +51,7 @@ $(document).ready(function () {
   const submissionField = $('#submissions');
   const submissionsDisabled =
     submissionField && !submissionField.data('submissions-enabled');
-
-  // $('.submission-buttons .button').toggleClass('disabled', submissionsDisabled);
+  $('.submission-buttons .button').toggleClass('disabled', submissionsDisabled);
 
   // Add-on uploader
   var $uploadAddon = $('#upload-addon');

From 9935b92b4baa7d559c039c711a2e942e1ba31d5d Mon Sep 17 00:00:00 2001
From: Christina Lin <44586776+chrstinalin@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:52:01 -0400
Subject: [PATCH 10/16] update name

---
 src/olympia/devhub/templates/devhub/addons/submit/upload.html | 2 +-
 src/olympia/devhub/templates/devhub/addons/submit/wizard.html | 2 +-
 static/js/zamboni/devhub.js                                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/olympia/devhub/templates/devhub/addons/submit/upload.html b/src/olympia/devhub/templates/devhub/addons/submit/upload.html
index 9fec9fa32a4c..f9e1b4f5cdc4 100644
--- a/src/olympia/devhub/templates/devhub/addons/submit/upload.html
+++ b/src/olympia/devhub/templates/devhub/addons/submit/upload.html
@@ -94,7 +94,7 @@ <h3>{{ _('Create a Theme Version') }}</h3>
     </p>
     {% endif %}
 
-    <div id="submissions" class="submission-buttons addon-submission-field" data-submissions-enabled="{{ submissions_enabled|json }}">
+    <div id="submission-field" class="submission-buttons addon-submission-field" data-submissions-enabled="{{ submissions_enabled|json }}">
       <button class="addon-upload-dependant" id="submit-upload-file-finish" disabled=disabled type="submit">
         {{ _('Continue') }}
       </button>
diff --git a/src/olympia/devhub/templates/devhub/addons/submit/wizard.html b/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
index 45d05f759294..796463651c0e 100644
--- a/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
+++ b/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
@@ -96,7 +96,7 @@ <h3>{{ _('Browser preview') }}</h3>
       {{ new_addon_form.compatible_apps.errors }}
       {{ new_addon_form.upload.errors }}
       {{ new_addon_form.non_field_errors() }}
-      <div id="submissions" class="submission-buttons addon-submission-field" data-submissions-enabled="{{ submissions_enabled|json }}">
+      <div id="submission-field" class="submission-buttons addon-submission-field" data-submissions-enabled="{{ submissions_enabled|json }}">
         <button class="button upload"
             {% if addon %}
                 formaction="{{ url('devhub.upload_for_version', addon.slug, channel_param) }}"
diff --git a/static/js/zamboni/devhub.js b/static/js/zamboni/devhub.js
index 7ed3b08557a2..fbec1093c318 100644
--- a/static/js/zamboni/devhub.js
+++ b/static/js/zamboni/devhub.js
@@ -48,7 +48,7 @@ $(document).ready(function () {
   });
 
   // disable buttons if submission is disabled
-  const submissionField = $('#submissions');
+  const submissionField = $('#submission-field');
   const submissionsDisabled =
     submissionField && !submissionField.data('submissions-enabled');
   $('.submission-buttons .button').toggleClass('disabled', submissionsDisabled);

From 9de58c9f4b33341f7b29c9c82fe5e4c59ca20670 Mon Sep 17 00:00:00 2001
From: Christina Lin <44586776+chrstinalin@users.noreply.github.com>
Date: Tue, 29 Oct 2024 16:43:03 -0400
Subject: [PATCH 11/16] test

---
 src/olympia/devhub/tests/test_views_submit.py | 31 +++++--------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/olympia/devhub/tests/test_views_submit.py b/src/olympia/devhub/tests/test_views_submit.py
index c97537d4bb78..205dacf42c09 100644
--- a/src/olympia/devhub/tests/test_views_submit.py
+++ b/src/olympia/devhub/tests/test_views_submit.py
@@ -3016,35 +3016,20 @@ def setUp(self):
         addon = self.get_addon()
         self.version = version_factory(addon=addon)
 
-    def _test_submissions_disabled_variables(self, viewname, args=None):
+    def _test_submissions_disabled(self, viewname, assertStatus=True, args=None):
         args = args or []
         self.create_flag('enable-submissions', note=':-(', everyone=False)
         url = reverse(viewname, args=args)
         response = self.client.post(url)
-        submissionsField = pq(response.content)('#submissions')
-        assert submissionsField
-        assert submissionsField.attr('data-submissions-enabled') == 'false'
-        assert submissionsField.attr('data-disabled-reason') == ':-('
-
-    def _test_submissions_disabled_variables_by_list_type(self, viewname, args=None):
-        args = args or []
-        self._test_submissions_disabled_variables(viewname, args + ['listed'])
-        self._test_submissions_disabled_variables(viewname, args + ['unlisted'])
-
-    def _test_submissions_disabled(self, viewname, args=None):
-        args = args or []
-        self.create_flag('enable-submissions', note=':-(', everyone=False)
-        url = reverse(viewname, args=args)
-        response = self.client.post(url)
-        assert response.status_code == 503
+        assert not assertStatus or response.status_code == 503
         doc = pq(response.content)
         assert 'Add-on uploads are temporarily unavailable.' in doc.text()
-        assert ':-(' in doc.text()
+        assert ':-(' in doc.html()
 
-    def _test_submissions_disabled_by_list_type(self, viewname, args=None):
+    def _test_submissions_disabled_by_list_type(self, viewname, assertStatus=True, args=None):
         args = args or []
-        self._test_submissions_disabled(viewname, args=args + ['listed'])
-        self._test_submissions_disabled(viewname, args=args + ['unlisted'])
+        self._test_submissions_disabled(viewname, assertStatus, args=args + ['listed'])
+        self._test_submissions_disabled(viewname, assertStatus, args=args + ['unlisted'])
 
     def test_submissions_disabled_submit_details(self):
         self._test_submissions_disabled('devhub.submit.details', args=['a3615'])
@@ -3063,7 +3048,7 @@ def test_submissions_disabled_version_finish(self):
         )
 
     def test_submissions_disabled_upload(self):
-        self._test_submissions_disabled_variables_by_list_type('devhub.submit.upload')
+        self._test_submissions_disabled_by_list_type('devhub.submit.upload', assertStatus=False)
 
     def test_submissions_disabled_wizard(self):
-        self._test_submissions_disabled_variables_by_list_type('devhub.submit.wizard')
+        self._test_submissions_disabled_by_list_type('devhub.submit.wizard', assertStatus=False)

From 5d47868d049026cb7f1fd4493dfdc168578f549e Mon Sep 17 00:00:00 2001
From: Christina Lin <44586776+chrstinalin@users.noreply.github.com>
Date: Tue, 29 Oct 2024 16:51:31 -0400
Subject: [PATCH 12/16] lint

---
 src/olympia/devhub/tests/test_views_submit.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/olympia/devhub/tests/test_views_submit.py b/src/olympia/devhub/tests/test_views_submit.py
index 205dacf42c09..37897cb93a80 100644
--- a/src/olympia/devhub/tests/test_views_submit.py
+++ b/src/olympia/devhub/tests/test_views_submit.py
@@ -3026,10 +3026,14 @@ def _test_submissions_disabled(self, viewname, assertStatus=True, args=None):
         assert 'Add-on uploads are temporarily unavailable.' in doc.text()
         assert ':-(' in doc.html()
 
-    def _test_submissions_disabled_by_list_type(self, viewname, assertStatus=True, args=None):
+    def _test_submissions_disabled_by_list_type(
+        self, viewname, assertStatus=True, args=None
+    ):
         args = args or []
         self._test_submissions_disabled(viewname, assertStatus, args=args + ['listed'])
-        self._test_submissions_disabled(viewname, assertStatus, args=args + ['unlisted'])
+        self._test_submissions_disabled(
+            viewname, assertStatus, args=args + ['unlisted']
+        )
 
     def test_submissions_disabled_submit_details(self):
         self._test_submissions_disabled('devhub.submit.details', args=['a3615'])
@@ -3048,7 +3052,11 @@ def test_submissions_disabled_version_finish(self):
         )
 
     def test_submissions_disabled_upload(self):
-        self._test_submissions_disabled_by_list_type('devhub.submit.upload', assertStatus=False)
+        self._test_submissions_disabled_by_list_type(
+            'devhub.submit.upload', assertStatus=False
+        )
 
     def test_submissions_disabled_wizard(self):
-        self._test_submissions_disabled_by_list_type('devhub.submit.wizard', assertStatus=False)
+        self._test_submissions_disabled_by_list_type(
+            'devhub.submit.wizard', assertStatus=False
+        )

From 4b7a56d31d83e3782a37b68cce9d7d92ecd5b22c Mon Sep 17 00:00:00 2001
From: Christina Lin <44586776+chrstinalin@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:33:13 -0400
Subject: [PATCH 13/16] moved notification into banner

---
 .../devhub/addons/submit/upload.html          |  8 -------
 .../devhub/addons/submit/wizard.html          |  8 -------
 src/olympia/devhub/tests/test_views_submit.py | 23 +++++++++++--------
 src/olympia/devhub/views.py                   | 17 +++++++++++---
 static/css/zamboni/developers.css             |  4 ----
 5 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/src/olympia/devhub/templates/devhub/addons/submit/upload.html b/src/olympia/devhub/templates/devhub/addons/submit/upload.html
index f9e1b4f5cdc4..f3c88106d576 100644
--- a/src/olympia/devhub/templates/devhub/addons/submit/upload.html
+++ b/src/olympia/devhub/templates/devhub/addons/submit/upload.html
@@ -98,14 +98,6 @@ <h3>{{ _('Create a Theme Version') }}</h3>
       <button class="addon-upload-dependant" id="submit-upload-file-finish" disabled=disabled type="submit">
         {{ _('Continue') }}
       </button>
-      {% if not submissions_enabled %}
-          <div class="submissions-disabled-error">
-            Add-on uploads are temporarily unavailable.
-            {% if reason %}
-            <span class="tip tooltip" title="{{ reason }}">?</span>
-            {% endif %}
-          </div>
-      {% endif %}
     </div>
   </section>
 </form>
diff --git a/src/olympia/devhub/templates/devhub/addons/submit/wizard.html b/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
index 796463651c0e..084db1c70fab 100644
--- a/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
+++ b/src/olympia/devhub/templates/devhub/addons/submit/wizard.html
@@ -115,14 +115,6 @@ <h3>{{ _('Browser preview') }}</h3>
             {% endif %}
             >{{ _('Back') }}
         </button>
-        {% if not submissions_enabled %}
-          <div class="submissions-disabled-error">
-            Add-on uploads are temporarily unavailable.
-            {% if reason %}
-              <span class="tip tooltip" title="{{ reason }}">?</span>
-            {% endif %}
-          </div>
-        {% endif %}
       </div>
     </form>
   </div>
diff --git a/src/olympia/devhub/tests/test_views_submit.py b/src/olympia/devhub/tests/test_views_submit.py
index 37897cb93a80..1fa710151d3c 100644
--- a/src/olympia/devhub/tests/test_views_submit.py
+++ b/src/olympia/devhub/tests/test_views_submit.py
@@ -3016,24 +3016,27 @@ def setUp(self):
         addon = self.get_addon()
         self.version = version_factory(addon=addon)
 
-    def _test_submissions_disabled(self, viewname, assertStatus=True, args=None):
+    def _test_submissions_disabled(self, viewname, *, assert_status=True, args=None):
         args = args or []
         self.create_flag('enable-submissions', note=':-(', everyone=False)
         url = reverse(viewname, args=args)
         response = self.client.post(url)
-        assert not assertStatus or response.status_code == 503
+        if assert_status:  
+            assert response.status_code == 503  
         doc = pq(response.content)
-        assert 'Add-on uploads are temporarily unavailable.' in doc.text()
+        assert 'Add-on uploads are temporarily unavailable' in doc.text()
         assert ':-(' in doc.html()
 
     def _test_submissions_disabled_by_list_type(
-        self, viewname, assertStatus=True, args=None
+        self, viewname, assert_status=True, args=None
     ):
         args = args or []
-        self._test_submissions_disabled(viewname, assertStatus, args=args + ['listed'])
-        self._test_submissions_disabled(
-            viewname, assertStatus, args=args + ['unlisted']
-        )
+        self._test_submissions_disabled(  
+            viewname, assert_status=assert_status, args=args + ['listed']  
+        )  
+        self._test_submissions_disabled(  
+            viewname, assert_status=assert_status, args=args + ['unlisted']  
+        )  
 
     def test_submissions_disabled_submit_details(self):
         self._test_submissions_disabled('devhub.submit.details', args=['a3615'])
@@ -3053,10 +3056,10 @@ def test_submissions_disabled_version_finish(self):
 
     def test_submissions_disabled_upload(self):
         self._test_submissions_disabled_by_list_type(
-            'devhub.submit.upload', assertStatus=False
+            'devhub.submit.upload', assert_status=False
         )
 
     def test_submissions_disabled_wizard(self):
         self._test_submissions_disabled_by_list_type(
-            'devhub.submit.wizard', assertStatus=False
+            'devhub.submit.wizard', assert_status=False
         )
diff --git a/src/olympia/devhub/views.py b/src/olympia/devhub/views.py
index afc0c1391ce6..7e1b05e8ffb3 100644
--- a/src/olympia/devhub/views.py
+++ b/src/olympia/devhub/views.py
@@ -1574,7 +1574,19 @@ def _submit_upload(
         if existing_properties
         else []
     )
-    submit_notification_warning = get_config('submit_notification_warning')
+
+    flag = waffle.get_waffle_flag_model().get('enable-submissions')
+    warning = (
+        'Add-on uploads are temporarily unavailable' + ': ' + flag.note
+        if hasattr(flag, 'note')
+        else '.'
+    )
+
+    submit_notification_warning = (
+        warning
+        if not flag.is_active(request)
+        else get_config('submit_notification_warning')
+    )
     if not submit_notification_warning and addon:
         # If we're not showing the generic submit notification warning, show
         # one specific to pre review if the developer would be affected because
@@ -1594,7 +1606,7 @@ def _submit_upload(
         wizard_url = reverse('devhub.submit.wizard', args=[channel_text])
     else:
         wizard_url = None
-    flag = waffle.get_waffle_flag_model().get('enable-submissions')
+
     return TemplateResponse(
         request,
         template,
@@ -1614,7 +1626,6 @@ def _submit_upload(
             'wizard_url': wizard_url,
             'max_upload_size': settings.MAX_UPLOAD_SIZE,
             'submissions_enabled': flag.is_active(request),
-            'reason': flag.note if hasattr(flag, 'note') else None,
         },
     )
 
diff --git a/static/css/zamboni/developers.css b/static/css/zamboni/developers.css
index 6998d722c0f1..f4704fa7612d 100644
--- a/static/css/zamboni/developers.css
+++ b/static/css/zamboni/developers.css
@@ -427,10 +427,6 @@ form .char-count b {
     margin-bottom: 1em;
 }
 
-div.addon-submission-field .submissions-disabled-error {
-    padding: 1em 0em;
-}
-
 .clear-info-request label {
     font-weight: normal;
 }

From ad93bc2c38947700ea0068bc2df31bdb253fed8d Mon Sep 17 00:00:00 2001
From: Christina Lin <44586776+chrstinalin@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:36:05 -0400
Subject: [PATCH 14/16] removed extra spaces

---
 src/olympia/devhub/views.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/olympia/devhub/views.py b/src/olympia/devhub/views.py
index 7e1b05e8ffb3..1106ad15baf6 100644
--- a/src/olympia/devhub/views.py
+++ b/src/olympia/devhub/views.py
@@ -1574,14 +1574,12 @@ def _submit_upload(
         if existing_properties
         else []
     )
-
     flag = waffle.get_waffle_flag_model().get('enable-submissions')
     warning = (
         'Add-on uploads are temporarily unavailable' + ': ' + flag.note
         if hasattr(flag, 'note')
         else '.'
     )
-
     submit_notification_warning = (
         warning
         if not flag.is_active(request)
@@ -1606,7 +1604,6 @@ def _submit_upload(
         wizard_url = reverse('devhub.submit.wizard', args=[channel_text])
     else:
         wizard_url = None
-
     return TemplateResponse(
         request,
         template,

From 1d7913d01e00f46988aec7d3243a478088cadbf6 Mon Sep 17 00:00:00 2001
From: Christina Lin <44586776+chrstinalin@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:45:24 -0400
Subject: [PATCH 15/16] lint

---
 src/olympia/devhub/tests/test_views_submit.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/olympia/devhub/tests/test_views_submit.py b/src/olympia/devhub/tests/test_views_submit.py
index 1fa710151d3c..71cdbc7a16ce 100644
--- a/src/olympia/devhub/tests/test_views_submit.py
+++ b/src/olympia/devhub/tests/test_views_submit.py
@@ -3021,8 +3021,8 @@ def _test_submissions_disabled(self, viewname, *, assert_status=True, args=None)
         self.create_flag('enable-submissions', note=':-(', everyone=False)
         url = reverse(viewname, args=args)
         response = self.client.post(url)
-        if assert_status:  
-            assert response.status_code == 503  
+        if assert_status:
+            assert response.status_code == 503
         doc = pq(response.content)
         assert 'Add-on uploads are temporarily unavailable' in doc.text()
         assert ':-(' in doc.html()
@@ -3031,12 +3031,12 @@ def _test_submissions_disabled_by_list_type(
         self, viewname, assert_status=True, args=None
     ):
         args = args or []
-        self._test_submissions_disabled(  
-            viewname, assert_status=assert_status, args=args + ['listed']  
-        )  
-        self._test_submissions_disabled(  
-            viewname, assert_status=assert_status, args=args + ['unlisted']  
-        )  
+        self._test_submissions_disabled(
+            viewname, assert_status=assert_status, args=args + ['listed']
+        )
+        self._test_submissions_disabled(
+            viewname, assert_status=assert_status, args=args + ['unlisted']
+        )
 
     def test_submissions_disabled_submit_details(self):
         self._test_submissions_disabled('devhub.submit.details', args=['a3615'])

From 338eca6d3c6941ad467452c5fa5458526b326e7b Mon Sep 17 00:00:00 2001
From: Christina Lin <44586776+chrstinalin@users.noreply.github.com>
Date: Thu, 31 Oct 2024 09:27:51 -0400
Subject: [PATCH 16/16] test

---
 src/olympia/devhub/tests/test_views_submit.py | 11 ++++++++++-
 src/olympia/devhub/views.py                   |  6 ++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/olympia/devhub/tests/test_views_submit.py b/src/olympia/devhub/tests/test_views_submit.py
index 71cdbc7a16ce..8d9fa658b0b2 100644
--- a/src/olympia/devhub/tests/test_views_submit.py
+++ b/src/olympia/devhub/tests/test_views_submit.py
@@ -3018,8 +3018,9 @@ def setUp(self):
 
     def _test_submissions_disabled(self, viewname, *, assert_status=True, args=None):
         args = args or []
-        self.create_flag('enable-submissions', note=':-(', everyone=False)
         url = reverse(viewname, args=args)
+
+        self.create_flag('enable-submissions', note=':-(', everyone=False)
         response = self.client.post(url)
         if assert_status:
             assert response.status_code == 503
@@ -3027,6 +3028,14 @@ def _test_submissions_disabled(self, viewname, *, assert_status=True, args=None)
         assert 'Add-on uploads are temporarily unavailable' in doc.text()
         assert ':-(' in doc.html()
 
+        self.create_flag('enable-submissions', note='', everyone=False)
+        response = self.client.post(url)
+        if assert_status:
+            assert response.status_code == 503
+        doc = pq(response.content)
+        assert 'Add-on uploads are temporarily unavailable.' in doc.text()
+        assert ':-(' not in doc.html()
+
     def _test_submissions_disabled_by_list_type(
         self, viewname, assert_status=True, args=None
     ):
diff --git a/src/olympia/devhub/views.py b/src/olympia/devhub/views.py
index 1106ad15baf6..3f017f77b051 100644
--- a/src/olympia/devhub/views.py
+++ b/src/olympia/devhub/views.py
@@ -1575,10 +1575,8 @@ def _submit_upload(
         else []
     )
     flag = waffle.get_waffle_flag_model().get('enable-submissions')
-    warning = (
-        'Add-on uploads are temporarily unavailable' + ': ' + flag.note
-        if hasattr(flag, 'note')
-        else '.'
+    warning = gettext('Add-on uploads are temporarily unavailable') + (
+        ': ' + flag.note if getattr(flag, 'note', None) else '.'
     )
     submit_notification_warning = (
         warning