Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove FF_NEW_BRANDING #1963

Merged
merged 1 commit into from
Oct 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions app/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ class Config(object):
EXTRA_ROUTES = [item for sublist in map(lambda x: x.values(), GC_ARTICLES_ROUTES.values()) for item in sublist]

# FEATURE FLAGS
FF_NEW_BRANDING = env.bool("FF_NEW_BRANDING", False)
FF_SALESFORCE_CONTACT = env.bool("FF_SALESFORCE_CONTACT", True)
FF_TOU = env.bool("FF_TOU", False)

Expand Down Expand Up @@ -219,7 +218,6 @@ class Test(Development):
FF_BOUNCE_RATE_V15 = True
FF_BOUNCE_RATE_BACKEND = True
FF_ABTEST_SERVICE_ID = ""
FF_NEW_BRANDING = True
FF_TOU = True


Expand Down Expand Up @@ -252,7 +250,6 @@ class ProductionFF(Config):
FF_BOUNCE_RATE_V15 = True
FF_BOUNCE_RATE_BACKEND = True
FF_ABTEST_SERVICE_ID = ""
FF_NEW_BRANDING = True
FF_TOU = False


Expand Down
3 changes: 1 addition & 2 deletions app/templates/views/service-settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -157,14 +157,13 @@ <h2 class="heading-small p-0 m-0">{{ _('Your service is in trial mode') }}</h2>
}}
{% endcall %}
{% call settings_row(if_has_permission='email') %}
{% set branding_route = '.view_branding_settings' if config["FF_NEW_BRANDING"] or current_user.platform_admin else '.branding_request' %}
{% set txt = _('Email branding') %}
{{ text_field(txt) }}
{% set value = _('Your branding<br> ({})') %}
{{ text_field(value.format(current_service.email_branding_name)|safe if current_service.email_branding else _(current_service.email_branding_name)) }}
{{ edit_field(
change_txt,
url_for(branding_route, service_id=current_service.id),
url_for('.view_branding_settings', service_id=current_service.id),
permissions=['manage_service'],
attributes="data-testid=edit-email-branding",
for=txt
Expand Down
Loading