Merge pull request #1802 from numbersprotocol/develop

Develop

Author: bafu

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

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 {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "capture-lite",
-  "version": "0.60.1",
+  "version": "0.60.2",
   "author": "numbersprotocol",
   "homepage": "https://numbersprotocol.io/",
   "scripts": {

package.json

@@ -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>

src/app/features/wallets/transfer/transfer.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"

src/app/features/wallets/wallets.page.html

@@ -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