Milestone v230725

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Permissions -->
 
@@ -41,6 +42,9 @@
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <!-- For in-app purchases -->
     <uses-permission android:name="com.android.vending.BILLING" />
+    <!-- https://dev.appsflyer.com/hc/docs/install-android-sdk#revoking-the-ad_id-permission -->
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"
+        tools:node="remove"/>
 
 
     <queries>

ios/App/App.xcodeproj/project.pbxproj

@@ -372,7 +372,7 @@
 				DEVELOPMENT_TEAM = G7NB5YCKAP;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP;
 				INFOPLIST_FILE = App/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MARKETING_VERSION = 0.82.4;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
@@ -399,7 +399,7 @@
 				DEVELOPMENT_TEAM = G7NB5YCKAP;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP;
 				INFOPLIST_FILE = App/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MARKETING_VERSION = 0.82.4;
 				PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;

ios/App/Podfile.lock

@@ -18,7 +18,7 @@ PODS:
     - Capacitor
   - CapacitorClipboard (5.0.4):
     - Capacitor
-  - CapacitorCommunityAdvertisingId (1.0.0):
+  - CapacitorCommunityAdvertisingId (5.0.0):
     - Capacitor
   - CapacitorCommunityBluetoothLe (2.2.3):
     - Capacitor
@@ -223,7 +223,7 @@ SPEC CHECKSUMS:
   CapacitorBrowser: 2688852d02f1e89560a31b70521c71a5e7348860
   CapacitorCamera: 9b5c8e809c1042f263994f97ba846aa37e974f12
   CapacitorClipboard: 46f3959735fa0d96b9989dafcc4aed52e624d163
-  CapacitorCommunityAdvertisingId: ffbeee30080f0057f7af6e465a7552b68a3d3fdf
+  CapacitorCommunityAdvertisingId: 41543d8212fb12b6913b798bf1442c2a6bc1ae91
   CapacitorCommunityBluetoothLe: 7de4f21022a05b15195abfb002872884d00715fc
   CapacitorCommunityHttp: 7be90668527ef14ee10d08135b0e00fac9cf8247
   CapacitorCommunityWifi: 47188c74f2c6bcaefb619380863be8c67b1917c8

package.json

@@ -31,7 +31,7 @@
     "@angular/router": "^14.2.0",
     "@awesome-cordova-plugins/core": "^5.46.0",
     "@awesome-cordova-plugins/in-app-purchase-2": "^5.43.0",
-    "@capacitor-community/advertising-id": "^1.0.0",
+    "@capacitor-community/advertising-id": "^5.0.0",
     "@capacitor-community/bluetooth-le": "^2.2.3",
     "@capacitor-community/http": "github:numbersprotocol/http#fix-catch-disabled-Local-Network-case-on-iOS",
     "@capacitor-community/wifi": "github:numbersprotocol/community-capacitor-wifi#capacitor3",

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

@@ -22,7 +22,7 @@
       [text]="t('userGuide.viewNetworkActionsHistory')"
     >
       <ion-label>
-        {{ t('networkActions') }}
+        {{ t('orders') }}
       </ion-label>
     </ion-segment-button>
   </ion-segment>

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

@@ -3,3 +3,11 @@ mat-toolbar {
     padding-right: 40px;
   }
 }
+
+ion-segment {
+  display: flex;
+
+  ion-segment-button {
+    flex: 1;
+  }
+}

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

@@ -1,118 +1,16 @@
-<mat-toolbar *transloco="let t">
-  <app-capture-back-button></app-capture-back-button>
-  <span>{{ t('networkActionOrderDetails') }}</span>
-</mat-toolbar>
+<ng-container *ngIf="isOffline$ | ngrxPush; else onlineTemplate">
+  <mat-toolbar *transloco="let t">
+    <app-capture-back-button></app-capture-back-button>
+    <span>{{ t('networkActionOrderDetails') }}</span>
+  </mat-toolbar>
+</ng-container>
 
-<ion-content *ngrxLet="order$ as order">
-  <div *transloco="let t">
-    <h4 class="datetime">
-      {{ order['Created Date'] | date: 'short' }}
-    </h4>
-    <ion-card>
-      <ion-grid>
-        <ion-row>
-          <img
-            decoding="async"
-            loading="lazy"
-            [src]="
-              (order.assetThumbnailUrl$ | ngrxPush) ||
-              '/assets/images/image-placeholder.png'
-            "
-          />
-        </ion-row>
-
-        <ion-row>
-          <ion-col size="12">
-            <h4 id="network-action-name">{{ order.network_app_name_text }}</h4>
-          </ion-col>
-        </ion-row>
-        <ion-row id="order-id-row" class="detail-info-rows">
-          <ion-col size="3.5">
-            <ion-label>{{ t('order') + ' ID' }}:</ion-label>
-          </ion-col>
-          <ion-col class="wrap-text" align="end">
-            <ion-label>{{ order.order_id_text }} </ion-label>
-          </ion-col>
-          <ion-col size="1" align="end">
-            <ion-icon
-              size="small"
-              name="copy-outline"
-              (click)="copyToClipboard(order.order_id_text)"
-            ></ion-icon>
-          </ion-col>
-        </ion-row>
-
-        <ion-row class="detail-info-rows">
-          <ion-col size="3.5">
-            <ion-label>{{ t('resultUrl') }}:</ion-label>
-          </ion-col>
-          <ion-col class="wrap-text" align="end">
-            <ion-label
-              *ngIf="order.result_url_text !== undefined"
-              (click)="openResultUrl(order.result_url_text)"
-            >
-              <a> {{ order.result_url_text }} </a>
-            </ion-label>
-
-            <ion-label
-              *ngIf="order.result_url_text === undefined"
-              (click)="openResultUrl(resultUrlFromAssetId(order.asset_id_text))"
-            >
-              <a> {{ resultUrlFromAssetId(order.asset_id_text) }} </a>
-            </ion-label>
-          </ion-col>
-          <ion-col size="1"> </ion-col>
-        </ion-row>
-
-        <ion-row class="detail-info-rows">
-          <ion-col size="3.5">
-            <ion-label>{{ t('payment.price') }}:</ion-label>
-          </ion-col>
-          <ion-col align="end">
-            <ion-label
-              >{{ order.price_number | number: '1.4-4' }}
-              {{ order.cost_token_ticker_text || 'NUM' }}</ion-label
-            >
-          </ion-col>
-          <ion-col size="1"></ion-col>
-        </ion-row>
-        <ion-row class="detail-info-rows">
-          <ion-col size="3.5">
-            <ion-label>{{ t('payment.fee') }}:</ion-label>
-          </ion-col>
-          <ion-col align="end">
-            <ion-label
-              >{{ order.gas_fee_number | number: '1.4-4' }}
-              {{ order.cost_token_ticker_text || 'NUM' }}</ion-label
-            >
-          </ion-col>
-          <ion-col size="1"></ion-col>
-        </ion-row>
-        <ion-row class="detail-info-rows">
-          <ion-col size="3.5">
-            <ion-label>{{ t('payment.totalCost') }}:</ion-label>
-          </ion-col>
-          <ion-col align="end">
-            <ion-label
-              >{{ order.total_cost_number | number: '1.4-4' }}
-              {{ order.cost_token_ticker_text || 'NUM' }}</ion-label
-            >
-          </ion-col>
-          <ion-col size="1"></ion-col>
-        </ion-row>
-
-        <ion-row>
-          <ion-col id="status-col">
-            <button
-              [class]="order.status_text"
-              mat-stroked-button
-              disableRipple
-            >
-              {{ t('networkActionOrderState.' + order.status_text) }}
-            </button>
-          </ion-col>
-        </ion-row>
-      </ion-grid>
-    </ion-card>
-  </div>
-</ion-content>
+<ng-template #onlineTemplate>
+  <ng-container *ngIf="iframeUrl$ | ngrxPush as iframeUrl">
+    <iframe [src]="iframeUrl | safeResourceUrl"> </iframe>
+  </ng-container>
+  <ion-spinner
+    *ngIf="(iframeLoaded$ | async) !== true"
+    name="lines-sharp"
+  ></ion-spinner>
+</ng-template>

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

@@ -1,9 +1,35 @@
 mat-toolbar {
   span {
     padding-right: 40px;
+    font-style: normal;
+    font-weight: 500;
+    font-size: 16px;
+    line-height: 21px;
+    text-align: center;
+    color: white;
   }
 }
 
+.no-network-text {
+  font-size: 18px;
+  margin: auto;
+}
+
+iframe {
+  background-color: black;
+  width: 100vw;
+  height: 100vh;
+  border: 0;
+}
+
+ion-spinner {
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  scale: 1.5;
+}
+
 ion-content {
   .datetime {
     width: 90vw;