Merge branch 'mobile_release_2023_12_08' of github.com:fylein/fyle-mo…

…bile-app into mobile_release_2023_12_08
fylein · Dec 12, 2023 · 76cb0c2 · 76cb0c2
2 parents 67b94d2 + aaa8ad6
commit 76cb0c2
Show file tree

Hide file tree

Showing 60 changed files with 200 additions and 163 deletions.
diff --git a/.github/workflows/appflow-release-branch.yml b/.github/workflows/appflow-release-branch.yml
@@ -0,0 +1,81 @@
+name: Appflow Release Branch
+
+on:
+  push:
+    branches: 
+      - mobile_release_*
+
+jobs:
+  build-app:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Build Android with Appflow
+        uses: ionic-team/appflow-build@v1
+        with:
+          token: ${{ secrets.APPFLOW_TOKEN }}
+          app-id: 32316914
+          platform: Android
+          build-type: debug
+          environment: staging
+          native-config: staging
+          upload-artifact: Android
+
+      - uses: actions/download-artifact@v2
+        id: download
+        with:
+          name: 'Android'
+          path: ./
+
+      - name: Rename file
+        run: mv *.apk android.apk
+
+      - name: Upload apk to Diawi
+        uses: rnkdsh/action-upload-diawi@v1.2.0
+        id: diwaiAndroid
+        with:
+          token: ${{ secrets.DIAWI_TOKEN }}
+          file: android.apk
+
+      - name: Build iOS on Appflow
+        uses: ionic-team/appflow-build@v1
+        with:
+          token: ${{ secrets.APPFLOW_TOKEN }}
+          app-id: 32316914
+          platform: iOS
+          build-type: development
+          certificate: Fyle signing
+          environment: staging
+          native-config: prod
+          upload-artifact: ios
+
+      - uses: actions/download-artifact@v2
+        id: ios
+        with:
+          name: 'ios'
+          path: ./
+
+      - name: Rename file
+        run: mv *.ipa ios.ipa
+
+      - name: Upload ipa to diawi
+        uses: rnkdsh/action-upload-diawi@v1.2.0
+        id: diwaiIos
+        with:
+          token: ${{ secrets.DIAWI_TOKEN }}
+          file: ios.ipa
+
+      - name: Get branch name
+        id: get-branch
+        uses: xom9ikk/split@v1
+        with:
+          string: ${{ github.ref }}
+          separator: refs/heads/
+
+      - name: Send Message to Slack
+        uses: archive/github-actions-slack@v2.0.1
+        id: notify
+        with:
+          slack-bot-user-oauth-access-token: ${{ secrets.SLACK_BOT_USER_OAUTH_ACCESS_TOKEN }}
+          slack-channel: C029QPGHSQL
+          slack-text: ${{github.event.sender.login}} pushed to ${{github.ref_name}}. \r\n \r\n APK Link ${{steps.diwaiAndroid.outputs.url}} \r\n IPA link ${{steps.diwaiIos.outputs.url}}
+
diff --git a/src/app/auth/sign-in/sign-in.page.html b/src/app/auth/sign-in/sign-in.page.html
@@ -116,7 +116,7 @@
         [loading]="googleSignInLoading"
       >
         <div class="sign-in--secondary-cta-btn">
-          <img class="sign-in--secondary-cta-btn-logo" src="../../../assets/svg/google-logo.svg" alt="fyle-logo" />
+          <img class="sign-in--secondary-cta-btn-logo" src="../../../assets/svg/logo-google.svg" alt="fyle-logo" />
           Sign in with Google
         </div>
       </button>

diff --git a/src/app/core/mock-data/sidemenu-item.data.ts b/src/app/core/mock-data/sidemenu-item.data.ts
@@ -14,7 +14,7 @@ export const sidemenuItemData1: SidemenuItem = {
 export const sidemenuItemData2: SidemenuItem = {
   title: 'Team',
   isVisible: true,
-  icon: 'teams',
+  icon: 'user-three',
   isDropdownOpen: false,
   disabled: false,
   dropdownOptions: [

diff --git a/src/app/core/mock-data/sidemenu.data.ts b/src/app/core/mock-data/sidemenu.data.ts
@@ -16,7 +16,7 @@ export const sidemenuData1 = [
   {
     title: 'Settings',
     isVisible: true,
-    icon: 'fy-settings',
+    icon: 'gear',
     route: ['/', 'enterprise', 'my_profile'],
   },
 ];
@@ -69,7 +69,7 @@ export const PrimaryOptionsRes2: Partial<SidemenuItem>[] = [
   {
     title: 'Team',
     isVisible: true,
-    icon: 'teams',
+    icon: 'user-three',
     isDropdownOpen: false,
     disabled: false,
     dropdownOptions: [
@@ -119,7 +119,7 @@ export const getPrimarySidemenuOptionsRes1 = [
     title: 'Team Reports',
     isVisible: true,
     route: ['/', 'enterprise', 'team_reports'],
-    icon: 'teams',
+    icon: 'user-three',
     disabled: false,
   },
 ];
@@ -135,7 +135,7 @@ export const getSecondarySidemenuOptionsRes1 = [
   {
     title: 'Settings',
     isVisible: true,
-    icon: 'fy-settings',
+    icon: 'gear',
     route: ['/', 'enterprise', 'my_profile'],
   },
   {
@@ -148,7 +148,7 @@ export const getSecondarySidemenuOptionsRes1 = [
   {
     title: 'Help',
     isVisible: true,
-    icon: 'help',
+    icon: 'question-square-outline',
     route: ['/', 'enterprise', 'help'],
     disabled: false,
   },
@@ -185,7 +185,7 @@ export const setSideMenuRes: Partial<SidemenuItem>[] = [
     title: 'Team Reports',
     isVisible: true,
     route: ['/', 'enterprise', 'team_reports'],
-    icon: 'teams',
+    icon: 'user-three',
     disabled: false,
   },
   {
@@ -198,7 +198,7 @@ export const setSideMenuRes: Partial<SidemenuItem>[] = [
   {
     title: 'Settings',
     isVisible: true,
-    icon: 'fy-settings',
+    icon: 'gear',
     route: ['/', 'enterprise', 'my_profile'],
   },
   {
@@ -211,7 +211,7 @@ export const setSideMenuRes: Partial<SidemenuItem>[] = [
   {
     title: 'Help',
     isVisible: true,
-    icon: 'help',
+    icon: 'question-square-outline',
     route: ['/', 'enterprise', 'help'],
     disabled: false,
   },

diff --git a/...pp/fyle/add-edit-advance-request/camera-options-popup/camera-options-popup.component.html b/...pp/fyle/add-edit-advance-request/camera-options-popup/camera-options-popup.component.html
@@ -13,7 +13,7 @@
     <div class="camera-options--icon-container">
       <mat-icon
         class="camera-options--icon-container camera-options--icon-container--gallery"
-        svgIcon="fy-gallery"
+        svgIcon="image"
       ></mat-icon>
     </div>
     <div class="camera-options--content">Upload from Gallery</div>

diff --git a/src/app/fyle/add-edit-expense/camera-options-popup/camera-options-popup.component.html b/src/app/fyle/add-edit-expense/camera-options-popup/camera-options-popup.component.html
@@ -15,7 +15,7 @@
     <div class="camera-options--icon-container">
       <mat-icon
         class="camera-options--icon-container__icon camera-options--icon-container__icon--gallery"
-        svgIcon="fy-gallery"
+        svgIcon="image"
       ></mat-icon>
     </div>
     <div class="camera-options--content">Upload from Gallery</div>

diff --git a/src/app/fyle/my-expenses-v2/my-expenses-v2.page.html b/src/app/fyle/my-expenses-v2/my-expenses-v2.page.html
@@ -13,10 +13,10 @@
       </ion-button>
       <ion-button class="my-expenses--header-btn" (click)="openFilters()">
         <ng-container *ngIf="filterPills?.length; else noFilterAppliedIcon">
-          <ion-icon slot="icon-only" src="../../../assets/svg/fy-applied-filter.svg"></ion-icon>
+          <ion-icon slot="icon-only" src="../../../assets/svg/filter-applied.svg"></ion-icon>
         </ng-container>
         <ng-template #noFilterAppliedIcon>
-          <ion-icon slot="icon-only" src="../../../assets/svg/fy-unapplied-filter.svg"></ion-icon>
+          <ion-icon slot="icon-only" src="../../../assets/svg/filter.svg"></ion-icon>
         </ng-template>
       </ion-button>
       <ng-container *ngIf="isConnected$ | async">

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
@@ -31,7 +31,7 @@
 
         <div class="view-advance--element">
           <app-fy-statistic
-            [icon]="'../../../../assets/svg/profile.svg'"
+            [icon]="'../../../../assets/svg/user-one.svg'"
             [type]="StatisticTypes.STRING"
             [label]="'Issued By'"
             [value]="advance.creator_us_full_name || '-'"

diff --git a/src/app/fyle/view-expense/view-expense.page.html b/src/app/fyle/view-expense/view-expense.page.html
@@ -170,7 +170,7 @@
         <ion-row>
           <ion-col class="view-expense--icon-container">
             <div class="view-expense--icon-container__background">
-              <ion-icon class="view-expense--icon-container__icon" src="../../../assets/svg/profile.svg"></ion-icon>
+              <ion-icon class="view-expense--icon-container__icon" src="../../../assets/svg/user-one.svg"></ion-icon>
             </div>
           </ion-col>
           <ion-col class="view-expense--content-container">

diff --git a/src/app/fyle/view-mileage/view-mileage.page.html b/src/app/fyle/view-mileage/view-mileage.page.html
@@ -125,7 +125,10 @@
         <ion-row>
           <ion-col class="view-mileage--icon-container">
             <div class="view-mileage--icon-container__background">
-              <ion-icon class="view-mileage--icon-container__icon" src="../../../assets/svg/return-home.svg"></ion-icon>
+              <ion-icon
+                class="view-mileage--icon-container__icon"
+                src="../../../assets/svg/house-filled-arrow-clockwise.svg"
+              ></ion-icon>
             </div>
           </ion-col>
           <ion-col class="view-mileage--content-container">
@@ -156,7 +159,7 @@
       <ion-row>
         <ion-col class="view-mileage--icon-container">
           <div class="view-mileage--icon-container__background">
-            <ion-icon class="view-mileage--icon-container__icon" src="../../../assets/svg/profile.svg"></ion-icon>
+            <ion-icon class="view-mileage--icon-container__icon" src="../../../assets/svg/user-one.svg"></ion-icon>
           </div>
         </ion-col>
         <ion-col class="view-mileage--content-container">

diff --git a/src/app/fyle/view-per-diem/view-per-diem.page.html b/src/app/fyle/view-per-diem/view-per-diem.page.html
@@ -108,7 +108,7 @@
       <ion-row>
         <ion-col class="view-per-diem--icon-container">
           <div class="view-per-diem--icon-container__background">
-            <ion-icon class="view-per-diem--icon-container__icon" src="../../../assets/svg/profile.svg"></ion-icon>
+            <ion-icon class="view-per-diem--icon-container__icon" src="../../../assets/svg/user-one.svg"></ion-icon>
           </div>
         </ion-col>
         <ion-col class="view-per-diem--content-container">

diff --git a/src/app/fyle/view-team-advance-request/view-team-advance-request.page.html b/src/app/fyle/view-team-advance-request/view-team-advance-request.page.html
@@ -95,7 +95,7 @@
       <div class="view-team-advance-request--divider"></div>
       <div class="view-team-advance-request__element">
         <app-fy-statistic
-          icon="../../../../assets/svg/profile.svg"
+          icon="../../../../assets/svg/user-one.svg"
           [type]="StatisticTypes.STRING"
           [label]="'Employee'"
           [value]="advanceRequest?.us_full_name || '-'"

diff --git a/src/app/fyle/view-team-report/view-team-report-v2.page.spec.ts b/src/app/fyle/view-team-report/view-team-report-v2.page.spec.ts
@@ -1,6 +1,6 @@
 import { CurrencyPipe } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, EventEmitter } from '@angular/core';
-import { ComponentFixture, TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing';
+import { ComponentFixture, TestBed, fakeAsync, flushMicrotasks, tick, waitForAsync } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { MatSnackBar } from '@angular/material/snack-bar';
 import { By } from '@angular/platform-browser';
@@ -1006,6 +1006,7 @@ describe('ViewTeamReportPageV2', () => {
 
       const editReportButton = getElementBySelector(fixture, '.view-reports--card ion-icon') as HTMLElement;
       click(editReportButton);
+      flushMicrotasks();
       tick(2000);
 
       expect(popoverController.create).toHaveBeenCalledOnceWith({
@@ -1032,6 +1033,7 @@ describe('ViewTeamReportPageV2', () => {
 
       const editReportButton = getElementBySelector(fixture, '.view-reports--card ion-icon') as HTMLElement;
       click(editReportButton);
+      flushMicrotasks();
       tick(2000);
 
       expect(popoverController.create).toHaveBeenCalledOnceWith({

diff --git a/src/app/shared/components/capture-receipt/add-more-popup/add-more-popup.component.spec.ts b/src/app/shared/components/capture-receipt/add-more-popup/add-more-popup.component.spec.ts
@@ -35,7 +35,7 @@ describe('AddMorePopupComponent', () => {
     expect(containerElements.length).toBe(2); // Check that there are 2 action buttons
     expect(addMorePopupComponent.actionButtons).toEqual([
       { icon: 'fy-camera', title: 'Capture Receipts', mode: 'camera' },
-      { icon: 'fy-gallery', title: 'Upload from Gallery', mode: 'gallery' },
+      { icon: 'image', title: 'Upload from Gallery', mode: 'gallery' },
     ]);
   });
 

diff --git a/src/app/shared/components/capture-receipt/add-more-popup/add-more-popup.component.ts b/src/app/shared/components/capture-receipt/add-more-popup/add-more-popup.component.ts
@@ -19,7 +19,7 @@ export class AddMorePopupComponent implements OnInit {
         mode: 'camera',
       },
       {
-        icon: 'fy-gallery',
+        icon: 'image',
         title: 'Upload from Gallery',
         mode: 'gallery',
       },

diff --git a/src/app/shared/components/corporate-card/corporate-card.component.html b/src/app/shared/components/corporate-card/corporate-card.component.html
@@ -43,7 +43,10 @@
         (click)="cardOptionsClick.emit(card)"
         data-testid="more-options-btn"
       >
-        <ion-icon class="corporate-card__more-options-btn-icon" src="../../../../assets/svg/more.svg"></ion-icon>
+        <ion-icon
+          class="corporate-card__more-options-btn-icon"
+          src="../../../../assets/svg/vertical-dots-menu.svg"
+        ></ion-icon>
       </button>
     </ion-col>
   </ion-row>

diff --git a/src/app/shared/components/corporate-card/corporate-card.component.scss b/src/app/shared/components/corporate-card/corporate-card.component.scss
@@ -90,5 +90,6 @@
   &__more-options-btn-icon {
     width: 20px;
     height: 20px;
+    color: $dark-grey;
   }
 }
diff --git a/src/app/shared/components/expenses-card-v2/expenses-card.component.html b/src/app/shared/components/expenses-card-v2/expenses-card.component.html
@@ -188,11 +188,7 @@
                   class="expenses-card--icons__policy-violated-icon"
                   >error</mat-icon
                 >
-                <mat-icon
-                  *ngIf="expense.is_split"
-                  class="expenses-card--icons__split-icon"
-                  svgIcon="split-new"
-                ></mat-icon>
+                <mat-icon *ngIf="expense.is_split" class="expenses-card--icons__split-icon" svgIcon="split"></mat-icon>
               </div>
             </div>
 

diff --git a/src/app/shared/components/expenses-card-v2/expenses-card.component.scss b/src/app/shared/components/expenses-card-v2/expenses-card.component.scss
@@ -200,6 +200,7 @@
       margin-left: 4px;
       width: 16px;
       height: 16px;
+      color: $brand-primary-light;
     }
   }
 

diff --git a/src/app/shared/components/expenses-card/expenses-card.component.html b/src/app/shared/components/expenses-card/expenses-card.component.html
@@ -191,7 +191,7 @@
                 <mat-icon
                   *ngIf="expense.tx_is_split_expense"
                   class="expenses-card--icons__split-icon"
-                  svgIcon="split-new"
+                  svgIcon="split"
                 ></mat-icon>
               </div>
             </div>

diff --git a/src/app/shared/components/expenses-card/expenses-card.component.scss b/src/app/shared/components/expenses-card/expenses-card.component.scss
@@ -200,6 +200,7 @@
       margin-left: 4px;
       width: 16px;
       height: 16px;
+      color: $brand-primary-light;
     }
   }
 

diff --git a/src/app/shared/components/fy-alert-info/fy-alert-info.component.html b/src/app/shared/components/fy-alert-info/fy-alert-info.component.html
@@ -3,7 +3,7 @@
   <mat-icon
     *ngIf="type === 'warning'"
     class="alert-info-container--icon icon--alert-warning"
-    svgIcon="danger"
+    svgIcon="warning-fill"
   ></mat-icon>
   <mat-icon *ngIf="type === 'error'" class="alert-info-container--icon" svgIcon="error-filled"></mat-icon>
   <div class="alert-info-container--message">{{ message }}</div>

diff --git a/src/app/shared/components/fy-approver/fy-approver.component.html b/src/app/shared/components/fy-approver/fy-approver.component.html
@@ -9,5 +9,5 @@
   </div>
 </div>
 <div *ngIf="type === 'TEAM_REPORT' || type === 'ADVANCE_REQUEST'" (click)="openApproverListDialog()">
-  <img [src]="'../../../../assets/svg/edit.svg'" class="approver--icon" />
+  <ion-icon [src]="'../../../../assets/svg/edit.svg'" class="approver--icon" slot="icon-only"></ion-icon>
 </div>
diff --git a/src/app/shared/components/fy-approver/fy-approver.component.scss b/src/app/shared/components/fy-approver/fy-approver.component.scss
@@ -32,5 +32,7 @@
   &--icon {
     margin-bottom: -2px;
     color: $brand-primary-light;
+    height: 18px;
+    width: 18px;
   }
 }
diff --git a/src/app/shared/components/fy-policy-violation-info/fy-policy-violation-info.component.html b/src/app/shared/components/fy-policy-violation-info/fy-policy-violation-info.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="showPolicyInfo" class="policy-violation-info--container">
   <div class="policy-violation-info--block">
-    <mat-icon class="icon--alert-warning" svgIcon="danger"></mat-icon>
+    <mat-icon class="icon--alert-warning" svgIcon="warning-fill"></mat-icon>
     <div class="policy-violation-info--list-container">
       <ul
         class="policy-violation-info--list"

diff --git a/src/app/shared/components/fy-policy-violation/fy-policy-violation.component.html b/src/app/shared/components/fy-policy-violation/fy-policy-violation.component.html
@@ -35,7 +35,7 @@
 
       <ng-container *ngIf="isPrimaryApproverSkipped">
         <app-policy-violation-action
-          [icon]="'../../../../assets/svg/profile-outline.svg'"
+          [icon]="'../../../../assets/svg/user-one.svg'"
           [message]="'Primary approver will be skipped'"
           [actionsCount]="policyAction?.run_summary?.length"
         ></app-policy-violation-action>