diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a82757089..118737525 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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 @@ -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 diff --git a/ios/App/App.xcodeproj/project.pbxproj b/ios/App/App.xcodeproj/project.pbxproj index 5cdf7cb2c..f24b4b72a 100644 --- a/ios/App/App.xcodeproj/project.pbxproj +++ b/ios/App/App.xcodeproj/project.pbxproj @@ -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"; @@ -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"; diff --git a/src/app/features/home/activities/network-action-order-details/network-action-order-details.page.html b/src/app/features/home/activities/network-action-order-details/network-action-order-details.page.html index af88297c0..66ee1fa3b 100644 --- a/src/app/features/home/activities/network-action-order-details/network-action-order-details.page.html +++ b/src/app/features/home/activities/network-action-order-details/network-action-order-details.page.html @@ -49,13 +49,18 @@

{{ order.network_app_name_text }}

{{ t('resultUrl') }}: - - - {{ order.result_url_text }} - - {{ - t('noResultUrlAvailable') - }} + + {{ order.result_url_text }} + + + + {{ resultUrlFromAssetId(order.asset_id_text) }} diff --git a/src/app/features/home/activities/network-action-order-details/network-action-order-details.page.ts b/src/app/features/home/activities/network-action-order-details/network-action-order-details.page.ts index 1ad68d71e..491e18e41 100644 --- a/src/app/features/home/activities/network-action-order-details/network-action-order-details.page.ts +++ b/src/app/features/home/activities/network-action-order-details/network-action-order-details.page.ts @@ -9,6 +9,7 @@ import { catchError, first, map } from 'rxjs/operators'; import { OrderHistoryService } from '../../../../shared/actions/service/order-history.service'; import { ErrorService } from '../../../../shared/error/error.service'; import { isNonNullable } from '../../../../utils/rx-operators/rx-operators'; +import { getAssetProfileForCaptureIframe } from '../../../../utils/url'; const { Browser, Clipboard } = Plugins; @UntilDestroy({ checkProperties: true }) @@ -42,13 +43,15 @@ export class NetworkActionOrderDetailsPage { // eslint-disable-next-line class-methods-use-this openResultUrl(url: string) { if (url) { - Browser.open({ - url: `${url}`, - toolbarColor: '#564dfc', - }); + Browser.open({ url, toolbarColor: '#000000' }); } } + // eslint-disable-next-line class-methods-use-this + resultUrlFromAssetId(assetId: string) { + return getAssetProfileForCaptureIframe(assetId); + } + async copyToClipboard(value: string) { await Clipboard.write({ string: value }); this.snackBar.open( diff --git a/src/app/utils/url.ts b/src/app/utils/url.ts index c58357421..05160ab83 100644 --- a/src/app/utils/url.ts +++ b/src/app/utils/url.ts @@ -1,3 +1,4 @@ +import { BUBBLE_IFRAME_URL } from '../shared/dia-backend/secret'; import { urlToDownloadApp } from './constants'; import { MimeType } from './mime-type'; @@ -19,6 +20,10 @@ export function getAssetProfileForNSE(id: string, token?: string) { return `https://nftsearch.site/asset-profile?cid=${id}`; } +export function getAssetProfileForCaptureIframe(cid: string) { + return `${BUBBLE_IFRAME_URL}/asset_page?nid=${cid}`; +} + export function getAppDownloadLink(isPlatform: (platformName: any) => boolean) { if (isPlatform('ios')) return 'https://apps.apple.com/en/app/capture-app/id1536388009';