Skip to content
Closed
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 .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ jobs:
- name: Install Ionic CLI
run: npm install -g @ionic/cli

- name: Generate .npmrc for pintura package
env:
NUMBERS_PQINA_NPM_KEY: ${{ secrets.NUMBERS_PQINA_NPM_KEY }}
run: npm run preconfig.npmrc

- name: Install dependencies
run: npm install

Expand All @@ -41,6 +46,11 @@ jobs:
- name: Install Ionic CLI
run: npm install -g @ionic/cli

- name: Generate .npmrc for pintura package
env:
NUMBERS_PQINA_NPM_KEY: ${{ secrets.NUMBERS_PQINA_NPM_KEY }}
run: npm run preconfig.npmrc

- name: Install dependencies
run: npm install

Expand Down
8 changes: 4 additions & 4 deletions ios/App/App.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -374,8 +374,8 @@
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV3;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = NumbersAppDistributionV3;
PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV4;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = NumbersAppDistributionV4;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG USE_PUSH";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -400,8 +400,8 @@
MARKETING_VERSION = 0.68.0;
PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV3;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = NumbersAppDistributionV3;
PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV4;
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = NumbersAppDistributionV4;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = USE_PUSH;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
10 changes: 7 additions & 3 deletions src/app/features/wallets/buy-num/buy-num.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
<button routerLink="/wallets" routerDirection="back" mat-icon-button>
<mat-icon>arrow_back</mat-icon>
</button>
<span>{{ t('wallets.buyNum.buyNum') }}</span>
<span>{{ t('wallets.buyCredits.buyCredits') }}</span>
</mat-toolbar>

<ion-content *transloco="let t">
<ion-list lines="none">
<ion-list-header *ngIf="(totalProducts$ | ngrxPush) === 0">
{{ t('wallets.buyNum.inAppProductsNotAvailableYetPleaseTryAgainLater') }}
{{
t('wallets.buyCredits.inAppProductsNotAvailableYetPleaseTryAgainLater')
}}
</ion-list-header>

<ion-card *ngFor="let product of inAppProducts$ | async; let first = first">
Expand Down Expand Up @@ -37,7 +39,9 @@
fill="outline"
color="success"
>
{{ t('wallets.buyNum.buyPoints', { points: product.numPoints }) }}
{{
t('wallets.buyCredits.buyXCredits', { credits: product.numPoints })
}}
<ion-spinner
*ngIf="product.inAppProduct.state !== 'valid'"
></ion-spinner>
Expand Down
8 changes: 5 additions & 3 deletions src/app/features/wallets/buy-num/buy-num.page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,12 @@ export class BuyNumPage implements OnInit {

async showNumPointsQuantity(numPoints: number) {
const info = this.translocoService.translate(
'wallets.buyNum.thisPackageIncludesXNumPoints',
{ points: numPoints }
'wallets.buyCredits.thisPackageIncludeXCredits',
{ credits: numPoints }
);
const okText = this.translocoService.translate(
'wallets.buyCredits.okIGotIt'
);
const okText = this.translocoService.translate('wallets.buyNum.okIGotIt');
const alert = await this.alertController.create({
header: info,
buttons: [okText],
Expand Down
4 changes: 2 additions & 2 deletions src/app/features/wallets/wallets.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h3 class="num-text">NUM</h3>
<ng-template #balanceLoading>
<mat-spinner diameter="15"></mat-spinner>
</ng-template>
Points:
{{ t('wallets.buyCredits.credits') }}:
<span
class="bep20-points"
*ngIf="!(isLoadingBalance$ | ngrxPush); else balanceLoading"
Expand All @@ -54,7 +54,7 @@ <h3 class="num-text">NUM</h3>
id="buy-num-btn"
size="small"
class="num-operation-btn"
>{{ t('buy') }} NUM</ion-button
>{{ t('wallets.buyCredits.buyCredits') }}</ion-button
>
<ion-button
*ngIf="shouldHideDepositButton === false"
Expand Down
6 changes: 3 additions & 3 deletions src/app/shared/in-app-store/in-app-store.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,13 @@ export class InAppStoreService implements OnDestroy {
inAppProduct.finish();

this.notifyUser(
this.translocoService.translate('wallets.buyNum.pointsAdded', {
points: pointsToAdd,
this.translocoService.translate('wallets.buyCredits.xCreditsAdded', {
credits: pointsToAdd,
})
);
} catch (error) {
const errorMessage = this.translocoService.translate(
'wallets.buyNum.failedToAddPoints'
'wallets.buyCredits.failedToAddCredits'
);
this.errorService.toastError$(errorMessage).toPromise();
}
Expand Down
13 changes: 7 additions & 6 deletions src/assets/i18n/en-us.json
Original file line number Diff line number Diff line change
Expand Up @@ -309,12 +309,13 @@
"pending": "Pending",
"total": "Total",
"calculateGasFee": "Calculate Gas",
"buyNum": {
"buyNum": "Buy NUM Points",
"buyPoints": "Buy {{points}} Points",
"pointsAdded": "{{points}} NUM points added",
"failedToAddPoints": "Failed to add points",
"thisPackageIncludesXNumPoints": "This package include {{points}} NUM points.",
"buyCredits": {
"credits": "Credits",
"buyCredits": "Buy Credits",
"buyXCredits": "Buy {{credits}} credits",
"xCreditsAdded": "{{credits}} credits added",
"failedToAddCredits": "Failed to add credits",
"thisPackageIncludeXCredits": "This package include {{credits}} credits",
"okIGotIt": "Ok, I got it",
"inAppProductsNotAvailableYetPleaseTryAgainLater": "In App Products are not available yet. Try again later."
}
Expand Down
17 changes: 9 additions & 8 deletions src/assets/i18n/zh-tw.json
Original file line number Diff line number Diff line change
Expand Up @@ -309,14 +309,15 @@
"pending": "待計算",
"total": "總額",
"calculateGasFee": "計算油費",
"buyNum": {
"buyNum": "購買 NUM 點數",
"buyPoints": "購買{{points}}點數",
"pointsAdded": "加值 {{points}} NUM 點數",
"failedToAddPoints": "加值失敗",
"thisPackageIncludesXNumPoints": "此方案包括{{points}}個 NUM 點數",
"okIGotIt": "好,我了解",
"inAppProductsNotAvailableYetPleaseTryAgainLater": "App 內購買目前無法使用,請稍後再試"
"buyCredits": {
"credits": "點數",
"buyCredits": "購買點數",
"buyXCredits": "購買 {{credits}} 點",
"xCreditsAdded": "已添加 {{credits}} 點",
"failedToAddCredits": "添加點數失敗",
"thisPackageIncludeXCredits": "此方案包含 {{credits}} 點",
"okIGotIt": "Ok, I got it",
"inAppProductsNotAvailableYetPleaseTryAgainLater": "App 內購買目前無法使用,請稍後再試."
}
},
"invitation": {
Expand Down