Bugfix/#6370

src/app/main/component/user/components/habit/add-new-habit/add-new-habit.component.ts

@@ -288,11 +288,15 @@ export class AddNewHabitComponent implements OnInit {
     this.friendsIdsList = this.userFriendsService.addedFriends?.map((friend) => friend.id);
     const defailtItemsIds = this.standartShopList.filter((item) => item.selected === true).map((item) => item.id);
     const habitAssignProperties: HabitAssignPropertiesDto = { defaultShoppingListItems: defailtItemsIds, duration: this.newDuration };
+    console.log(habitAssignProperties, defailtItemsIds, this.standartShopList, 'habitAssignProperties');
     this.habitAssignService
       .assignCustomHabit(this.habitId, this.friendsIdsList, habitAssignProperties)
       .pipe(take(1))
       .subscribe(() => {
-        this.customShopList.length > 0 ? this.addCustomHabitItems() : this.afterHabitWasChanged('habitAdded');
+        if (this.customShopList.length > 0) {
+          this.addCustomHabitItems();
+        }
+        this.afterHabitWasChanged('habitAdded');
       });
   }
 

src/app/shared/header/header.component.ts

@@ -92,6 +92,7 @@ export class HeaderComponent implements OnInit, OnDestroy {
     this.imgAlt = this.isUBS ? 'Image ubs logo' : 'Image green city logo';
     this.localeStorageService.setUbsRegistration(this.isUBS);
     this.toggleHeader();
+    console.log(this.navLinks, 'navLinks');
     this.dialog.afterAllClosed.pipe(takeUntil(this.destroySub)).subscribe(() => {
       this.focusDone();
     });

src/app/shared/ubs-footer/ubs-footer.component.html

@@ -8,7 +8,7 @@
       </div>
       <div class="footer-menu_main">
         <ul class="footer-menu_links">
-          <a href #serviceref class="pick-up-service" (click)="openAboutServicePopUp()" (keydown.enter)="onPressEnter($event)">{{
+          <a href #serviceref class="pick-up-service" (click)="openAboutServicePopUp($event)" (keydown.enter)="onPressEnter($event)">{{
             'user.lower-nav-bar.about-us' | translate
           }}</a>
           <li *ngFor="let link of ubsNavLinks" role="listitem">

src/app/shared/ubs-footer/ubs-footer.component.ts

@@ -1,4 +1,4 @@
-import { Component, ViewChild, ElementRef } from '@angular/core';
+import { Component, ViewChild, ElementRef, OnInit } from '@angular/core';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 import { MatDialog } from '@angular/material/dialog';
@@ -11,7 +11,7 @@ import { ubsHeaderIcons } from '../../main/image-pathes/header-icons';
   templateUrl: './ubs-footer.component.html',
   styleUrls: ['./ubs-footer.component.scss']
 })
-export class UbsFooterComponent {
+export class UbsFooterComponent implements OnInit {
   public footerPicture = ubsHeaderIcons;
   public screenWidth = window.innerWidth;
   public currentYear = new Date().getFullYear();
@@ -22,11 +22,16 @@ export class UbsFooterComponent {
 
   constructor(private dialog: MatDialog) {}
 
+  ngOnInit() {
+    console.log(this.ubsNavLinks, 'ubsNavLinks');
+  }
+
   onResize() {
     this.screenWidth = window.innerWidth;
   }
 
-  public openAboutServicePopUp(): void {
+  public openAboutServicePopUp(event: Event): void {
+    event.preventDefault();
     const matDialogRef = this.dialog.open(UbsPickUpServicePopUpComponent, {
       hasBackdrop: true,
       closeOnNavigation: true,
@@ -45,6 +50,6 @@ export class UbsFooterComponent {
 
   public onPressEnter(event: KeyboardEvent): void {
     event.preventDefault();
-    this.openAboutServicePopUp();
+    this.openAboutServicePopUp(event);
   }
 }

src/app/ubs/ubs-admin/components/ubs-admin-notification/ubs-admin-notification.component.scss

@@ -1,4 +1,16 @@
 .page-container {
+  @media (min-width: 540px) {
+    margin-right: 6%;
+  }
+
+  @media (min-width: 768px) and (max-width: 820px) {
+    margin-right: 4%;
+  }
+
+  @media (min-width: 912px) and (max-width: 920px) {
+    margin-right: 3%;
+  }
+
   button {
     outline: none;
   }

src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-pricing-page/ubs-admin-tariffs-pricing-page.component.html

@@ -45,7 +45,7 @@
         </td>
         <td>{{ getLangValue(service.name, service.nameEng) }}</td>
         <td>{{ getLangValue(service.description, service.descriptionEng) }}</td>
-        <td>{{ service?.price | currency | localizedCurrency }}</td>
+        <td>{{ servicePrice | currency | localizedCurrency }}</td>
       </tr>
     </table>
   </div>

src/app/ubs/ubs-admin/components/ubs-admin-tariffs/ubs-admin-tariffs-pricing-page/ubs-admin-tariffs-pricing-page.component.ts

@@ -39,6 +39,7 @@ export class UbsAdminTariffsPricingPageComponent implements OnInit, OnDestroy {
   areAllCheckBoxEmpty: boolean;
   limitStatus: limitStatus = null;
   description;
+  servicePrice;
   couriers;
   limitsForm: FormGroup;
   currentLocation;
@@ -365,6 +366,7 @@ export class UbsAdminTariffsPricingPageComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroy))
       .subscribe((res: Service) => {
         this.service = res;
+        this.servicePrice = this.service?.price * 100;
         this.isLoadBar1 = false;
       });
   }