From f482e60581b600c7f14488ef55c4431efe48f294 Mon Sep 17 00:00:00 2001
From: Rajat Talesra <rajat@forem.com>
Date: Tue, 30 Aug 2022 16:48:48 +0530
Subject: [PATCH] Removed unused brand color field from Profile (#18370)

* Minimal changes for removing brand-color-2

* Removed brand color 2 only for profile

* Updated test
---
 app/views/users/_profile.html.erb             | 20 +++----------------
 config/locales/views/misc/en.yml              |  4 ++++
 config/locales/views/misc/fr.yml              |  4 ++++
 .../updateProfileSettings.spec.js             | 14 +++----------
 4 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/app/views/users/_profile.html.erb b/app/views/users/_profile.html.erb
index 62b66b78a..3fa282a17 100644
--- a/app/views/users/_profile.html.erb
+++ b/app/views/users/_profile.html.erb
@@ -160,32 +160,18 @@
     <h2><%= t("views.settings.group.Branding") %></h2>
     <div class="crayons-field ">
       <label class="crayons-field__label" for="users_setting[brand_color1]">
-        <%= t("views.logo.color_1.label") %>
+        <%= t("views.profile.color.label") %>
       </label>
-      <p class="crayons-field__description"><%= t("views.logo.color_1.description") %></p>
+      <p class="crayons-field__description"><%= t("views.profile.color.description") %></p>
       <div class="flex items-center w-100 m:w-50">
         <%= f.public_send(:text_field, "users_setting[brand_color1]",
                           value: users_setting.public_send(:brand_color1),
                           placeholder: "#000000",
                           class: "crayons-textfield",
-                          data: { color_picker: "true", label_text: t("views.logo.color_1.label") }) %>
+                          data: { color_picker: "true", label_text: t("views.profile.color.label") }) %>
 
       </div>
     </div>
-
-    <div class="crayons-field ">
-      <label class="crayons-field__label" for="users_setting[brand_color2]">
-        <%= t("views.logo.color_2.label") %>
-      </label>
-      <p class="crayons-field__description"><%= t("views.logo.color_2.description_html") %></p>
-      <div class="flex items-center w-100 m:w-50">
-        <%= f.public_send(:text_field, "users_setting[brand_color2]",
-                          value: users_setting.public_send(:brand_color2),
-                          placeholder: "#000000",
-                          class: "crayons-textfield",
-                          data: { color_picker: "true", label_text: t("views.logo.color_2.label") }) %>
-      </div>
-    </div>
   </div>
 
   <div class="save-footer crayons-card crayons-card--content-rows">
diff --git a/config/locales/views/misc/en.yml b/config/locales/views/misc/en.yml
index a1939dfe4..cde4951fa 100644
--- a/config/locales/views/misc/en.yml
+++ b/config/locales/views/misc/en.yml
@@ -60,6 +60,10 @@ en:
       pinned: "📌 Pinned! (pinned posts display chronologically, 5 max)"
       removed: "🗑 Pin removed"
       error: You can only have five pins
+    profile:
+      color:
+        label: Brand color
+        description: Used for backgrounds, borders etc.
     reading_list:
       meta:
         title: Reading List
diff --git a/config/locales/views/misc/fr.yml b/config/locales/views/misc/fr.yml
index 3f4ba5be7..58f6b0619 100644
--- a/config/locales/views/misc/fr.yml
+++ b/config/locales/views/misc/fr.yml
@@ -60,6 +60,10 @@ fr:
       pinned: "📌 Pinned! (pinned posts display chronologically, 5 max)"
       removed: "🗑 Pin removed"
       error: You can only have five pins
+    profile:
+      color:
+        label: Brand color
+        description: Used for backgrounds, borders etc.
     reading_list:
       meta:
         title: Reading List
diff --git a/cypress/e2e/seededFlows/settingsFlows/updateProfileSettings.spec.js b/cypress/e2e/seededFlows/settingsFlows/updateProfileSettings.spec.js
index 30b2d06d8..8e0918b0d 100644
--- a/cypress/e2e/seededFlows/settingsFlows/updateProfileSettings.spec.js
+++ b/cypress/e2e/seededFlows/settingsFlows/updateProfileSettings.spec.js
@@ -10,26 +10,18 @@ describe('Update profile settings', () => {
 
   it('updates brand colors', () => {
     // Verify both a button and an input exist to update both colors
-    cy.findByRole('button', { name: 'Brand color 1' });
-    cy.findByRole('textbox', { name: 'Brand color 1' }).as('brandColor1');
-
-    cy.findByRole('button', { name: 'Brand color 2' });
-    cy.findByRole('textbox', { name: 'Brand color 2' }).as('brandColor2');
+    cy.findByRole('button', { name: 'Brand color' });
+    cy.findByRole('textbox', { name: 'Brand color' }).as('brandColor1');
 
     // Verify that changing the value saves properly
     cy.get('@brandColor1').enterIntoColorInput('ababab');
-    cy.get('@brandColor2').enterIntoColorInput('d22a2a');
 
     cy.findByRole('button', { name: 'Save Profile Information' }).click();
     cy.findByText('Your profile has been updated');
 
-    cy.findByRole('textbox', { name: 'Brand color 1' }).should(
+    cy.findByRole('textbox', { name: 'Brand color' }).should(
       'have.value',
       '#ababab',
     );
-    cy.findByRole('textbox', { name: 'Brand color 2' }).should(
-      'have.value',
-      '#d22a2a',
-    );
   });
 });