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

Feature qr code for deposit #1782

Merged
merged 6 commits into from
Jul 5, 2022
Merged
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
349 changes: 349 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"@ngx-formly/schematics": "^5.10.22",
"@numbersprotocol/preview-camera": "github:numbersprotocol/preview-camera#release-0.0.2-auto-rotate-fix",
"@numbersprotocol/preview-video": "github:numbersprotocol/preview-video",
"@techiediaries/ngx-qrcode": "^9.1.0",
"appsflyer-capacitor-plugin": "^6.5.2",
"async-mutex": "^0.3.2",
"buffer": "^5.7.1",
Expand Down
3 changes: 2 additions & 1 deletion src/app/features/wallets/wallets.module.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { NgModule } from '@angular/core';
import { NgxQRCodeModule } from '@techiediaries/ngx-qrcode';
import { SharedModule } from '../../shared/shared.module';
import { WalletsPageRoutingModule } from './wallets-routing.module';
import { WalletsPage } from './wallets.page';

@NgModule({
imports: [SharedModule, WalletsPageRoutingModule],
imports: [SharedModule, WalletsPageRoutingModule, NgxQRCodeModule],
declarations: [WalletsPage],
})
export class WalletsPageModule {}
16 changes: 16 additions & 0 deletions src/app/features/wallets/wallets.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,22 @@ <h3 class="num-text">NUM</h3>
</ion-grid>
</ion-card>

<div class="asset-wallet-qr-code-container">
{{ t('wallets.myAssetWalletQRCode') }}
<div class="qr-code-info">
{{ t('wallets.myAssetWalletQRCodeInfo') }}
</div>
<div class="vertical-pacing-12"></div>
<ngx-qrcode
[elementType]="elementType"
[value]="assetWalletAddr$ | ngrxPush"
cssClass="qr-code"
[margin]="0"
[width]="150"
>
</ngx-qrcode>
</div>

<mat-list>
<mat-list-item>
<mat-icon svgIcon="wallet" mat-list-icon></mat-icon>
Expand Down
19 changes: 19 additions & 0 deletions src/app/features/wallets/wallets.page.scss
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,22 @@ mat-list {
margin-left: 3px;
font-size: 1.1em;
}

.asset-wallet-qr-code-container {
// background-color: green;
max-width: 300px;
margin: 0 auto;
display: flex;
flex-direction: column;
align-items: center;
}

.qr-code-info {
text-align: center;
opacity: 0.6;
font-size: 12px;
}

.vertical-pacing-12 {
height: 12px;
}
3 changes: 3 additions & 0 deletions src/app/features/wallets/wallets.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Browser } from '@capacitor/browser';
import { Clipboard } from '@capacitor/clipboard';
import { TranslocoService } from '@ngneat/transloco';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { NgxQrcodeElementTypes } from '@techiediaries/ngx-qrcode';
import { BehaviorSubject, combineLatest, forkJoin } from 'rxjs';
import {
catchError,
Expand Down Expand Up @@ -49,6 +50,8 @@ export class WalletsPage {
readonly isLoadingBalance$ = new BehaviorSubject<boolean>(false);
readonly networkConnected$ = this.diaBackendWalletService.networkConnected$;

elementType = NgxQrcodeElementTypes.URL;

constructor(
private readonly diaBackendWalletService: DiaBackendWalletService,
private readonly diaBackendAuthService: DiaBackendAuthService,
Expand Down
2 changes: 2 additions & 0 deletions src/assets/i18n/en-us.json
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,8 @@
"assetWalletHistory": "Asset Wallet History",
"myAssetWallet": "My Asset Wallet",
"myAssetWalletTooltip": "Main asset vault for Capture NFT and NUM",
"myAssetWalletQRCode": "My Asset Wallet QR-Code",
"myAssetWalletQRCodeInfo": "Please make sure to use BEP20 (BNB Chain)",
"integrityKey": "Integrity Key",
"integrityWallet": "Integrity Wallet",
"integrityWalletTooltip": "Wallet used for creating Signatures",
Expand Down
2 changes: 2 additions & 0 deletions src/assets/i18n/zh-tw.json
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,8 @@
"assetWalletHistory": "資產交易紀錄",
"myAssetWallet": "我的資產錢包",
"myAssetWalletTooltip": "Capture NFT 和 NUM 的主要資產庫",
"myAssetWalletQRCode": "我的資產錢包二維碼",
"myAssetWalletQRCodeInfo": "請務必使用 BEP20(BNB 鏈)",
"integrityKey": "完整性金鑰",
"integrityWallet": "完整性錢包",
"integrityWalletTooltip": "用於創建簽名的錢包",
Expand Down