Skip to content

Commit 139e4f5

Browse files
sultanmyrzasultanmyrza
authored
Merge pull request #2972 from numbersprotocol/milestone-v230725
Milestone v230725
2 parents 5cdb5f0 + 3ebde6a commit 139e4f5

File tree

19 files changed

+373
-252
lines changed

19 files changed

+373
-252
lines changed

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools">
34

45
<!-- Permissions -->
56

@@ -41,6 +42,9 @@
4142
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
4243
<!-- For in-app purchases -->
4344
<uses-permission android:name="com.android.vending.BILLING" />
45+
<!-- https://dev.appsflyer.com/hc/docs/install-android-sdk#revoking-the-ad_id-permission -->
46+
<uses-permission android:name="com.google.android.gms.permission.AD_ID"
47+
tools:node="remove"/>
4448

4549

4650
<queries>

‎ios/App/App.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@
372372
DEVELOPMENT_TEAM = G7NB5YCKAP;
373373
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP;
374374
INFOPLIST_FILE = App/Info.plist;
375-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
375+
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
376376
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
377377
MARKETING_VERSION = 0.82.4;
378378
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
@@ -399,7 +399,7 @@
399399
DEVELOPMENT_TEAM = G7NB5YCKAP;
400400
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = G7NB5YCKAP;
401401
INFOPLIST_FILE = App/Info.plist;
402-
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
402+
IPHONEOS_DEPLOYMENT_TARGET = 15.6;
403403
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
404404
MARKETING_VERSION = 0.82.4;
405405
PRODUCT_BUNDLE_IDENTIFIER = io.numbersprotocol.capturelite;

‎ios/App/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ PODS:
1818
- Capacitor
1919
- CapacitorClipboard (5.0.4):
2020
- Capacitor
21-
- CapacitorCommunityAdvertisingId (1.0.0):
21+
- CapacitorCommunityAdvertisingId (5.0.0):
2222
- Capacitor
2323
- CapacitorCommunityBluetoothLe (2.2.3):
2424
- Capacitor
@@ -223,7 +223,7 @@ SPEC CHECKSUMS:
223223
CapacitorBrowser: 2688852d02f1e89560a31b70521c71a5e7348860
224224
CapacitorCamera: 9b5c8e809c1042f263994f97ba846aa37e974f12
225225
CapacitorClipboard: 46f3959735fa0d96b9989dafcc4aed52e624d163
226-
CapacitorCommunityAdvertisingId: ffbeee30080f0057f7af6e465a7552b68a3d3fdf
226+
CapacitorCommunityAdvertisingId: 41543d8212fb12b6913b798bf1442c2a6bc1ae91
227227
CapacitorCommunityBluetoothLe: 7de4f21022a05b15195abfb002872884d00715fc
228228
CapacitorCommunityHttp: 7be90668527ef14ee10d08135b0e00fac9cf8247
229229
CapacitorCommunityWifi: 47188c74f2c6bcaefb619380863be8c67b1917c8

‎package-lock.json‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"@angular/router": "^14.2.0",
3232
"@awesome-cordova-plugins/core": "^5.46.0",
3333
"@awesome-cordova-plugins/in-app-purchase-2": "^5.43.0",
34-
"@capacitor-community/advertising-id": "^1.0.0",
34+
"@capacitor-community/advertising-id": "^5.0.0",
3535
"@capacitor-community/bluetooth-le": "^2.2.3",
3636
"@capacitor-community/http": "github:numbersprotocol/http#fix-catch-disabled-Local-Network-case-on-iOS",
3737
"@capacitor-community/wifi": "github:numbersprotocol/community-capacitor-wifi#capacitor3",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
[text]="t('userGuide.viewNetworkActionsHistory')"
2323
>
2424
<ion-label>
25-
{{ t('networkActions') }}
25+
{{ t('orders') }}
2626
</ion-label>
2727
</ion-segment-button>
2828
</ion-segment>

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,11 @@ mat-toolbar {
33
padding-right: 40px;
44
}
55
}
6+
7+
ion-segment {
8+
display: flex;
9+
10+
ion-segment-button {
11+
flex: 1;
12+
}
13+
}

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

Lines changed: 15 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,16 @@
1-
<mat-toolbar *transloco="let t">
2-
<app-capture-back-button></app-capture-back-button>
3-
<span>{{ t('networkActionOrderDetails') }}</span>
4-
</mat-toolbar>
1+
<ng-container *ngIf="isOffline$ | ngrxPush; else onlineTemplate">
2+
<mat-toolbar *transloco="let t">
3+
<app-capture-back-button></app-capture-back-button>
4+
<span>{{ t('networkActionOrderDetails') }}</span>
5+
</mat-toolbar>
6+
</ng-container>
57

6-
<ion-content *ngrxLet="order$ as order">
7-
<div *transloco="let t">
8-
<h4 class="datetime">
9-
{{ order['Created Date'] | date: 'short' }}
10-
</h4>
11-
<ion-card>
12-
<ion-grid>
13-
<ion-row>
14-
<img
15-
decoding="async"
16-
loading="lazy"
17-
[src]="
18-
(order.assetThumbnailUrl$ | ngrxPush) ||
19-
'/assets/images/image-placeholder.png'
20-
"
21-
/>
22-
</ion-row>
23-
24-
<ion-row>
25-
<ion-col size="12">
26-
<h4 id="network-action-name">{{ order.network_app_name_text }}</h4>
27-
</ion-col>
28-
</ion-row>
29-
<ion-row id="order-id-row" class="detail-info-rows">
30-
<ion-col size="3.5">
31-
<ion-label>{{ t('order') + ' ID' }}:</ion-label>
32-
</ion-col>
33-
<ion-col class="wrap-text" align="end">
34-
<ion-label>{{ order.order_id_text }} </ion-label>
35-
</ion-col>
36-
<ion-col size="1" align="end">
37-
<ion-icon
38-
size="small"
39-
name="copy-outline"
40-
(click)="copyToClipboard(order.order_id_text)"
41-
></ion-icon>
42-
</ion-col>
43-
</ion-row>
44-
45-
<ion-row class="detail-info-rows">
46-
<ion-col size="3.5">
47-
<ion-label>{{ t('resultUrl') }}:</ion-label>
48-
</ion-col>
49-
<ion-col class="wrap-text" align="end">
50-
<ion-label
51-
*ngIf="order.result_url_text !== undefined"
52-
(click)="openResultUrl(order.result_url_text)"
53-
>
54-
<a> {{ order.result_url_text }} </a>
55-
</ion-label>
56-
57-
<ion-label
58-
*ngIf="order.result_url_text === undefined"
59-
(click)="openResultUrl(resultUrlFromAssetId(order.asset_id_text))"
60-
>
61-
<a> {{ resultUrlFromAssetId(order.asset_id_text) }} </a>
62-
</ion-label>
63-
</ion-col>
64-
<ion-col size="1"> </ion-col>
65-
</ion-row>
66-
67-
<ion-row class="detail-info-rows">
68-
<ion-col size="3.5">
69-
<ion-label>{{ t('payment.price') }}:</ion-label>
70-
</ion-col>
71-
<ion-col align="end">
72-
<ion-label
73-
>{{ order.price_number | number: '1.4-4' }}
74-
{{ order.cost_token_ticker_text || 'NUM' }}</ion-label
75-
>
76-
</ion-col>
77-
<ion-col size="1"></ion-col>
78-
</ion-row>
79-
<ion-row class="detail-info-rows">
80-
<ion-col size="3.5">
81-
<ion-label>{{ t('payment.fee') }}:</ion-label>
82-
</ion-col>
83-
<ion-col align="end">
84-
<ion-label
85-
>{{ order.gas_fee_number | number: '1.4-4' }}
86-
{{ order.cost_token_ticker_text || 'NUM' }}</ion-label
87-
>
88-
</ion-col>
89-
<ion-col size="1"></ion-col>
90-
</ion-row>
91-
<ion-row class="detail-info-rows">
92-
<ion-col size="3.5">
93-
<ion-label>{{ t('payment.totalCost') }}:</ion-label>
94-
</ion-col>
95-
<ion-col align="end">
96-
<ion-label
97-
>{{ order.total_cost_number | number: '1.4-4' }}
98-
{{ order.cost_token_ticker_text || 'NUM' }}</ion-label
99-
>
100-
</ion-col>
101-
<ion-col size="1"></ion-col>
102-
</ion-row>
103-
104-
<ion-row>
105-
<ion-col id="status-col">
106-
<button
107-
[class]="order.status_text"
108-
mat-stroked-button
109-
disableRipple
110-
>
111-
{{ t('networkActionOrderState.' + order.status_text) }}
112-
</button>
113-
</ion-col>
114-
</ion-row>
115-
</ion-grid>
116-
</ion-card>
117-
</div>
118-
</ion-content>
8+
<ng-template #onlineTemplate>
9+
<ng-container *ngIf="iframeUrl$ | ngrxPush as iframeUrl">
10+
<iframe [src]="iframeUrl | safeResourceUrl"> </iframe>
11+
</ng-container>
12+
<ion-spinner
13+
*ngIf="(iframeLoaded$ | async) !== true"
14+
name="lines-sharp"
15+
></ion-spinner>
16+
</ng-template>

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,35 @@
11
mat-toolbar {
22
span {
33
padding-right: 40px;
4+
font-style: normal;
5+
font-weight: 500;
6+
font-size: 16px;
7+
line-height: 21px;
8+
text-align: center;
9+
color: white;
410
}
511
}
612

13+
.no-network-text {
14+
font-size: 18px;
15+
margin: auto;
16+
}
17+
18+
iframe {
19+
background-color: black;
20+
width: 100vw;
21+
height: 100vh;
22+
border: 0;
23+
}
24+
25+
ion-spinner {
26+
position: absolute;
27+
left: 50%;
28+
top: 50%;
29+
transform: translate(-50%, -50%);
30+
scale: 1.5;
31+
}
32+
733
ion-content {
834
.datetime {
935
width: 90vw;

0 commit comments

Comments
 (0)