Merge branch 'Fyle-8679027wa' of https://github.com/fylein/fyle-mobil…

…e-app into Fyle-86cty99r6
fylein · Nov 20, 2023 · 0677a5a · 0677a5a
2 parents c60d245 + 59f6549
commit 0677a5a
Show file tree

Hide file tree

Showing 58 changed files with 45 additions and 876 deletions.
diff --git a/src/app/core/mock-data/sidemenu.data.ts b/src/app/core/mock-data/sidemenu.data.ts
@@ -51,7 +51,7 @@ export const PrimaryOptionsRes1: Partial<SidemenuItem>[] = [
   {
     title: 'Advances',
     isVisible: true,
-    icon: 'advances',
+    icon: 'wallet',
     route: ['/', 'enterprise', 'my_advances'],
     disabled: false,
   },
@@ -110,7 +110,7 @@ export const getPrimarySidemenuOptionsRes1 = [
   {
     title: 'Advances',
     isVisible: true,
-    icon: 'advances',
+    icon: 'wallet',
     route: ['/', 'enterprise', 'my_advances'],
     disabled: false,
   },
@@ -177,7 +177,7 @@ export const setSideMenuRes: Partial<SidemenuItem>[] = [
   {
     title: 'Advances',
     isVisible: true,
-    icon: 'advances',
+    icon: 'wallet',
     route: ['/', 'enterprise', 'my_advances'],
     disabled: false,
   },

diff --git a/src/app/fyle/add-edit-advance-request/add-edit-advance-request.page.html b/src/app/fyle/add-edit-advance-request/add-edit-advance-request.page.html
@@ -47,7 +47,7 @@
     <div class="add-edit-advance-request--receipt-currency-container">
       <div *ngIf="dataUrls && dataUrls.length === 0" class="add-edit-advance-request--receipt text-center">
         <div class="add-edit-advance-request--receipt-image" (click)="addAttachments($event)">
-          <img class="add-edit-advance-request--receipt-image-icon" src="../../../assets/images/add-to-list.png" />
+          <img class="add-edit-advance-request--receipt-image-icon" src="../../../assets/svg/list-plus.svg" />
         </div>
       </div>
 

diff --git a/src/app/fyle/add-edit-expense/add-edit-expense.page.html b/src/app/fyle/add-edit-expense/add-edit-expense.page.html
@@ -198,7 +198,7 @@
                 class="add-edit-expense--receipt-image"
               >
                 <input *ngIf="isIos" type="file" #fileUpload accept="application/pdf,image/*" class="d-none" />
-                <img class="add-edit-expense--receipt-image-icon" src="../../../assets/images/add-to-list.png" />
+                <img class="add-edit-expense--receipt-image-icon" src="../../../assets/svg/list-plus.svg" />
               </div>
 
               <div

diff --git a/src/app/fyle/my-view-advance-request/my-view-advance-request.page.html b/src/app/fyle/my-view-advance-request/my-view-advance-request.page.html
@@ -73,7 +73,7 @@
       <div>
         <div class="view-advance-request--element">
           <app-fy-statistic
-            [icon]="'../../../../assets/svg/advances.svg'"
+            [icon]="'../../../../assets/svg/wallet.svg'"
             [type]="StatisticTypes.STRING"
             [label]="'Request ID'"
             [value]="advanceRequest.areq_advance_request_number|| '-'"

diff --git a/src/app/fyle/my-view-advance/my-view-advance.page.html b/src/app/fyle/my-view-advance/my-view-advance.page.html
@@ -22,7 +22,7 @@
       <div class="view-advance--content-container">
         <div class="view-advance--element">
           <app-fy-statistic
-            [icon]="'../../../../assets/svg/advances.svg'"
+            [icon]="'../../../../assets/svg/wallet.svg'"
             [type]="StatisticTypes.STRING"
             [label]="'Advance Number'"
             [value]="advance.adv_advance_number || '-'"

diff --git a/src/app/fyle/my-view-report/my-view-report-etxn-card/my-view-report-etxn-card.component.html b/src/app/fyle/my-view-report/my-view-report-etxn-card/my-view-report-etxn-card.component.html
diff --git a/src/app/fyle/my-view-report/my-view-report-etxn-card/my-view-report-etxn-card.component.scss b/src/app/fyle/my-view-report/my-view-report-etxn-card/my-view-report-etxn-card.component.scss
diff --git a/...p/fyle/my-view-report/my-view-report-etxn-card/my-view-report-etxn-card.component.spec.ts b/...p/fyle/my-view-report/my-view-report-etxn-card/my-view-report-etxn-card.component.spec.ts
diff --git a/src/app/fyle/my-view-report/my-view-report-etxn-card/my-view-report-etxn-card.component.ts b/src/app/fyle/my-view-report/my-view-report-etxn-card/my-view-report-etxn-card.component.ts
diff --git a/src/app/fyle/my-view-report/my-view-report.module.ts b/src/app/fyle/my-view-report/my-view-report.module.ts
@@ -1,12 +1,11 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { FormsModule } from '@angular/forms';
 import { IonicModule } from '@ionic/angular';
 import { MyViewReportPageRoutingModule } from './my-view-report-routing.module';
 import { MyViewReportPage } from './my-view-report.page';
 import { SharedModule } from 'src/app/shared/shared.module';
 import { MatIconModule } from '@angular/material/icon';
-import { MyViewReportEtxnCardComponent } from './my-view-report-etxn-card/my-view-report-etxn-card.component';
 import { MatButtonModule } from '@angular/material/button';
 import { MatRippleModule } from '@angular/material/core';
 import { ShareReportComponent } from './share-report/share-report.component';
@@ -32,12 +31,6 @@ import { MatCheckboxModule } from '@angular/material/checkbox';
     MatSnackBarModule,
     MatCheckboxModule,
   ],
-  declarations: [
-    MyViewReportPage,
-    MyViewReportEtxnCardComponent,
-    ShareReportComponent,
-    EditReportNamePopoverComponent,
-    AddExpensesToReportComponent,
-  ],
+  declarations: [MyViewReportPage, ShareReportComponent, EditReportNamePopoverComponent, AddExpensesToReportComponent],
 })
 export class MyViewReportPageModule {}
diff --git a/src/app/fyle/personal-cards-matched-expenses/expense-preview/expense-preview.component.scss b/src/app/fyle/personal-cards-matched-expenses/expense-preview/expense-preview.component.scss
@@ -99,6 +99,7 @@
     }
   }
   &--icon {
+    fill: $black;
     height: 18px;
     width: 18px;
     padding: 1px;

diff --git a/...yle/view-team-report/view-team-report-etxn-card/view-team-report-etxn-card.component.html b/...yle/view-team-report/view-team-report-etxn-card/view-team-report-etxn-card.component.html