Skip to content

Commit 15195ea

Browse files
ruizehungruizehung
authored
Merge pull request #1369 from numbersprotocol/develop
Bump version to 0.50.0
2 parents 7dc5341 + 4f295f9 commit 15195ea

File tree

69 files changed

+1996
-331
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1996
-331
lines changed

‎.github/workflows/pre-release.yml

+45-1
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,50 @@ jobs:
195195
upload-from: ./android/app/build/outputs/apk/debug/
196196
upload-to: /capture-lite/apk/debug/
197197

198+
upload-google-drive-dev:
199+
runs-on: ubuntu-latest
200+
steps:
201+
- uses: actions/checkout@v2
202+
203+
- uses: actions/setup-node@v2
204+
with:
205+
node-version: '16'
206+
207+
- name: Check if version has been updated
208+
id: version_check
209+
uses: EndBug/version-check@v2
210+
with:
211+
diff-search: true
212+
token: ${{ secrets.GITHUB_TOKEN }}
213+
214+
- name: Build Ionic
215+
if: steps.version_check.outputs.changed == 'true'
216+
env:
217+
NUMBERS_STORAGE_BASE_URL: ${{ secrets.NUMBERS_STORAGE_DEV_BASE_URL }}
218+
NUMBERS_STORAGE_TRUSTED_CLIENT_KEY: ${{ secrets.NUMBERS_STORAGE_TRUSTED_CLIENT_KEY }}
219+
NUMBERS_BUBBLE_DB_URL: ${{ secrets.NUMBERS_BUBBLE_DB_QA_URL }}
220+
run: |
221+
npm install -g @ionic/cli
222+
npm install
223+
npm run build
224+
225+
- name: Build APKs
226+
if: steps.version_check.outputs.changed == 'true'
227+
run: |
228+
npx cap sync android
229+
cd android/
230+
./gradlew assembleDebug
231+
232+
- name: Upload dev site build outputs to Google Drive
233+
if: steps.version_check.outputs.changed == 'true'
234+
uses: satackey/action-google-drive@v1
235+
with:
236+
skicka-tokencache-json: ${{ secrets.SKICKA_TOKENCACHE_JSON }}
237+
google-client-id: ${{ secrets.SKICKA_GOOGLE_CLIENT_ID }}
238+
google-client-secret: ${{ secrets.SKICKA_GOOGLE_CLIENT_SECRET }}
239+
upload-from: ./android/app/build/outputs/apk/debug/
240+
upload-to: /capture-lite/apk/dev/
241+
198242
upload-google-drive-qa:
199243
runs-on: ubuntu-latest
200244
steps:
@@ -229,7 +273,7 @@ jobs:
229273
cd android/
230274
./gradlew assembleDebug
231275
232-
- name: Upload QA outputs to Google Drive
276+
- name: Upload QA site build outputs to Google Drive
233277
if: steps.version_check.outputs.changed == 'true'
234278
uses: satackey/action-google-drive@v1
235279
with:

‎CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,19 @@ 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.50.0 - 2022-03-14
9+
10+
### Added
11+
12+
- A whole new wallets page
13+
- A new tab in activities page to display network action order history
14+
15+
### Fixed
16+
17+
- Change num token icon from the black one to the blue one
18+
- Fix activity details cid text overflow. #1167
19+
- Remove add to contacts checkbox when the receiver already exists in contacts
20+
821
## 0.49.1 - 2022-02-25
922

1023
### Added

‎android/app/build.gradle

+2-2
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 321
10-
versionName "0.49.1"
9+
versionCode 330
10+
versionName "0.50.0"
1111
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1212
}
1313
buildTypes {

‎package-lock.json

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "capture-lite",
3-
"version": "0.49.1",
3+
"version": "0.50.0",
44
"author": "numbersprotocol",
55
"homepage": "https://numbersprotocol.io/",
66
"scripts": {

‎src/app/app-routing.module.ts

+7
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@ const routes: Routes = [
6868
m => m.ContactsPageModule
6969
),
7070
},
71+
{
72+
path: 'wallets',
73+
loadChildren: () =>
74+
import('./features/wallets/wallets.module').then(
75+
m => m.WalletsPageModule
76+
),
77+
},
7178
];
7279
@NgModule({
7380
imports: [

‎src/app/features/home/transaction/transaction-routing.module.ts renamed to ‎src/app/features/home/activities/activities-routing.module.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import { NgModule } from '@angular/core';
22
import { RouterModule, Routes } from '@angular/router';
3-
import { TransactionPage } from './transaction.page';
3+
import { TransactionPage } from './activities.page';
44

55
const routes: Routes = [
66
{
77
path: '',
88
component: TransactionPage,
99
},
1010
{
11-
path: 'transaction-details',
11+
path: 'capture-transaction-details',
1212
loadChildren: () =>
13-
import('./transaction-details/transaction-details.module').then(
14-
m => m.TransactionDetailsPageModule
15-
),
13+
import(
14+
'./capture-transaction-details/capture-transaction-details.module'
15+
).then(m => m.TransactionDetailsPageModule),
1616
},
1717
];
1818

‎src/app/features/home/activities/activities.module.ts

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import { NgModule } from '@angular/core';
2+
import { SharedModule } from '../../../shared/shared.module';
3+
import { TransactionPageRoutingModule } from './activities-routing.module';
4+
import { TransactionPage } from './activities.page';
5+
import { CaptureTransactionsComponent } from './capture-transactions/capture-transactions.component';
6+
import { NetworkActionOrdersComponent } from './network-action-orders/network-action-orders.component';
7+
8+
@NgModule({
9+
imports: [SharedModule, TransactionPageRoutingModule],
10+
declarations: [
11+
TransactionPage,
12+
CaptureTransactionsComponent,
13+
NetworkActionOrdersComponent,
14+
],
15+
})
16+
export class TransactionPageModule {}

‎src/app/features/home/activities/activities.page.html

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<mat-toolbar *transloco="let t">
2+
<button routerLink=".." routerDirection="back" mat-icon-button>
3+
<mat-icon>arrow_back</mat-icon>
4+
</button>
5+
<span>{{ t('activity') }}</span>
6+
</mat-toolbar>
7+
8+
<ion-content *transloco="let t">
9+
<ion-segment #segment value="networkActionOrders">
10+
<ion-segment-button value="transactions">
11+
<ion-label>{{ t('captureTransactions') }}</ion-label>
12+
</ion-segment-button>
13+
<ion-segment-button value="networkActionOrders">
14+
<ion-label>{{ t('message.moreActions') }}</ion-label>
15+
</ion-segment-button>
16+
</ion-segment>
17+
18+
<div class="page-content">
19+
<div *ngIf="segment.value === 'transactions'">
20+
<app-capture-transactions></app-capture-transactions>
21+
</div>
22+
<div *ngIf="segment.value === 'networkActionOrders'">
23+
<app-network-action-orders></app-network-action-orders>
24+
</div>
25+
</div>
26+
</ion-content>

‎src/app/features/home/activities/activities.page.scss

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
mat-toolbar {
2+
span {
3+
padding-right: 40px;
4+
}
5+
}

‎src/app/features/home/transaction/transaction.page.spec.ts renamed to ‎src/app/features/home/activities/activities.page.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
22
import { SharedTestingModule } from '../../../shared/shared-testing.module';
3-
import { TransactionPage } from './transaction.page';
3+
import { TransactionPage } from './activities.page';
44

55
describe('TransactionPage', () => {
66
let component: TransactionPage;

‎src/app/features/home/activities/activities.page.ts

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { Component } from '@angular/core';
2+
import { UntilDestroy } from '@ngneat/until-destroy';
3+
4+
@UntilDestroy({ checkProperties: true })
5+
@Component({
6+
selector: 'app-activities',
7+
templateUrl: './activities.page.html',
8+
styleUrls: ['./activities.page.scss'],
9+
})
10+
export class TransactionPage {}

‎src/app/features/home/transaction/transaction-details/transaction-details-routing.module.ts renamed to ‎src/app/features/home/activities/capture-transaction-details/capture-transaction-details-routing.module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { NgModule } from '@angular/core';
22
import { RouterModule, Routes } from '@angular/router';
3-
import { TransactionDetailsPage } from './transaction-details.page';
3+
import { TransactionDetailsPage } from './capture-transaction-details.page';
44

55
const routes: Routes = [
66
{

‎src/app/features/home/transaction/transaction-details/transaction-details.module.ts renamed to ‎src/app/features/home/activities/capture-transaction-details/capture-transaction-details.module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { NgModule } from '@angular/core';
22
import { SharedModule } from '../../../../shared/shared.module';
3-
import { TransactionDetailsPageRoutingModule } from './transaction-details-routing.module';
4-
import { TransactionDetailsPage } from './transaction-details.page';
3+
import { TransactionDetailsPageRoutingModule } from './capture-transaction-details-routing.module';
4+
import { TransactionDetailsPage } from './capture-transaction-details.page';
55

66
@NgModule({
77
imports: [SharedModule, TransactionDetailsPageRoutingModule],

‎src/app/features/home/transaction/transaction-details/transaction-details.page.html renamed to ‎src/app/features/home/activities/capture-transaction-details/capture-transaction-details.page.html

+14-9
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,10 @@ <h4 class="datetime">
1010
</h4>
1111
<mat-card class="transaction-card">
1212
<mat-card-content class="row">
13-
<mat-label> {{ (transaction$ | ngrxPush)?.asset?.id }}</mat-label>
14-
<button
15-
*ngrxLet="status$ as status"
16-
[class]="status"
17-
mat-stroked-button
18-
disableRipple
19-
>
20-
{{ t('transactionState.' + status) }}
21-
</button>
13+
<mat-label>
14+
{{ t('digitalAsset') }} ID:
15+
{{ (transaction$ | ngrxPush)?.asset?.id }}
16+
</mat-label>
2217
</mat-card-content>
2318
<img
2419
decoding="async"
@@ -33,5 +28,15 @@ <h4 class="datetime">
3328
{{ t('receiver') }}: {{ (transaction$ | ngrxPush)?.receiver_email }}
3429
</mat-label>
3530
</mat-card-content>
31+
<mat-card-content class="column">
32+
<button
33+
*ngrxLet="status$ as status"
34+
[class]="status"
35+
mat-stroked-button
36+
disableRipple
37+
>
38+
{{ t('transactionState.' + status) }}
39+
</button>
40+
</mat-card-content>
3641
</mat-card>
3742
</div>

‎src/app/features/home/transaction/transaction-details/transaction-details.page.scss renamed to ‎src/app/features/home/activities/capture-transaction-details/capture-transaction-details.page.scss

+4
Original file line numberDiff line numberDiff line change
@@ -88,3 +88,7 @@ form mat-form-field {
8888
.spacer {
8989
flex: 1 1 auto;
9090
}
91+
92+
mat-label {
93+
overflow-wrap: anywhere;
94+
}

‎src/app/features/home/transaction/transaction-details/transaction-details.page.spec.ts renamed to ‎src/app/features/home/activities/capture-transaction-details/capture-transaction-details.page.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
22
import { SharedTestingModule } from '../../../../shared/shared-testing.module';
3-
import { TransactionDetailsPage } from './transaction-details.page';
3+
import { TransactionDetailsPage } from './capture-transaction-details.page';
44

55
describe('TransactionDetailsPage', () => {
66
let component: TransactionDetailsPage;

‎src/app/features/home/transaction/transaction-details/transaction-details.page.ts renamed to ‎src/app/features/home/activities/capture-transaction-details/capture-transaction-details.page.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import { ErrorService } from '../../../../shared/error/error.service';
1111
import { isNonNullable } from '../../../../utils/rx-operators/rx-operators';
1212
@UntilDestroy({ checkProperties: true })
1313
@Component({
14-
selector: 'app-transaction-details',
15-
templateUrl: './transaction-details.page.html',
16-
styleUrls: ['./transaction-details.page.scss'],
14+
selector: 'app-capture-transaction-details',
15+
templateUrl: './capture-transaction-details.page.html',
16+
styleUrls: ['./capture-transaction-details.page.scss'],
1717
})
1818
export class TransactionDetailsPage {
1919
readonly transaction$ = this.route.paramMap.pipe(

‎src/app/features/home/transaction/transaction.page.html renamed to ‎src/app/features/home/activities/capture-transactions/capture-transactions.component.html

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
<mat-toolbar *transloco="let t">
2-
<button routerLink=".." routerDirection="back" mat-icon-button>
3-
<mat-icon>arrow_back</mat-icon>
4-
</button>
5-
<span>{{ t('transaction') }}</span>
6-
</mat-toolbar>
7-
81
<div *transloco="let t" class="page-content">
92
<mat-list>
103
<ng-container
@@ -14,7 +7,7 @@
147
"
158
>
169
<mat-list-item
17-
[routerLink]="['transaction-details', { id: transaction.id }]"
10+
[routerLink]="['capture-transaction-details', { id: transaction.id }]"
1811
>
1912
<img
2013
decoding="async"

‎src/app/features/home/activities/capture-transactions/capture-transactions.component.scss

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
mat-list-item {
2+
height: initial;
3+
padding-top: 16px;
4+
padding-bottom: 16px;
5+
6+
img[matListAvatar] {
7+
border-radius: 4px;
8+
width: calc(100vw / 5);
9+
height: calc(100vw / 8);
10+
max-width: 150px;
11+
max-height: 80px;
12+
}
13+
14+
button {
15+
flex-shrink: 0;
16+
}
17+
18+
button.received {
19+
color: var(--ion-color-dark-contrast);
20+
border-color: var(--noir-simple);
21+
background-color: var(--noir-simple);
22+
}
23+
24+
button.delivered {
25+
color: var(--noir-simple);
26+
border-color: var(--noir-simple);
27+
}
28+
29+
button.inProgress {
30+
color: var(--noir-secondary-dark);
31+
border-color: var(--noir-secondary-dark);
32+
}
33+
34+
button.waitingToBeAccepted {
35+
color: var(--ion-color-dark-contrast);
36+
border-color: var(--noir-secondary-dark);
37+
background-color: var(--noir-secondary-dark);
38+
}
39+
40+
button.returned {
41+
color: var(--ion-color-dark-contrast);
42+
border-color: var(--noir-warn);
43+
background-color: var(--noir-warn);
44+
}
45+
46+
button.missed {
47+
color: var(--noir-warn);
48+
border-color: var(--noir-warn);
49+
}
50+
}

0 commit comments

Comments
 (0)