Merge branch 'release-0.64.3'

numbersprotocol · Aug 28, 2022 · eab0446 · eab0446
2 parents 351e7db + a9cdfd0
commit eab0446
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.64.3] - 2022-08-29
+
+### Changed
+
+1. Update asset_page URL params (#1989)
+2. Make iframe URL configurable (#1979)
+
+### Fixed
+
+1. Put user email at center in the capture tab (#1969)
+
 ## [0.64.2] - 2022-08-25
 
 ### Fixed
@@ -1772,7 +1783,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.64.2...HEAD
+[unreleased]: https://github.com/numbersprotocol/capture-lite/compare/0.64.3...HEAD
+[0.64.3]: https://github.com/numbersprotocol/capture-lite/compare/0.64.2...0.64.3
 [0.64.2]: https://github.com/numbersprotocol/capture-lite/compare/0.64.1...0.64.2
 [0.64.1]: https://github.com/numbersprotocol/capture-lite/compare/0.64.0...0.64.1
 [0.64.0]: https://github.com/numbersprotocol/capture-lite/compare/0.63.2...0.64.0

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "io.numbersprotocol.capturelite"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 439
-        versionName "0.64.2"
+        versionCode 440
+        versionName "0.64.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildFeatures {

diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj
@@ -369,7 +369,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.64.2;
+				MARKETING_VERSION = 0.64.3;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -394,7 +394,7 @@
 				INFOPLIST_FILE = App/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.64.2;
+				MARKETING_VERSION = 0.64.3;
 				PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = NumbersAppDistributionV2;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "capture-lite",
-  "version": "0.64.2",
+  "version": "0.64.3",
   "author": "numbersprotocol",
   "homepage": "https://numbersprotocol.io/",
   "scripts": {

diff --git a/set-secret.js b/set-secret.js
@@ -8,6 +8,7 @@ const envConfigFile = `
 export const BASE_URL = '${process.env.NUMBERS_STORAGE_BASE_URL}';
 export const TRUSTED_CLIENT_KEY = '${process.env.NUMBERS_STORAGE_TRUSTED_CLIENT_KEY}';
 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}'
 `;

diff --git a/src/app/features/home/capture-tab/capture-tab.component.scss b/src/app/features/home/capture-tab/capture-tab.component.scss
@@ -22,6 +22,7 @@ mat-card-title {
 
 mat-card-subtitle {
   margin-top: 12px !important; /* stylelint-disable-line declaration-no-important */
+  text-align: center;
 }
 
 .user-card {

diff --git a/src/app/features/home/details/details.page.ts b/src/app/features/home/details/details.page.ts
@@ -29,6 +29,7 @@ import { ConfirmAlert } from '../../../shared/confirm-alert/confirm-alert.servic
 import { ContactSelectionDialogComponent } from '../../../shared/contact-selection-dialog/contact-selection-dialog.component';
 import { DiaBackendAssetRepository } from '../../../shared/dia-backend/asset/dia-backend-asset-repository.service';
 import { DiaBackendAuthService } from '../../../shared/dia-backend/auth/dia-backend-auth.service';
+import { BUBBLE_IFRAME_URL } from '../../../shared/dia-backend/secret';
 import { DiaBackendWorkflowService } from '../../../shared/dia-backend/workflow/dia-backend-workflow.service';
 import { ErrorService } from '../../../shared/error/error.service';
 import { MediaStore } from '../../../shared/media/media-store/media-store.service';
@@ -183,11 +184,8 @@ export class DetailsPage {
   readonly iframeUrl$ = this.activeDetailedCapture$.pipe(
     distinctUntilChanged(),
     map(detailedCapture => {
-      const host = 'https://captureappiframe.bubbleapps.io';
-      const path = '';
-      const params = `pid=${detailedCapture.id}&iframeLoadedFrom=CaptureApp`;
-      // const params = `pid=288036ab-5768-4270-988b-a85d7bd11eb3&iframeLoadedFrom=CaptureApp`;
-      const url = `${host}/${path}?${params}`;
+      const params = `nid=${detailedCapture.id}&from=mycapture`;
+      const url = `${BUBBLE_IFRAME_URL}/?${params}`;
       return this.sanitizer.bypassSecurityTrustResourceUrl(url);
     })
   );
@@ -209,10 +207,8 @@ export class DetailsPage {
     distinctUntilChanged(),
     map(([detailedCapture]) => {
       const token = this.userToken;
-      const host = 'https://captureappiframe.bubbleapps.io';
-      const path = 'version-qa-release/asset_page';
-      const params = `pid=${detailedCapture.id}&token=${token}&iframeLoadedFrom=CaptureApp`;
-      const url = `${host}/${path}?${params}`;
+      const params = `nid=${detailedCapture.id}&token=${token}&from=mycapture`;
+      const url = `${BUBBLE_IFRAME_URL}/asset_page?${params}`;
       return this.sanitizer.bypassSecurityTrustResourceUrl(url);
     })
   );
@@ -257,7 +253,7 @@ export class DetailsPage {
 
   iframeUrlFor(detailedCapture: any) {
     return this.sanitizer.bypassSecurityTrustResourceUrl(
-      `https://captureappiframe.bubbleapps.io/asset_page?pid=${detailedCapture.id}`
+      `${BUBBLE_IFRAME_URL}/asset_page?nid=${detailedCapture.id}`
     );
   }
 

diff --git a/src/app/features/home/explore-tab/explore-tab/explore-tab.component.ts b/src/app/features/home/explore-tab/explore-tab/explore-tab.component.ts
@@ -2,6 +2,7 @@ import { Component } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 import { map } from 'rxjs/operators';
 import { DiaBackendAuthService } from '../../../../shared/dia-backend/auth/dia-backend-auth.service';
+import { BUBBLE_IFRAME_URL } from '../../../../shared/dia-backend/secret';
 import { ErrorService } from '../../../../shared/error/error.service';
 import { NetworkService } from '../../../../shared/network/network.service';
 import { isNonNullable } from '../../../../utils/rx-operators/rx-operators';
@@ -15,7 +16,7 @@ export class ExploreTabComponent {
   readonly bubbleIframeUrl$ = this.diaBackendAuthService.token$.pipe(
     isNonNullable(),
     map(token => {
-      return `https://captureappiframe.numbersprotocol.io/version-qa-release/?token=${token}`;
+      return `${BUBBLE_IFRAME_URL}/?token=${token}`;
     })
   );