Merge remote-tracking branch 'origin/feature/push-notifications' into feature/push-notifications

ui-ngx/src/app/modules/home/pages/notification/template/configuration/notification-template-configuration.component.html

@@ -124,7 +124,7 @@
           <tb-notification-action-button-configuration
             formControlName="onClick"
             hideButtonText
-            actionTitle="{{ 'notification.action-on-click-notification' | translate }}">
+            actionTitle="{{ 'notification.notification-tap-action' | translate }}">
           </tb-notification-action-button-configuration>
         </div>
       </ng-template>

ui-ngx/src/assets/locale/locale.constant-en_US.json

@@ -3222,7 +3222,6 @@
     },
     "notification": {
         "action-button": "Action button",
-        "action-on-click-notification": "Action on click notification",
         "action-type": "Action type",
         "active": "Active",
         "add-notification-recipients-group": "Add notification recipients group",
@@ -3242,6 +3241,7 @@
         "new-platform-version-trigger-settings": "New platform version trigger settings",
         "rate-limits-trigger-settings": "Exceeded rate limits trigger settings",
         "at-least-one-should-be-selected": "At least one should be selected",
+        "basic-settings": "Basic settings",
         "button-text": "Button text",
         "button-text-required": "Button text is required",
         "button-text-max-length": "Button text should be less than or equal to {{ length }} characters",
@@ -3347,6 +3347,7 @@
         "not-found-slack-recipient": "Slack recipient not found",
         "notification": "Notification",
         "notification-center": "Notification center",
+        "notification-tap-action": "Notification tap action",
         "notify": "notify",
         "notify-again": "Notify again",
         "notify-alarm-action": {