Skip to content

Commit 970914d

Browse files
Ryanmello07Ryanmello07
committed
Merge feat/seedphrase-auth-ios (fork PR#4 fixes) into feat/seedphrase-auth-upstream
Brings ~25 real fix commits from the actively-developed fork branch into the upstream-facing PR (#331) that had drifted behind since its initial squash: JWT-refresh-on-foreground timing, stale UI after network name change, phone auth in name-claim identity check, macOS Sign-In Methods list/remove parity, several AddAuthSheet bugs (stale UI, uncancelled wallet poll, dead code), and SwiftUI type-checker splits/syntax fixes in SettingsView. Only conflict was LoginInitialView.swift: both branches had already independently landed the identical "dim disabled macOS buttons" opacity fix -- pure duplicate content differing only by a blank line, resolved by keeping one copy.
2 parents e895dff + 0a7e3b6 commit 970914d

3 files changed

Lines changed: 157 additions & 3 deletions

File tree

‎.github/workflows/beta-build.yml‎

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
name: Beta Build — iOS & macOS
2+
3+
on:
4+
push:
5+
branches:
6+
- beta/custom-server
7+
pull_request:
8+
branches:
9+
- beta/custom-server
10+
workflow_dispatch:
11+
12+
permissions:
13+
contents: write
14+
15+
env:
16+
WARP_VERSION: beta-${{ github.run_number }}
17+
18+
jobs:
19+
build-ios:
20+
name: Build unsigned iOS and macOS apps
21+
runs-on: macos-latest
22+
steps:
23+
- name: Check out iOS repo
24+
uses: actions/checkout@v4
25+
with:
26+
path: urnetwork-ios
27+
28+
- name: Check out forked SDK
29+
uses: actions/checkout@v4
30+
with:
31+
repository: Ryanmello07/urnetwork-sdk
32+
ref: beta/custom-server
33+
path: urnetwork-sdk
34+
35+
- name: Set up Go
36+
uses: actions/setup-go@v5
37+
with:
38+
go-version: stable
39+
40+
- name: Check out connect dependency
41+
run: git clone --depth 1 --branch beta/custom-server https://github.com/Ryanmello07/connect.git connect
42+
43+
- name: Check out glog dependency
44+
run: git clone --depth 1 https://github.com/urnetwork/glog.git glog
45+
46+
- name: Build SDK for iOS
47+
working-directory: urnetwork-sdk/build
48+
env:
49+
BRINGYOUR_HOME: ${{ github.workspace }}/urnetwork-sdk
50+
WARP_HOME: ${{ github.workspace }}/urnetwork-sdk
51+
WARP_VERSION_HOME: ${{ github.workspace }}/urnetwork-sdk/version
52+
run: |
53+
export PATH="$PATH:/usr/local/go/bin:$HOME/go/bin"
54+
make init build_apple
55+
56+
- name: Resolve Swift packages
57+
working-directory: urnetwork-ios/app
58+
run: |
59+
xcodebuild -resolvePackageDependencies \
60+
-project app.xcodeproj \
61+
-scheme URnetwork \
62+
-derivedDataPath DerivedData
63+
64+
- name: Archive unsigned iOS app
65+
working-directory: urnetwork-ios/app
66+
run: |
67+
set -o pipefail
68+
xcodebuild archive \
69+
-project app.xcodeproj \
70+
-scheme URnetwork \
71+
-configuration Release \
72+
-destination 'generic/platform=iOS' \
73+
-archivePath build/URnetwork.xcarchive \
74+
-derivedDataPath DerivedData \
75+
CURRENT_PROJECT_VERSION=${{ github.run_number }} \
76+
MARKETING_VERSION=beta \
77+
CODE_SIGNING_ALLOWED=NO \
78+
CODE_SIGNING_REQUIRED=NO \
79+
CODE_SIGN_IDENTITY="" \
80+
PROVISIONING_PROFILE_SPECIFIER="" \
81+
2>&1 | tee xcodebuild-archive.log
82+
83+
- name: Package unsigned IPA
84+
working-directory: urnetwork-ios/app
85+
run: |
86+
APP=$(find build/URnetwork.xcarchive -name 'URnetwork.app' -type d | head -n 1)
87+
if [ -z "$APP" ]; then
88+
echo "Could not find URnetwork.app in archive"
89+
exit 1
90+
fi
91+
mkdir -p Payload
92+
cp -R "$APP" Payload/
93+
zip -r URnetwork-beta.ipa Payload
94+
95+
- name: Archive unsigned macOS app
96+
working-directory: urnetwork-ios/app
97+
run: |
98+
set -o pipefail
99+
xcodebuild archive \
100+
-project app.xcodeproj \
101+
-scheme URnetwork \
102+
-configuration Release \
103+
-destination 'generic/platform=macOS' \
104+
-archivePath build/URnetwork-macOS.xcarchive \
105+
-derivedDataPath DerivedData \
106+
CURRENT_PROJECT_VERSION=${{ github.run_number }} \
107+
MARKETING_VERSION=beta \
108+
CODE_SIGNING_ALLOWED=NO \
109+
CODE_SIGNING_REQUIRED=NO \
110+
CODE_SIGN_IDENTITY="" \
111+
PROVISIONING_PROFILE_SPECIFIER="" \
112+
2>&1 | tee xcodebuild-archive-macos.log
113+
114+
- name: Package unsigned macOS app
115+
working-directory: urnetwork-ios/app
116+
run: |
117+
APP=$(find build/URnetwork-macOS.xcarchive -name 'URnetwork.app' -type d | head -n 1)
118+
if [ -z "$APP" ]; then
119+
echo "Could not find URnetwork.app in macOS archive"
120+
exit 1
121+
fi
122+
ditto -c -k --sequesterRsrc --keepParent "$APP" URnetwork-beta-macOS.zip
123+
124+
- name: Upload IPA artifact
125+
uses: actions/upload-artifact@v4
126+
with:
127+
name: URnetwork-beta-ios
128+
path: urnetwork-ios/app/URnetwork-beta.ipa
129+
if-no-files-found: error
130+
retention-days: 7
131+
132+
- name: Upload macOS artifact
133+
uses: actions/upload-artifact@v4
134+
with:
135+
name: URnetwork-beta-macOS
136+
path: urnetwork-ios/app/URnetwork-beta-macOS.zip
137+
if-no-files-found: error
138+
retention-days: 7
139+
140+
- name: Create prerelease
141+
env:
142+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
143+
TAG: beta-custom-server-${{ github.run_number }}-${{ github.run_attempt }}
144+
run: |
145+
gh release delete "$TAG" --repo "$GITHUB_REPOSITORY" --yes || true
146+
gh release create "$TAG" \
147+
--repo "$GITHUB_REPOSITORY" \
148+
--prerelease \
149+
--title "URnetwork iOS beta custom server ${{ github.run_number }}" \
150+
--generate-notes \
151+
urnetwork-ios/app/URnetwork-beta.ipa \
152+
urnetwork-ios/app/URnetwork-beta-macOS.zip

‎app/URnetworkSdk/Package.swift‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// swift-tools-version:5.3
22
import PackageDescription
33

4-
// see https://developer.apple.com/documentation/xcode/distributing-binary-frameworks-as-swift-packages
4+
// Points to the local checkout of the forked SDK:
5+
// https://github.com/Ryanmello07/urnetwork-sdk
6+
// Build the XCFramework from that repo before using this package.
57
let package = Package(
68
name: "URnetworkSdk",
79
products: [
@@ -13,7 +15,7 @@ let package = Package(
1315
targets: [
1416
.binaryTarget(
1517
name: "URnetworkSdkBinary",
16-
path: "../../../sdk/build/apple/URnetworkSdk.xcframework"
18+
path: "../../../urnetwork-sdk/build/apple/URnetworkSdk.xcframework"
1719
),
1820
.testTarget(
1921
name: "URnetworkSdkTests",

‎app/network/Authenticate/LoginInitial/LoginInitialView.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@ private struct SSOButtons: View {
10581058

10591059
Spacer()
10601060
.frame(height: 8)
1061-
1061+
10621062
// Seedphrase login button (macOS)
10631063
Button(action: presentSeedphraseLogin) {
10641064
HStack {

0 commit comments

Comments
 (0)