Skip to content

Commit c5fd686

Browse files
coodoscoodos
committed
chore: fix sync
1 parent 57e9598 commit c5fd686

File tree

6 files changed

+63
-66
lines changed

6 files changed

+63
-66
lines changed

‎infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/project.pbxproj‎

Lines changed: 35 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 56;
6+
objectVersion = 63;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -32,7 +32,9 @@
3232
6694E9EC8CE5328251C3F669 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
3333
673F0CB787E12AAB4660FE44 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
3434
6DACB922029A0F360BDBD599 /* eid-wallet_iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "eid-wallet_iOS.entitlements"; sourceTree = "<group>"; };
35-
754F6FBE80C64C6326B8E0D5 /* eid-wallet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "eid-wallet.app"; sourceTree = BUILT_PRODUCTS_DIR; };
35+
754F6FBE80C64C6326B8E0D5 /* eID Wallet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "eID Wallet.app"; sourceTree = BUILT_PRODUCTS_DIR; };
36+
9AEEDA12A7D9D6BF575FC67A /* errors.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = errors.rs; sourceTree = "<group>"; };
37+
ADFAC2203FBFFDFF207BC8FE /* mod.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = mod.rs; sourceTree = "<group>"; };
3638
C636AF063138DEFB3E6A6052 /* assets */ = {isa = PBXFileReference; lastKnownFileType = folder; path = assets; sourceTree = SOURCE_ROOT; };
3739
D515D2306077569F964CC0DF /* main.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
3840
DC24C9E28ECAF90D40C14313 /* lib.rs */ = {isa = PBXFileReference; lastKnownFileType = text; path = lib.rs; sourceTree = "<group>"; };
@@ -64,11 +66,19 @@
6466
0D0DAFCCB1F1630FE5DF02CB /* Products */ = {
6567
isa = PBXGroup;
6668
children = (
67-
754F6FBE80C64C6326B8E0D5 /* eid-wallet.app */,
69+
754F6FBE80C64C6326B8E0D5 /* eID Wallet.app */,
6870
);
6971
name = Products;
7072
sourceTree = "<group>";
7173
};
74+
1D4383173E1210A2E9FDFF04 /* funcs */ = {
75+
isa = PBXGroup;
76+
children = (
77+
ADFAC2203FBFFDFF207BC8FE /* mod.rs */,
78+
);
79+
path = funcs;
80+
sourceTree = "<group>";
81+
};
7282
1E772D6A351CCE2327B74186 /* eid-wallet_iOS */ = {
7383
isa = PBXGroup;
7484
children = (
@@ -96,8 +106,10 @@
96106
61D5698478D645257706C604 /* src */ = {
97107
isa = PBXGroup;
98108
children = (
109+
9AEEDA12A7D9D6BF575FC67A /* errors.rs */,
99110
DC24C9E28ECAF90D40C14313 /* lib.rs */,
100111
40ABD3C35AA06E16DA39304E /* main.rs */,
112+
1D4383173E1210A2E9FDFF04 /* funcs */,
101113
);
102114
name = src;
103115
path = ../../src;
@@ -167,8 +179,10 @@
167179
dependencies = (
168180
);
169181
name = "eid-wallet_iOS";
182+
packageProductDependencies = (
183+
);
170184
productName = "eid-wallet_iOS";
171-
productReference = 754F6FBE80C64C6326B8E0D5 /* eid-wallet.app */;
185+
productReference = 754F6FBE80C64C6326B8E0D5 /* eID Wallet.app */;
172186
productType = "com.apple.product-type.application";
173187
};
174188
/* End PBXNativeTarget section */
@@ -189,6 +203,7 @@
189203
en,
190204
);
191205
mainGroup = 234EEFFEA1E82BEEC00B358A;
206+
minimizedProjectReferenceProxies = 1;
192207
projectDirPath = "";
193208
projectRoot = "";
194209
targets = (
@@ -227,11 +242,10 @@
227242
outputPaths = (
228243
"$(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libapp.a",
229244
"$(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a",
230-
"$(SRCROOT)/Externals/arm64-sim/${CONFIGURATION}/libapp.a",
231245
);
232246
runOnlyForDeploymentPostprocessing = 0;
233247
shellPath = /bin/sh;
234-
shellScript = "pnpm tauri ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths \"${FRAMEWORK_SEARCH_PATHS:?}\" --header-search-paths \"${HEADER_SEARCH_PATHS:?}\" --gcc-preprocessor-definitions \"${GCC_PREPROCESSOR_DEFINITIONS:-}\" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}";
248+
shellScript = "[ -s \"$NVM_DIR/nvm.sh\" ] && \\. \"$NVM_DIR/nvm.sh\"\npnpm tauri ios xcode-script -v --platform ${PLATFORM_DISPLAY_NAME:?} --sdk-root ${SDKROOT:?} --framework-search-paths \"${FRAMEWORK_SEARCH_PATHS:?}\" --header-search-paths \"${HEADER_SEARCH_PATHS:?}\" --gcc-preprocessor-definitions \"${GCC_PREPROCESSOR_DEFINITIONS:-}\" --configuration ${CONFIGURATION:?} ${FORCE_COLOR} ${ARCHS:?}\n";
235249
};
236250
/* End PBXShellScriptBuildPhase section */
237251

@@ -370,17 +384,14 @@
370384
isa = XCBuildConfiguration;
371385
buildSettings = {
372386
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
373-
ARCHS = (
374-
arm64,
375-
"arm64-sim",
376-
);
387+
ARCHS = arm64;
377388
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
378389
CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
379390
CODE_SIGN_IDENTITY = "iPhone Developer";
391+
CURRENT_PROJECT_VERSION = 0.1.0.0;
380392
DEVELOPMENT_TEAM = 3FS4B734X5;
381393
ENABLE_BITCODE = NO;
382-
"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
383-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
394+
"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
384395
FRAMEWORK_SEARCH_PATHS = (
385396
"$(inherited)",
386397
"\".\"",
@@ -390,13 +401,6 @@
390401
"$(inherited)",
391402
"@executable_path/Frameworks",
392403
);
393-
"LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = (
394-
"$(inherited)",
395-
"$(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION)",
396-
"$(SDKROOT)/usr/lib/swift",
397-
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
398-
"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
399-
);
400404
"LIBRARY_SEARCH_PATHS[arch=arm64]" = (
401405
"$(inherited)",
402406
"$(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION)",
@@ -411,29 +415,27 @@
411415
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
412416
"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
413417
);
414-
PRODUCT_BUNDLE_IDENTIFIER = com.eid-wallet.app-1;
415-
PRODUCT_NAME = "eid-wallet";
418+
MARKETING_VERSION = 0.1.0;
419+
PRODUCT_BUNDLE_IDENTIFIER = "io.tanglelabs.metastate.eid-wallet-app";
420+
PRODUCT_NAME = "eID Wallet";
416421
SDKROOT = iphoneos;
417422
TARGETED_DEVICE_FAMILY = "1,2";
418-
VALID_ARCHS = "arm64 arm64-sim";
423+
VALID_ARCHS = arm64;
419424
};
420425
name = release;
421426
};
422427
FB09AAA6FA8DA19CE414A277 /* debug */ = {
423428
isa = XCBuildConfiguration;
424429
buildSettings = {
425430
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
426-
ARCHS = (
427-
arm64,
428-
"arm64-sim",
429-
);
431+
ARCHS = arm64;
430432
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
431433
CODE_SIGN_ENTITLEMENTS = "eid-wallet_iOS/eid-wallet_iOS.entitlements";
432434
CODE_SIGN_IDENTITY = "iPhone Developer";
433-
DEVELOPMENT_TEAM = 3FS4B734X5;
435+
CURRENT_PROJECT_VERSION = 0.1.0.0;
436+
DEVELOPMENT_TEAM = HZ7MLR7Q46;
434437
ENABLE_BITCODE = NO;
435-
"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
436-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
438+
"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
437439
FRAMEWORK_SEARCH_PATHS = (
438440
"$(inherited)",
439441
"\".\"",
@@ -443,13 +445,6 @@
443445
"$(inherited)",
444446
"@executable_path/Frameworks",
445447
);
446-
"LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = (
447-
"$(inherited)",
448-
"$(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION)",
449-
"$(SDKROOT)/usr/lib/swift",
450-
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
451-
"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
452-
);
453448
"LIBRARY_SEARCH_PATHS[arch=arm64]" = (
454449
"$(inherited)",
455450
"$(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION)",
@@ -464,11 +459,12 @@
464459
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
465460
"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
466461
);
467-
PRODUCT_BUNDLE_IDENTIFIER = com.eid-wallet.app-1;
468-
PRODUCT_NAME = "eid-wallet";
462+
MARKETING_VERSION = 0.1.0;
463+
PRODUCT_BUNDLE_IDENTIFIER = "io.tanglelabs.metastate.eid-wallet";
464+
PRODUCT_NAME = "eID Wallet";
469465
SDKROOT = iphoneos;
470466
TARGETED_DEVICE_FAMILY = "1,2";
471-
VALID_ARCHS = "arm64 arm64-sim";
467+
VALID_ARCHS = arm64;
472468
};
473469
name = debug;
474470
};

‎infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet.xcodeproj/xcshareddata/xcschemes/eid-wallet_iOS.xcscheme‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "6595F7B25D907151021EDDEB"
18-
BuildableName = "eid-wallet.app"
18+
BuildableName = "eID Wallet.app"
1919
BlueprintName = "eid-wallet_iOS"
2020
ReferencedContainer = "container:eid-wallet.xcodeproj">
2121
</BuildableReference>
@@ -31,7 +31,7 @@
3131
<BuildableReference
3232
BuildableIdentifier = "primary"
3333
BlueprintIdentifier = "6595F7B25D907151021EDDEB"
34-
BuildableName = "eid-wallet.app"
34+
BuildableName = "eID Wallet.app"
3535
BlueprintName = "eid-wallet_iOS"
3636
ReferencedContainer = "container:eid-wallet.xcodeproj">
3737
</BuildableReference>
@@ -66,7 +66,7 @@
6666
<BuildableReference
6767
BuildableIdentifier = "primary"
6868
BlueprintIdentifier = "6595F7B25D907151021EDDEB"
69-
BuildableName = "eid-wallet.app"
69+
BuildableName = "eID Wallet.app"
7070
BlueprintName = "eid-wallet_iOS"
7171
ReferencedContainer = "container:eid-wallet.xcodeproj">
7272
</BuildableReference>
@@ -95,7 +95,7 @@
9595
<BuildableReference
9696
BuildableIdentifier = "primary"
9797
BlueprintIdentifier = "6595F7B25D907151021EDDEB"
98-
BuildableName = "eid-wallet.app"
98+
BuildableName = "eID Wallet.app"
9999
BlueprintName = "eid-wallet_iOS"
100100
ReferencedContainer = "container:eid-wallet.xcodeproj">
101101
</BuildableReference>

‎infrastructure/eid-wallet/src-tauri/gen/apple/eid-wallet_iOS/Info.plist‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
<string>0.1.0</string>
2121
<key>LSRequiresIPhoneOS</key>
2222
<true/>
23+
<key>NSCameraUsageDescription</key>
24+
<string>Read QR codes</string>
25+
<key>NSFaceIDUsageDescription</key>
26+
<string>Authenticate with biometric</string>
2327
<key>UILaunchStoryboardName</key>
2428
<string>LaunchScreen</string>
2529
<key>UIRequiredDeviceCapabilities</key>
@@ -40,9 +44,5 @@
4044
<string>UIInterfaceOrientationLandscapeLeft</string>
4145
<string>UIInterfaceOrientationLandscapeRight</string>
4246
</array>
43-
<key>NSFaceIDUsageDescription</key>
44-
<string>Authenticate with biometric</string>
45-
<key>NSCameraUsageDescription</key>
46-
<string>Read QR codes</string>
4747
</dict>
48-
</plist>
48+
</plist>

‎infrastructure/eid-wallet/src-tauri/gen/apple/project.yml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: eid-wallet
22
options:
3-
bundleIdPrefix: com.eid-wallet.app
3+
bundleIdPrefix: io.tanglelabs.metastate.eid-wallet
44
deploymentTarget:
55
iOS: 13.0
66
fileGroups: [../../src]
@@ -10,8 +10,9 @@ configs:
1010
settingGroups:
1111
app:
1212
base:
13-
PRODUCT_NAME: eid-wallet
14-
PRODUCT_BUNDLE_IDENTIFIER: com.eid-wallet.app
13+
PRODUCT_NAME: eID Wallet
14+
PRODUCT_BUNDLE_IDENTIFIER: io.tanglelabs.metastate.eid-wallet
15+
DEVELOPMENT_TEAM: HZ7MLR7Q46
1516
targetTemplates:
1617
app:
1718
type: application
@@ -62,14 +63,12 @@ targets:
6263
settings:
6364
base:
6465
ENABLE_BITCODE: false
65-
ARCHS: [arm64, arm64-sim]
66-
VALID_ARCHS: arm64 arm64-sim
66+
ARCHS: [arm64]
67+
VALID_ARCHS: arm64
6768
LIBRARY_SEARCH_PATHS[arch=x86_64]: $(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
6869
LIBRARY_SEARCH_PATHS[arch=arm64]: $(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
69-
LIBRARY_SEARCH_PATHS[arch=arm64-sim]: $(inherited) $(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
7070
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: true
71-
EXCLUDED_ARCHS[sdk=iphonesimulator*]: arm64
72-
EXCLUDED_ARCHS[sdk=iphoneos*]: arm64-sim x86_64
71+
EXCLUDED_ARCHS[sdk=iphoneos*]: x86_64
7372
groups: [app]
7473
dependencies:
7574
- framework: libapp.a
@@ -87,5 +86,4 @@ targets:
8786
basedOnDependencyAnalysis: false
8887
outputFiles:
8988
- $(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libapp.a
90-
- $(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a
91-
- $(SRCROOT)/Externals/arm64-sim/${CONFIGURATION}/libapp.a
89+
- $(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a

‎infrastructure/eid-wallet/src-tauri/tauri.conf.json‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"$schema": "https://schema.tauri.app/config/2",
3-
"productName": "eid-wallet",
3+
"productName": "eID Wallet",
44
"version": "0.1.0",
5-
"identifier": "com.eid-wallet.app-1",
5+
"identifier": "io.tanglelabs.metastate.eid-wallet",
66
"build": {
77
"beforeDevCommand": "pnpm dev",
88
"devUrl": "http://localhost:1420",
9-
"beforeBuildCommand": "pnpm build",
9+
"beforeBuildCommand": "npm run build",
1010
"frontendDist": "../build"
1111
},
1212
"app": {
@@ -33,6 +33,9 @@
3333
"icons/[email protected]",
3434
"icons/icon.icns",
3535
"icons/icon.ico"
36-
]
36+
],
37+
"iOS": {
38+
"developmentTeam": "HZ7MLR7Q46"
39+
}
3740
}
3841
}

‎platforms/blabsy-w3ds-auth-api/src/controllers/WebhookController.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export class WebhookController {
8686
const { data, schemaId, id } = req.body;
8787

8888
const mapping = Object.values(adapter.mapping).find(
89-
(m) => m.schemaId === schemaId
89+
(m) => m.schemaId === schemaId,
9090
);
9191
if (!mapping) throw new Error();
9292
const tableName = mapping.tableName + "s";
@@ -197,7 +197,7 @@ export class WebhookController {
197197

198198
private async mapTweetData(
199199
data: any,
200-
now: Timestamp
200+
now: Timestamp,
201201
): Promise<Partial<Tweet>> {
202202
let createdBy = data.createdBy;
203203
if (createdBy.includes("(") && createdBy.includes(")")) {
@@ -247,7 +247,7 @@ export class WebhookController {
247247
name: data.name,
248248
participants:
249249
data.participants.map(
250-
(p: string) => p.split("(")[1].split(")")[0]
250+
(p: string) => p.split("(")[1].split(")")[0],
251251
) || [],
252252
createdAt: data.createdAt
253253
? Timestamp.fromDate(new Date(data.createdAt))
@@ -257,7 +257,7 @@ export class WebhookController {
257257
? {
258258
...data.lastMessage,
259259
timestamp: Timestamp.fromDate(
260-
new Date(data.lastMessage.timestamp)
260+
new Date(data.lastMessage.timestamp),
261261
),
262262
}
263263
: null,

0 commit comments

Comments
 (0)