Skip to content

Commit 804461e

Browse files
shc261392shc261392
authored
Merge pull request #1797 from numbersprotocol/develop
Develop
2 parents 6eb9d2d + f71bc4b commit 804461e

File tree

9 files changed

+207
-138
lines changed

9 files changed

+207
-138
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## 0.60.1 - 2022-07-06
9+
10+
### Fixed
11+
12+
- Move wallet address QR code to deposit page
13+
814
## 0.60.0 - 2022-07-05
915

1016
### Added

‎android/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
applicationId "io.numbersprotocol.capturelite"
77
minSdkVersion rootProject.ext.minSdkVersion
88
targetSdkVersion rootProject.ext.targetSdkVersion
9-
versionCode 420
10-
versionName "0.60.0"
9+
versionCode 421
10+
versionName "0.60.1"
1111
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1212
}
1313
buildFeatures {

‎package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "capture-lite",
3-
"version": "0.60.0",
3+
"version": "0.60.1",
44
"author": "numbersprotocol",
55
"homepage": "https://numbersprotocol.io/",
66
"scripts": {

‎src/app/features/wallets/transfer/transfer.module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
import { NgModule } from '@angular/core';
2+
import { NgxQRCodeModule } from '@techiediaries/ngx-qrcode';
23
import { SharedModule } from '../../../shared/shared.module';
34
import { TransferLoadingComponent } from './transfer-loading/transfer-loading.component';
45
import { TransferRequestSentComponent } from './transfer-request-sent/transfer-request-sent.component';
56
import { TransferPageRoutingModule } from './transfer-routing.module';
67
import { TransferPage } from './transfer.page';
78

89
@NgModule({
9-
imports: [SharedModule, TransferPageRoutingModule],
10+
imports: [SharedModule, TransferPageRoutingModule, NgxQRCodeModule],
1011
declarations: [
1112
TransferPage,
1213
TransferLoadingComponent,

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

Lines changed: 162 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -6,119 +6,166 @@
66
</mat-toolbar>
77

88
<ion-content *transloco="let t">
9-
<ion-card id="main-card">
10-
<ion-grid>
11-
<ion-row id="in-app-transfer-row">
12-
<ion-col size="2">
13-
<ion-icon id="in-app-transfer-wallet-icon" name="wallet"></ion-icon>
14-
</ion-col>
15-
<ion-col size="8">
16-
<h6>{{ t('wallets.inAppTransfer') }}</h6>
17-
<p>{{ t('wallets.moveNumBetweenAssetWallet') }}</p>
18-
<p>{{ t('wallets.andIntegrityWallet') }}</p>
19-
</ion-col>
20-
<ion-col>
21-
<ion-img
22-
id="num-icon-svg"
23-
src="../../../assets/images/num-icon.svg"
24-
></ion-img>
25-
</ion-col>
26-
</ion-row>
27-
<ion-row class="wallet-info-row">
28-
<ion-col size="7">
29-
<h1>
30-
{{
31-
mode === 'withdraw'
32-
? t('wallets.assetWallet')
33-
: t('wallets.integrityWallet')
34-
}}
35-
</h1>
36-
</ion-col>
37-
<ion-col offset="0.5">
38-
<h6>BEP20</h6>
39-
<h5>
40-
{{
41-
(mode === 'withdraw'
42-
? assetWalletBscNumBalance$
43-
: integrityWalletBscNumBalance$
44-
)
45-
| ngrxPush
46-
| currency
47-
}}
48-
</h5>
49-
</ion-col>
50-
</ion-row>
51-
<ion-row id="divider-row">
52-
<ion-icon id="direction-icon" name="arrow-down-circle"></ion-icon>
53-
<div id="horizontal-divider"></div>
54-
</ion-row>
55-
<ion-row class="wallet-info-row">
56-
<ion-col size="7">
57-
<h1>
58-
{{
59-
mode === 'withdraw'
60-
? t('wallets.integrityWallet')
61-
: t('wallets.assetWallet')
62-
}}
63-
</h1>
64-
</ion-col>
65-
<ion-col offset="0.5">
66-
<h6>BEP20</h6>
67-
<h5>
68-
{{
69-
(mode === 'withdraw'
70-
? integrityWalletBscNumBalance$
71-
: assetWalletBscNumBalance$
72-
)
73-
| ngrxPush
74-
| currency
75-
}}
76-
</h5>
77-
</ion-col>
78-
</ion-row>
79-
<ion-row>
80-
<ion-input
81-
id="transfer-amount-input"
82-
[placeholder]="t('wallets.enterAmount')"
83-
[(ngModel)]="transferAmount"
84-
type="number"
85-
(input)="onInputTransferAmount()"
86-
></ion-input>
87-
</ion-row>
88-
</ion-grid>
89-
</ion-card>
90-
<ion-card id="bottom-card" *ngIf="keyboardIsHidden$ | ngrxPush">
91-
<ion-grid>
92-
<ion-row>
93-
<ion-col size="2">
94-
<ion-icon name="wallet"></ion-icon>
95-
</ion-col>
96-
<ion-col size="5" *ngrxLet="gasFee$ as gasFee">
97-
<h6 class="gas-fee-text">
98-
{{ t('wallets.gasFee') }}:
99-
{{ gasFee > 0 ? (gasFee | number: '1.2-2') : t('wallets.pending') }}
100-
</h6>
101-
<h4 class="wallet-total-text">
102-
{{ t('wallets.total') }} {{ totalCost$ | ngrxPush | currency }}
103-
</h4>
104-
</ion-col>
105-
<ion-col id="deposit-withdraw-btn-col">
106-
<ion-button
107-
*ngIf="!readyToSend"
108-
fill="outline"
109-
expand="block"
110-
(click)="calculateGasFee()"
111-
>{{ t('wallets.calculateGasFee') }}</ion-button
112-
>
113-
<ion-button
114-
*ngIf="readyToSend"
115-
fill="outline"
116-
expand="block"
117-
(click)="transfer()"
118-
>{{ t('wallets.' + mode) }}</ion-button
119-
>
120-
</ion-col>
121-
</ion-row>
122-
</ion-grid>
123-
</ion-card>
9+
<div *ngIf="mode === 'deposit'">
10+
<div class="vertical-pacing-12"></div>
11+
<div class="asset-wallet-qr-code-container">
12+
{{ t('wallets.myAssetWalletQRCode') }}
13+
<div class="qr-code-info">
14+
{{ t('wallets.myAssetWalletQRCodeInfo') }}
15+
</div>
16+
<div class="vertical-pacing-12"></div>
17+
<ngx-qrcode
18+
[elementType]="elementType"
19+
[value]="assetWalletAddr$ | ngrxPush"
20+
cssClass="qr-code"
21+
[margin]="0"
22+
[width]="150"
23+
>
24+
</ngx-qrcode>
25+
</div>
26+
27+
<mat-list>
28+
<mat-list-item>
29+
<mat-icon svgIcon="wallet" mat-list-icon></mat-icon>
30+
<div mat-line>
31+
{{ t('wallets.myAssetWallet') }}
32+
<ion-icon
33+
class="info-icon"
34+
name="information-circle"
35+
#assetWalletTooltip="matTooltip"
36+
(click)="assetWalletTooltip.toggle()"
37+
[matTooltip]="t('wallets.myAssetWalletTooltip')"
38+
></ion-icon>
39+
</div>
40+
<div mat-line>{{ assetWalletAddr$ | ngrxPush }}</div>
41+
<button
42+
mat-icon-button
43+
*ngIf="assetWalletAddr$ | ngrxPush as assetWalletAddr"
44+
(click)="copyToClipboard(assetWalletAddr)"
45+
>
46+
<mat-icon>content_copy</mat-icon>
47+
</button>
48+
</mat-list-item>
49+
</mat-list>
50+
</div>
51+
52+
<div *ngIf="mode === 'withdraw'">
53+
<ion-card id="main-card">
54+
<ion-grid>
55+
<ion-row id="in-app-transfer-row">
56+
<ion-col size="2">
57+
<ion-icon id="in-app-transfer-wallet-icon" name="wallet"></ion-icon>
58+
</ion-col>
59+
<ion-col size="8">
60+
<h6>{{ t('wallets.inAppTransfer') }}</h6>
61+
<p>{{ t('wallets.moveNumBetweenAssetWallet') }}</p>
62+
<p>{{ t('wallets.andIntegrityWallet') }}</p>
63+
</ion-col>
64+
<ion-col>
65+
<ion-img
66+
id="num-icon-svg"
67+
src="../../../assets/images/num-icon.svg"
68+
></ion-img>
69+
</ion-col>
70+
</ion-row>
71+
<ion-row class="wallet-info-row">
72+
<ion-col size="7">
73+
<h1>
74+
{{
75+
mode === 'withdraw'
76+
? t('wallets.assetWallet')
77+
: t('wallets.integrityWallet')
78+
}}
79+
</h1>
80+
</ion-col>
81+
<ion-col offset="0.5">
82+
<h6>BEP20</h6>
83+
<h5>
84+
{{
85+
(mode === 'withdraw'
86+
? assetWalletBscNumBalance$
87+
: integrityWalletBscNumBalance$
88+
)
89+
| ngrxPush
90+
| currency
91+
}}
92+
</h5>
93+
</ion-col>
94+
</ion-row>
95+
<ion-row id="divider-row">
96+
<ion-icon id="direction-icon" name="arrow-down-circle"></ion-icon>
97+
<div id="horizontal-divider"></div>
98+
</ion-row>
99+
<ion-row class="wallet-info-row">
100+
<ion-col size="7">
101+
<h1>
102+
{{
103+
mode === 'withdraw'
104+
? t('wallets.integrityWallet')
105+
: t('wallets.assetWallet')
106+
}}
107+
</h1>
108+
</ion-col>
109+
<ion-col offset="0.5">
110+
<h6>BEP20</h6>
111+
<h5>
112+
{{
113+
(mode === 'withdraw'
114+
? integrityWalletBscNumBalance$
115+
: assetWalletBscNumBalance$
116+
)
117+
| ngrxPush
118+
| currency
119+
}}
120+
</h5>
121+
</ion-col>
122+
</ion-row>
123+
<ion-row>
124+
<ion-input
125+
id="transfer-amount-input"
126+
[placeholder]="t('wallets.enterAmount')"
127+
[(ngModel)]="transferAmount"
128+
type="number"
129+
(input)="onInputTransferAmount()"
130+
></ion-input>
131+
</ion-row>
132+
</ion-grid>
133+
</ion-card>
134+
<ion-card id="bottom-card" *ngIf="keyboardIsHidden$ | ngrxPush">
135+
<ion-grid>
136+
<ion-row>
137+
<ion-col size="2">
138+
<ion-icon name="wallet"></ion-icon>
139+
</ion-col>
140+
<ion-col size="5" *ngrxLet="gasFee$ as gasFee">
141+
<h6 class="gas-fee-text">
142+
{{ t('wallets.gasFee') }}:
143+
{{
144+
gasFee > 0 ? (gasFee | number: '1.2-2') : t('wallets.pending')
145+
}}
146+
</h6>
147+
<h4 class="wallet-total-text">
148+
{{ t('wallets.total') }} {{ totalCost$ | ngrxPush | currency }}
149+
</h4>
150+
</ion-col>
151+
<ion-col id="deposit-withdraw-btn-col">
152+
<ion-button
153+
*ngIf="!readyToSend"
154+
fill="outline"
155+
expand="block"
156+
(click)="calculateGasFee()"
157+
>{{ t('wallets.calculateGasFee') }}</ion-button
158+
>
159+
<ion-button
160+
*ngIf="readyToSend"
161+
fill="outline"
162+
expand="block"
163+
(click)="transfer()"
164+
>{{ t('wallets.' + mode) }}</ion-button
165+
>
166+
</ion-col>
167+
</ion-row>
168+
</ion-grid>
169+
</ion-card>
170+
</div>
124171
</ion-content>

‎src/app/features/wallets/transfer/transfer.page.scss

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,3 +175,21 @@ ion-card {
175175
border-radius: 5px;
176176
}
177177
}
178+
179+
.asset-wallet-qr-code-container {
180+
max-width: 300px;
181+
margin: 0 auto;
182+
display: flex;
183+
flex-direction: column;
184+
align-items: center;
185+
}
186+
187+
.qr-code-info {
188+
text-align: center;
189+
opacity: 0.6;
190+
font-size: 12px;
191+
}
192+
193+
.vertical-pacing-12 {
194+
height: 12px;
195+
}

0 commit comments

Comments
 (0)