Skip to content

Commit

Permalink
Merge pull request #2600 from numbersprotocol/release-0.74.0
Browse files Browse the repository at this point in the history
Release 0.74.0
  • Loading branch information
bafu authored Feb 16, 2023
2 parents abcef5b + cf39eb8 commit 33ec347
Show file tree
Hide file tree
Showing 11 changed files with 139 additions and 432 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- name: Get release version
id: version_check
run: echo ::set-output name=version::${GITHUB_REF/refs\/tags\//}
run: echo "version_new=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT

- name: Build Ionic
env:
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:

- name: Get release version
id: version_check
run: echo ::set-output name=version::${GITHUB_REF/refs\/tags\//}
run: echo "version_new=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT

- name: Build Ionic
env:
Expand Down Expand Up @@ -166,7 +166,7 @@ jobs:

- name: Get release version
id: version_check
run: echo ::set-output name=version::${GITHUB_REF/refs\/tags\//}
run: echo "version_new=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT

- name: Build Ionic
env:
Expand Down Expand Up @@ -286,7 +286,7 @@ jobs:

- name: Get release version
id: version_check
run: echo ::set-output name=version::${GITHUB_REF/refs\/tags\//}
run: echo "version_new=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT

- name: Create GitHub prerelease
id: create_release
Expand Down
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

To check the difference between the last releaes and the latest dev status, click the link above.

## [0.74.0] - 2023-02-14

### Added

1. Feature support iframe wallet page (#2577)

### Fixed

1. Fix camera tap to focus (#2527)
2. Fix to show bronze pack price (#2521)

## [0.73.1] - 2023-01-30

### Added
Expand Down Expand Up @@ -2019,7 +2030,8 @@ This is the first release! _Capture Lite_ is a cross-platform app adapted from [
- Web - see the demo [here](https://github.com/numbersprotocol/capture-lite#demo-app)
- Android - the APK file `app-debug.apk` is attached to this release

[unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.73.1...HEAD
[unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.74.0...HEAD
[0.74.0]: https://github.com/numbersprotocol/capture-lite/compare/0.73.0...0.74.0
[0.73.1]: https://github.com/numbersprotocol/capture-lite/compare/0.72.4...0.73.1
[0.72.4]: https://github.com/numbersprotocol/capture-lite/compare/0.72.3...0.72.4
[0.72.3]: https://github.com/numbersprotocol/capture-lite/compare/0.72.2...0.72.3
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 471
versionName "0.73.1"
versionCode 472
versionName "0.74.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildFeatures {
Expand Down
4 changes: 2 additions & 2 deletions ios/App/App.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 0.73.1;
MARKETING_VERSION = 0.74.0;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -401,7 +401,7 @@
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MARKETING_VERSION = 0.73.1;
MARKETING_VERSION = 0.74.0;
PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV4;
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.73.1",
"version": "0.74.0",
"author": "numbersprotocol",
"homepage": "https://numbersprotocol.io/",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
</div>
<div
class="camera-preview"
(click)="focus($event)"
(swipeleft)="onSwipeLeft($event)"
(swiperight)="onSwipeRight($event)"
(pinchstart)="handlePinchStart($event)"
Expand Down
6 changes: 2 additions & 4 deletions src/app/features/wallets/buy-num/buy-num.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
<ion-item>
<ion-label>
<div class="in-app-product-description">
<div
[ngClass]="{ 'title-text': !first, 'title-text-large': first }"
>
<div class="title-text">
{{ product.inAppProduct.title }}
<ion-icon
class="num-point-info"
Expand All @@ -28,7 +26,7 @@
name="alert-circle-outline"
></ion-icon>
</div>
<div class="subtitle-text" *ngIf="!first">
<div class="subtitle-text">
{{ product.inAppProduct.price }}
</div>
</div>
Expand Down
174 changes: 26 additions & 148 deletions src/app/features/wallets/wallets.page.html
Original file line number Diff line number Diff line change
@@ -1,149 +1,27 @@
<mat-toolbar *transloco="let t">
<button routerLink=".." routerDirection="back" mat-icon-button>
<mat-icon>arrow_back</mat-icon>
</button>
<span>{{ t('wallets.wallets') }}</span>
</mat-toolbar>
<ng-container *ngIf="(networkConnected$ | async) === false; else bubbleIframe">
<mat-toolbar>
<button
routerLink=".."
routerDirection="back"
mat-mini-fab
class="capture-rebranded-button"
>
<mat-icon>arrow_back</mat-icon>
</button>
<span>{{ 'wallets.walets' | transloco }}</span>
</mat-toolbar>
<div class="no-network-text">
{{ 'message.networkNotConnected' | transloco }}
</div>
</ng-container>

<ion-content *transloco="let t">
<ion-refresher slot="fixed" (ionRefresh)="refreshBalance($event)">
</ion-refresher>
<p id="pull-to-refresh-help-text">
↓{{ t('wallets.pullToRefreshBalance') }}↓
</p>
<ion-card>
<ion-grid>
<ion-row>
<ion-col size="8">
<ion-text class="text-black">
<h1 class="balance-text">
{{ totalBalance$ | ngrxPush | currency }} NUM
</h1>
</ion-text>
</ion-col>
<ion-col offset="0.3">
<ion-row id="num-icon-row">
<ion-img src="../../../assets/images/num-icon.svg"></ion-img>
<ion-text class="text-black">
<h3 class="num-text">NUM</h3>
</ion-text>
</ion-row>
</ion-col>
</ion-row>
<ion-row id="mainnet-points-row" class="text-black">
Mainnet:
<ng-container
*ngIf="!(isLoadingBalance$ | ngrxPush); else balanceLoading"
>
<span class="mainnet-points">
${{ mainNumBalance$ | ngrxPush | number: '1.2-2' }}
</span>
<ion-icon
name="information-circle"
#mainnetBalanceTooltip="matTooltip"
(click)="mainnetBalanceTooltip.toggle()"
[matTooltip]="t('wallets.mainnetNumInfo')"
></ion-icon>
</ng-container>
<ng-template #balanceLoading>
<mat-spinner diameter="15"></mat-spinner>
</ng-template>
{{ t('wallets.buyCredits.credits') }}:
<span
class="mainnet-points"
*ngIf="!(isLoadingBalance$ | ngrxPush); else balanceLoading"
>{{ points$ | ngrxPush | number: '1.2-2' }}</span
>
</ion-row>
<ion-row id="buy-deposit-withdraw-row">
<ion-button
(click)="navigateToBuyNumPage()"
id="buy-num-btn"
size="small"
class="num-operation-btn"
>{{ t('wallets.buyCredits.buyCredits') }}</ion-button
>
<ion-button
*ngIf="shouldHideDepositButton === false"
class="deposit-withdraw-num-btn num-operation-btn"
color="#7E7E7E"
fill="outline"
size="small"
(click)="onDepositWithdrawBtnClick('deposit')"
>{{ t('wallets.deposit') }}</ion-button
>
<ion-button
class="deposit-withdraw-num-btn num-operation-btn"
color="#7E7E7E"
fill="outline"
size="small"
(click)="onDepositWithdrawBtnClick('withdraw')"
>{{ t('wallets.withdraw') }}</ion-button
>
</ion-row>
</ion-grid>
</ion-card>

<mat-list>
<mat-list-item>
<mat-icon svgIcon="wallet" mat-list-icon></mat-icon>
<div mat-line>
{{ t('wallets.myAssetWallet') }}
<ion-icon
class="info-icon"
name="information-circle"
#assetWalletTooltip="matTooltip"
(click)="assetWalletTooltip.toggle()"
[matTooltip]="t('wallets.myAssetWalletTooltip')"
></ion-icon>
</div>
<div mat-line>{{ assetWalletAddr$ | ngrxPush }}</div>
<button
mat-icon-button
*ngIf="assetWalletAddr$ | ngrxPush as assetWalletAddr"
(click)="copyToClipboard(assetWalletAddr)"
>
<mat-icon>content_copy</mat-icon>
</button>
</mat-list-item>
<mat-list-item>
<mat-icon mat-list-icon>vpn_key</mat-icon>
<div mat-line>
{{ t('wallets.integrityWallet') }}
<ion-icon
class="info-icon"
name="information-circle"
#integrityKeyTooltip="matTooltip"
(click)="integrityKeyTooltip.toggle()"
[matTooltip]="t('wallets.integrityWalletTooltip')"
></ion-icon>
</div>
<div mat-line>{{ publicKey$ | ngrxPush }}</div>
<button
mat-icon-button
*ngIf="publicKey$ | ngrxPush as publicKey"
(click)="copyToClipboard(publicKey)"
>
<mat-icon>content_copy</mat-icon>
</button>
</mat-list-item>
<mat-list-item>
<mat-icon mat-list-icon>history</mat-icon>
<div mat-line>{{ t('wallets.assetWalletHistory') }}</div>
<div mat-line>
<a (click)="openAssetWalletHistory()">
{{ t('wallets.viewOnExplore') }}
</a>
</div>
</mat-list-item>
</mat-list>
<ion-button
expand="block"
color="danger"
fill="outline"
id="export-integrity-wallet-btn"
(click)="exportIntegrityWalletPrivateKey()"
>
{{ t('wallets.exportIntegrityKey') }}
</ion-button>
</ion-content>
<ng-template #bubbleIframe>
<iframe
[src]="iframeUrl$ | async | safeResourceUrl"
class="bubble-iframe"
></iframe>
<ion-spinner
*ngIf="(iframeLoaded$ | async) !== true"
name="lines-sharp"
></ion-spinner>
</ng-template>
Loading

0 comments on commit 33ec347

Please sign in to comment.