Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #1802

Merged
merged 4 commits into from
Jul 7, 2022
Merged

Develop #1802

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "capture-lite",
"version": "0.60.1",
"version": "0.60.2",
"author": "numbersprotocol",
"homepage": "https://numbersprotocol.io/",
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions src/app/features/wallets/transfer/transfer.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -167,5 +167,5 @@ <h4 class="wallet-total-text">
</ion-row>
</ion-grid>
</ion-card>
</div>
</ng-container>
</ion-content>
1 change: 1 addition & 0 deletions src/app/features/wallets/wallets.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 6 additions & 1 deletion src/app/features/wallets/wallets.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -50,6 +51,7 @@ export class WalletsPage {
readonly networkConnected$ = this.diaBackendWalletService.networkConnected$;

elementType = NgxQrcodeElementTypes.URL;
shouldHideDepositButton = false;

constructor(
private readonly diaBackendWalletService: DiaBackendWalletService,
Expand All @@ -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',
Expand All @@ -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
Expand Down