From 66daf700915a848a402c98ed539f7cf4e5620547 Mon Sep 17 00:00:00 2001
From: sultanmyrza <sultanmyrza@gmail.com>
Date: Thu, 7 Jul 2022 11:46:31 +0600
Subject: [PATCH 1/3] fix(wallets.page): hide deposit button on iOS

---
 src/app/features/wallets/wallets.page.html | 1 +
 src/app/features/wallets/wallets.page.ts   | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/features/wallets/wallets.page.html b/src/app/features/wallets/wallets.page.html
index 822d520dd..cb4cec135 100644
--- a/src/app/features/wallets/wallets.page.html
+++ b/src/app/features/wallets/wallets.page.html
@@ -57,6 +57,7 @@ <h3 class="num-text">NUM</h3>
           >{{ t('buy') }} NUM</ion-button
         >
         <ion-button
+          *ngIf="shouldHideDepositButton === false"
           class="deposit-withdraw-num-btn num-operation-btn"
           color="#7E7E7E"
           fill="outline"
diff --git a/src/app/features/wallets/wallets.page.ts b/src/app/features/wallets/wallets.page.ts
index f12457f9d..6f28f6d46 100644
--- a/src/app/features/wallets/wallets.page.ts
+++ b/src/app/features/wallets/wallets.page.ts
@@ -6,6 +6,7 @@ import { DomSanitizer } from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { Browser } from '@capacitor/browser';
 import { Clipboard } from '@capacitor/clipboard';
+import { Platform } from '@ionic/angular';
 import { TranslocoService } from '@ngneat/transloco';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
 import { NgxQrcodeElementTypes } from '@techiediaries/ngx-qrcode';
@@ -50,6 +51,7 @@ export class WalletsPage {
   readonly networkConnected$ = this.diaBackendWalletService.networkConnected$;
 
   elementType = NgxQrcodeElementTypes.URL;
+  shouldHideDepositButton = false;
 
   constructor(
     private readonly diaBackendWalletService: DiaBackendWalletService,
@@ -62,7 +64,8 @@ export class WalletsPage {
     private readonly confirmAlert: ConfirmAlert,
     private readonly dialog: MatDialog,
     private readonly errorService: ErrorService,
-    private readonly router: Router
+    private readonly router: Router,
+    private readonly platform: Platform
   ) {
     this.matIconRegistry.addSvgIcon(
       'wallet',
@@ -80,6 +83,8 @@ export class WalletsPage {
         untilDestroyed(this)
       )
       .subscribe(totalBalance => this.totalBalance$.next(totalBalance));
+
+    this.shouldHideDepositButton = this.platform.is('ios');
   }
 
   // eslint-disable-next-line class-methods-use-this

From 92af9f2d454d4b0bbb0f5d02f1eb223c0a151861 Mon Sep 17 00:00:00 2001
From: sultanmyrza <sultanmyrza@gmail.com>
Date: Thu, 7 Jul 2022 11:58:04 +0600
Subject: [PATCH 2/3] fix(transfer.page): wrap to ng-container instead of div

---
 src/app/features/wallets/transfer/transfer.page.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/features/wallets/transfer/transfer.page.html b/src/app/features/wallets/transfer/transfer.page.html
index 3d4c80fc8..cfaf87429 100644
--- a/src/app/features/wallets/transfer/transfer.page.html
+++ b/src/app/features/wallets/transfer/transfer.page.html
@@ -6,7 +6,7 @@
 </mat-toolbar>
 
 <ion-content *transloco="let t">
-  <div *ngIf="mode === 'deposit'">
+  <ng-container *ngIf="mode === 'deposit'">
     <div class="vertical-pacing-12"></div>
     <div class="asset-wallet-qr-code-container">
       {{ t('wallets.myAssetWalletQRCode') }}
@@ -47,9 +47,9 @@
         </button>
       </mat-list-item>
     </mat-list>
-  </div>
+  </ng-container>
 
-  <div *ngIf="mode === 'withdraw'">
+  <ng-container *ngIf="mode === 'withdraw'">
     <ion-card id="main-card">
       <ion-grid>
         <ion-row id="in-app-transfer-row">
@@ -167,5 +167,5 @@ <h4 class="wallet-total-text">
         </ion-row>
       </ion-grid>
     </ion-card>
-  </div>
+  </ng-container>
 </ion-content>

From 9eaf2ef6eaa1ffbf68465996ed4139095941d2bb Mon Sep 17 00:00:00 2001
From: sultanmyrza <sultanmyrza@gmail.com>
Date: Thu, 7 Jul 2022 12:01:07 +0600
Subject: [PATCH 3/3] build: bump to 0.60.2

---
 CHANGELOG.md             | 10 ++++++++++
 android/app/build.gradle |  4 ++--
 package-lock.json        |  4 ++--
 package.json             |  2 +-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 019b090f7..2b4be9a76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.60.2 - 2022-07-07
+
+### Changed
+
+- Hide deposit button on wallets page for iOS
+
+### Fixed
+
+- Fix withdraw page the text color
+
 ## 0.60.1 - 2022-07-06
 
 ### Fixed
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 3629d74e1..07c85a749 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "io.numbersprotocol.capturelite"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 421
-        versionName "0.60.1"
+        versionCode 422
+        versionName "0.60.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildFeatures {
diff --git a/package-lock.json b/package-lock.json
index 74c26f40a..5b2129103 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "capture-lite",
-  "version": "0.60.1",
+  "version": "0.60.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "capture-lite",
-      "version": "0.60.1",
+      "version": "0.60.2",
       "dependencies": {
         "@angular/animations": "^12.2.4",
         "@angular/cdk": "^12.2.4",
diff --git a/package.json b/package.json
index aa5d46640..434af9dda 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "capture-lite",
-  "version": "0.60.1",
+  "version": "0.60.2",
   "author": "numbersprotocol",
   "homepage": "https://numbersprotocol.io/",
   "scripts": {