Merge branch 'release.24.10' into release.24.12

# Conflicts:
#	ui-tests/cypress/lib/dashboard/feedback/ratings/widgets.js

Author: ArtursKadikis

plugins/star-rating/frontend/public/localization/star-rating.properties

@@ -115,6 +115,7 @@ feedback.selected-pages = On selected pages
 feedback.internalName = Internal Name
 feedback.internalName.placeholder = Widget Name
 feedback.internalName.description = Name survey for internal purposes. It is not going to be shown on survey.
+feedback.consent = Add user consent
 feedback.question = Question
 feedback.rating-symbol = Rating Symbol
 feedback.rating-score = Rating Score

plugins/star-rating/frontend/public/stylesheets/ratings.scss

@@ -54,6 +54,22 @@
         }
     }
 
+    &__step {
+        &__consent-wrapper {
+          .el-checkbox__label {
+            padding-left: 8px;
+      
+            &:hover {
+              color: #333c48;
+            }
+          }
+      
+          .el-checkbox__input.is-checked + .el-checkbox__label {
+            color: #333c48;
+          }
+        }
+    }
+
     &__target-page-selector {
         width: 100%;
     }

plugins/star-rating/frontend/public/templates/drawer.html

@@ -98,7 +98,7 @@
 			<cly-form-step id="step1" :name="i18n('feedback.settings')">
         <div class="cly-vue-drawer-step__section">
             <div class="text-medium text-heading bu-mb-1" data-test-id="ratings-drawer-settings-widget-name-label">
-              {{i18n('surveys.drawer.internal.name')}}
+              {{i18n('feedback.internalName')}}
             </div>
             <div class="text-smallish color-cool-gray-50 bu-mb-1" data-test-id="ratings-drawer-settings-widget-name-desc">
               {{i18n('feedback.internalName.description')}}
@@ -178,13 +178,13 @@
             <el-input test-id="ratings-drawer-settings-contact-input" v-model="drawerScope.editedObject.popup_email_callout" :placeholder="i18n('feedback.type-your-option-name')"></el-input>
           </validation-provider>
         </div>
-         <div class="cly-vue-drawer-step__section bu-py-1 cly-vue-surveys-drawer__consent">
+         <div class="cly-vue-drawer-step__section bu-py-1 ratings-drawer__step__consent-wrapper">
           <el-checkbox
             test-id="ratings-drawer-settings-add-user-consent"
             class="text-smallish"
             @change="onConsentCheckbox(drawerScope.editedObject)"
             size="small"
-            v-bind:label="i18n('surveys.drawer.consent')"
+            v-bind:label="i18n('feedback.consent')"
             v-model="drawerScope.editedObject.consent"
             v-if="drawerScope.currentStepId === 'step1'">
           </el-checkbox>
@@ -197,7 +197,7 @@
     v-model="drawerScope.editedObject.links">
   </star-consent-link>
         <div class="cly-vue-drawer-step__section">
-          <div class="text-medium-big cly-vue-surveys-drawer--font-weight-medium bu-pb-2 bu-pt-4">
+          <div class="text-medium-big bu-has-text-weight-medium bu-pb-2 bu-pt-4">
             {{i18n('feedback.buttons.heading')}}
           </div>
           <div class="text-medium text-heading bu-mb-2" data-test-id="ratings-drawer-settings-button-callout-label">

ui-tests/cypress/lib/dashboard/feedback/ratings/widgets.js

@@ -77,7 +77,7 @@ const verifySettingsPageElements = ({
 
     cy.verifyElement({
         labelElement: feedbackRatingWidgetsPageElements.WIDGET_NAME_LABEL,
-        labelText: "surveys.drawer.internal.name", //TODO: Will be updated after SER-2121 fixed  
+        labelText: "Internal Name",
         element: feedbackRatingWidgetsPageElements.WIDGET_NAME_INPUT,
         value: widgetName,
         elementPlaceHolder: "Widget Name"