Merge pull request #2696 from numbersprotocol/develop

Develop

.github/workflows/pre-release.yml

@@ -19,7 +19,7 @@ jobs:
 
       - name: Get release version
         id: version_check
-        run: echo "version_new=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
+        run: echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
 
       - name: Build Ionic
         env:
@@ -90,7 +90,7 @@ jobs:
 
       - name: Get release version
         id: version_check
-        run: echo "version_new=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
+        run: echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
 
       - name: Build Ionic
         env:
@@ -166,7 +166,7 @@ jobs:
 
       - name: Get release version
         id: version_check
-        run: echo "version_new=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
+        run: echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
 
       - name: Build Ionic
         env:
@@ -286,7 +286,7 @@ jobs:
 
       - name: Get release version
         id: version_check
-        run: echo "version_new=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
+        run: echo "version=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
 
       - name: Create GitHub prerelease
         id: create_release

CHANGELOG.md

@@ -9,6 +9,22 @@ 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.77.0] - 2023-04-03
+
+### Added
+
+1. Feature upload image (#2671)
+1. Feature show clear error handling of change username on my capture page (#2664)
+1. Feature special provider for photos taken from capture app (#2667)
+
+### Fixed
+
+1. Fix for ios action of capture ci fail to upload ipa to test flight (#2668)
+1. Fix show message if asset registration insufficient num (#2669)
+1. Fix ionic navigation with iframe back button (#2670)
+1. Fix issue capture details swipe left right is not showing expected capture (#2665)
+1. Fix delete account should work real (#2666)
+
 ## [0.75.2] - 2023-03-13
 
 ### Fixed
@@ -2069,7 +2085,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.75.2...HEAD
+[unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.77.0...HEAD
+[0.77.0]: https://github.com/numbersprotocol/capture-lite/compare/0.75.2...0.77.0
 [0.75.2]: https://github.com/numbersprotocol/capture-lite/compare/0.75.1...0.75.2
 [0.75.1]: https://github.com/numbersprotocol/capture-lite/compare/0.75.0...0.75.1
 [0.75.0]: https://github.com/numbersprotocol/capture-lite/compare/0.74.2...0.75.0

android/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "io.numbersprotocol.capturelite"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 752
-        versionName "0.75.2"
+        versionCode 770
+        versionName "0.77.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildFeatures {

ios/App/App.xcodeproj/project.pbxproj

@@ -368,13 +368,13 @@
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 752;
+				CURRENT_PROJECT_VERSION = 770;
 				DEVELOPMENT_TEAM = G7NB5YCKAP;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.75.2;
+				MARKETING_VERSION = 0.77.0;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -395,13 +395,13 @@
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 752;
+				CURRENT_PROJECT_VERSION = 770;
 				DEVELOPMENT_TEAM = G7NB5YCKAP;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP;
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.75.2;
+				MARKETING_VERSION = 0.77.0;
 				PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV4;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "capture-lite",
-  "version": "0.75.2",
+  "version": "0.77.0",
   "author": "numbersprotocol",
   "homepage": "https://numbersprotocol.io/",
   "scripts": {

set-secret.js

@@ -11,6 +11,7 @@ export const BUBBLE_DB_URL = '${process.env.NUMBERS_BUBBLE_DB_URL}';
 export const BUBBLE_IFRAME_URL = '${process.env.NUMBERS_BUBBLE_IFRAME_URL}';
 export const BUBBLE_API_URL = '${process.env.BUBBLE_API_URL}';
 export const APPS_FLYER_DEV_KEY = '${process.env.APPS_FLYER_DEV_KEY}'
+export const PIPEDREAM_URL = '${process.env.PIPEDREAM_URL}'
 `;
 fs.writeFile(targetPath, envConfigFile, err => {
   if (err) {

src/app/app.component.ts

@@ -10,7 +10,7 @@ import { CameraService } from './shared/camera/camera.service';
 import { CaptureService } from './shared/capture/capture.service';
 import { CollectorService } from './shared/collector/collector.service';
 import { CapacitorFactsProvider } from './shared/collector/facts/capacitor-facts-provider/capacitor-facts-provider.service';
-import { WebCryptoApiSignatureProvider } from './shared/collector/signature/web-crypto-api-signature-provider/web-crypto-api-signature-provider.service';
+import { CaptureAppWebCryptoApiSignatureProvider } from './shared/collector/signature/capture-app-web-crypto-api-signature-provider/capture-app-web-crypto-api-signature-provider.service';
 import { DiaBackendAssetUploadingService } from './shared/dia-backend/asset/uploading/dia-backend-asset-uploading.service';
 import { DiaBackendAuthService } from './shared/dia-backend/auth/dia-backend-auth.service';
 import { DiaBackendNotificationService } from './shared/dia-backend/notification/dia-backend-notification.service';
@@ -33,7 +33,7 @@ export class AppComponent {
     private readonly iconRegistry: MatIconRegistry,
     private readonly sanitizer: DomSanitizer,
     private readonly capacitorFactsProvider: CapacitorFactsProvider,
-    private readonly webCryptoApiSignatureProvider: WebCryptoApiSignatureProvider,
+    private readonly capAppWebCryptoApiSignatureProvider: CaptureAppWebCryptoApiSignatureProvider,
     private readonly captureService: CaptureService,
     private readonly cameraService: CameraService,
     private readonly errorService: ErrorService,
@@ -92,10 +92,10 @@ export class AppComponent {
   }
 
   initializeCollector() {
-    this.webCryptoApiSignatureProvider.initialize();
+    this.capAppWebCryptoApiSignatureProvider.initialize();
     this.collectorService.addFactsProvider(this.capacitorFactsProvider);
     this.collectorService.addSignatureProvider(
-      this.webCryptoApiSignatureProvider
+      this.capAppWebCryptoApiSignatureProvider
     );
   }
 

src/app/features/about/about.page.html

@@ -1,7 +1,5 @@
 <mat-toolbar *transloco="let t">
-  <button routerLink=".." routerDirection="back" mat-icon-button>
-    <mat-icon>arrow_back</mat-icon>
-  </button>
+  <app-capture-back-button></app-capture-back-button>
   <span>{{ t('about') }}</span>
 </mat-toolbar>
 

src/app/features/contacts/contacts.page.html

@@ -1,7 +1,5 @@
 <mat-toolbar *transloco="let t">
-  <button routerLink=".." routerDirection="back" mat-icon-button>
-    <mat-icon>arrow_back</mat-icon>
-  </button>
+  <app-capture-back-button></app-capture-back-button>
   <span>{{ t('friends') }}</span>
 </mat-toolbar>
 

src/app/features/data-policy/data-policy.page.html

@@ -1,13 +1,6 @@
 <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>
+    <app-capture-back-button></app-capture-back-button>
     <span>{{ 'dataPolicy' | transloco }}</span>
   </mat-toolbar>
   <div class="no-network-text">

src/app/features/data-policy/data-policy.page.scss

@@ -8,14 +8,6 @@ mat-toolbar {
     text-align: center;
     color: white;
   }
-
-  .capture-rebranded-button {
-    margin: 0 4px;
-    background: #ffffff40 !important; /* stylelint-disable-line declaration-no-important */
-    color: white !important; /* stylelint-disable-line declaration-no-important */
-    backdrop-filter: blur(4px);
-    box-shadow: none;
-  }
 }
 
 .no-network-text {

src/app/features/faq/faq.page.html

@@ -1,13 +1,6 @@
 <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>
+    <app-capture-back-button></app-capture-back-button>
     <span>{{ 'faq' | transloco }}</span>
   </mat-toolbar>
   <div class="no-network-text">

src/app/features/faq/faq.page.scss

@@ -8,14 +8,6 @@ mat-toolbar {
     text-align: center;
     color: white;
   }
-
-  .capture-rebranded-button {
-    margin: 0 4px;
-    background: #ffffff40 !important; /* stylelint-disable-line declaration-no-important */
-    color: white !important; /* stylelint-disable-line declaration-no-important */
-    backdrop-filter: blur(4px);
-    box-shadow: none;
-  }
 }
 
 .no-network-text {

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

@@ -1,7 +1,5 @@
 <mat-toolbar *transloco="let t">
-  <button routerLink=".." routerDirection="back" mat-icon-button>
-    <mat-icon>arrow_back</mat-icon>
-  </button>
+  <app-capture-back-button></app-capture-back-button>
   <span>{{ t('activity') }}</span>
 </mat-toolbar>
 

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

@@ -1,7 +1,5 @@
 <mat-toolbar *transloco="let t">
-  <button routerLink=".." routerDirection="back" mat-icon-button>
-    <mat-icon>arrow_back</mat-icon>
-  </button>
+  <app-capture-back-button></app-capture-back-button>
   <span>{{ t('transactionDetails') }}</span>
 </mat-toolbar>
 <div *transloco="let t" class="page-content">

src/app/features/home/activities/network-action-order-details/network-action-order-details.page.html

@@ -1,7 +1,5 @@
 <mat-toolbar *transloco="let t">
-  <button routerLink=".." routerDirection="back" mat-icon-button>
-    <mat-icon>arrow_back</mat-icon>
-  </button>
+  <app-capture-back-button></app-capture-back-button>
   <span>{{ t('networkActionOrderDetails') }}</span>
 </mat-toolbar>
 

src/app/features/home/capture-tab/capture-tab.component.ts

@@ -1,4 +1,5 @@
 import { formatDate, KeyValue } from '@angular/common';
+import { HttpErrorResponse } from '@angular/common/http';
 import { Component } from '@angular/core';
 import { AlertController } from '@ionic/angular';
 import { TranslocoService } from '@ngneat/transloco';
@@ -136,13 +137,25 @@ export class CaptureTabComponent {
   private updateUsername(username: string) {
     const action$ = this.diaBackendAuthService
       .updateUser$({ username })
-      .pipe(catchError((err: unknown) => this.errorService.toastError$(err)));
+      .pipe(catchError((err: unknown) => this.handleUpdateUsernameError$(err)));
     return this.blockingActionService
       .run$(action$)
       .pipe(untilDestroyed(this))
       .subscribe();
   }
 
+  private handleUpdateUsernameError$(err: unknown) {
+    if (err instanceof HttpErrorResponse) {
+      const errorType = err.error.error?.type;
+      if (errorType === 'duplicate_username') {
+        return this.errorService.toastError$(
+          this.translocoService.translate(`error.diaBackend.${errorType}`)
+        );
+      }
+    }
+    return this.errorService.toastError$(err);
+  }
+
   // eslint-disable-next-line class-methods-use-this
   keyDescendingOrder(
     a: KeyValue<string, Proof[]>,

src/app/features/home/custom-camera/custom-camera.page.html

@@ -100,9 +100,7 @@
           </div>
         </div>
         <div class="footer-camera-buttons">
-          <mat-icon class="temporarily-hidden" id="gallery-icon">
-            video_collection
-          </mat-icon>
+          <mat-icon (click)="pickImage()"> imagesmode </mat-icon>
 
           <circle-progress
             (click)="onPress()"

src/app/features/home/custom-camera/custom-camera.page.scss

@@ -155,10 +155,6 @@ mat-icon.close-camera-button {
   right: 16px;
 }
 
-mat-icon.temporarily-hidden {
-  visibility: hidden;
-}
-
 // mat-icon
 .select-from-go-pro-camera-button {
   position: absolute;