Skip to content

chore: prepare Bitkit 3.1.1 #1298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
piotr-iohk wants to merge 10 commits into from
+2,100 −167
Closed

chore: prepare Bitkit 3.1.1 #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
63a3fe5
Merge pull request #1237 from synonymdev/chore/paykit-rc6
ovitrif Nov 11, 2026
6f8f49f
Merge pull request #1235 from synonymdev/feat/pubky-app-profile
ovitrif Nov 11, 2026
c278e2a
Merge pull request #1252 from synonymdev/chore/bump-ldk-node-vss
ovitrif Nov 9, 2026
d9a136e
Merge pull request #1290 from synonymdev/chore/bump-ldk-node-rc80
ovitrif Nov 11, 2026
a87e048
Merge pull request #1292 from synonymdev/chore/paykit-rc8
ovitrif Nov 11, 2026
c4bfb15
chore: version 3.1.1
piotr-iohk Nov 12, 2026
25284fa
Merge pull request #1250 from synonymdev/ci/blocktank-regtest-auth
jvsena42 Nov 9, 2026
b03f4a6
test: authenticate iOS staging regtest fixtures
piotr-iohk Nov 12, 2026
eb94e76
fix: preserve tags when restoring a profile
piotr-iohk Nov 12, 2026
accbdd6
docs: complete the 3.1.1 security notes
piotr-iohk Nov 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/e2e-staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ jobs:

env:
BACKEND: regtest
BLOCKTANK_REGTEST_AUTH: ${{ secrets.BLOCKTANK_REGTEST_AUTH }}

steps:
- name: Resolve E2E tests ref
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/e2e_migration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ jobs:
prepare-wallets:
needs: [e2e-branch, resolve-e2e-ref, migration-plan]
uses: synonymdev/bitkit-e2e-tests/.github/workflows/migration-wallet-setup.yml@main
secrets:
BLOCKTANK_REGTEST_AUTH: ${{ secrets.BLOCKTANK_REGTEST_AUTH }}
strategy:
fail-fast: false
matrix:
Expand All @@ -191,6 +193,7 @@ jobs:
name: ios RN - ${{ matrix.scenario.version }} - ${{ matrix.scenario.name }}
env:
BACKEND: regtest
BLOCKTANK_REGTEST_AUTH: ${{ secrets.BLOCKTANK_REGTEST_AUTH }}
MIGRATION_EXTENDED: ${{ inputs.extended_rn || false }}

steps:
Expand Down Expand Up @@ -367,6 +370,7 @@ jobs:
name: ios native - ${{ matrix.scenario.version }} - ${{ matrix.scenario.name }}
env:
BACKEND: regtest
BLOCKTANK_REGTEST_AUTH: ${{ secrets.BLOCKTANK_REGTEST_AUTH }}
MIGRATION_EXTENDED: ${{ inputs.extended_rn || false }}

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ concurrency:
jobs:

test:
# PR code must not publish dependency caches into the dispatch ref's scope.
cache-mode: read
Comment thread
piotr-iohk marked this conversation as resolved.
Resolved
if: github.event.pull_request.draft == false
name: Run Integration Tests
runs-on: macos-15
Expand Down Expand Up @@ -130,6 +128,8 @@ jobs:

- name: Run integration tests
timeout-minutes: 25
env:
TEST_RUNNER_BLOCKTANK_REGTEST_AUTH: ${{ github.event_name == 'workflow_dispatch' && github.ref_name == 'release-3.1.1' && inputs.pr == '' && inputs.merge_commit == '' && secrets.BLOCKTANK_REGTEST_AUTH || '' }}
run: |
xcrun simctl bootstatus "$SIMULATOR_UDID" -b
echo "⏱️ Starting integration tests at $(date)"
Expand Down
30 changes: 15 additions & 15 deletions Bitkit.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_ENTITLEMENTS = BitkitWidgetExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 203;
CURRENT_PROJECT_VERSION = 204;
DEVELOPMENT_TEAM = KYH47R284B;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = BitkitWidget/Info.plist;
Expand All @@ -710,7 +710,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 3.1.0;
MARKETING_VERSION = 3.1.1;
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.widget;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand All @@ -731,7 +731,7 @@
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_ENTITLEMENTS = BitkitWidgetExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 203;
CURRENT_PROJECT_VERSION = 204;
DEVELOPMENT_TEAM = KYH47R284B;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = BitkitWidget/Info.plist;
Expand All @@ -743,7 +743,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 3.1.0;
MARKETING_VERSION = 3.1.1;
PRODUCT_BUNDLE_IDENTIFIER = to.bitkit.widget;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand All @@ -763,7 +763,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = BitkitNotification/BitkitNotification.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 203;
CURRENT_PROJECT_VERSION = 204;
DEVELOPMENT_TEAM = KYH47R284B;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = BitkitNotification/Info.plist;
Expand All @@ -775,7 +775,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 3.1.0;
MARKETING_VERSION = 3.1.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
Expand All @@ -796,7 +796,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = BitkitNotification/BitkitNotification.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 203;
CURRENT_PROJECT_VERSION = 204;
DEVELOPMENT_TEAM = KYH47R284B;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = BitkitNotification/Info.plist;
Expand All @@ -808,7 +808,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 3.1.0;
MARKETING_VERSION = 3.1.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
Expand Down Expand Up @@ -949,7 +949,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Bitkit/Bitkit.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 203;
CURRENT_PROJECT_VERSION = 204;
DEVELOPMENT_ASSET_PATHS = "\"Bitkit/Preview Content\"";
DEVELOPMENT_TEAM = KYH47R284B;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -976,7 +976,7 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 3.1.0;
MARKETING_VERSION = 3.1.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
Expand All @@ -1002,7 +1002,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Bitkit/Bitkit.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 203;
CURRENT_PROJECT_VERSION = 204;
DEVELOPMENT_ASSET_PATHS = "\"Bitkit/Preview Content\"";
DEVELOPMENT_TEAM = KYH47R284B;
ENABLE_HARDENED_RUNTIME = YES;
Expand All @@ -1029,7 +1029,7 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 3.1.0;
MARKETING_VERSION = 3.1.1;
OTHER_LDFLAGS = (
"-framework",
CoreBluetooth,
Expand Down Expand Up @@ -1200,15 +1200,15 @@
repositoryURL = "https://github.com/pubky/paykit-rs";
requirement = {
kind = exactVersion;
version = "0.1.1-rc2";
version = "0.1.1-rc8";
};
};
18D65DFE2EB9649F00252335 /* XCRemoteSwiftPackageReference "vss-rust-client-ffi" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/synonymdev/vss-rust-client-ffi";
requirement = {
kind = exactVersion;
version = "0.5.26-rc1";
version = "0.5.26-rc2";
};
};
4AAB08C82E1FE77600BA63DF /* XCRemoteSwiftPackageReference "lottie-ios" */ = {
Expand All @@ -1224,7 +1224,7 @@
repositoryURL = "https://github.com/synonymdev/ldk-node";
requirement = {
kind = exactVersion;
version = "0.7.0-rc.78";
version = "0.7.0-rc.80";
};
};
96DEA0382DE8BBA1009932BF /* XCRemoteSwiftPackageReference "bitkit-core" */ = {
Expand Down
12 changes: 6 additions & 6 deletions Bitkit.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 14 additions & 9 deletions Bitkit/Components/ProfileEditFormView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ struct ProfileEditFormView<Avatar: View>: View {
var bioLabel: String = t("profile__create_bio_label")
let bioPlaceholder: String
let isSaving: Bool
var maxLinks: Int?
/// Whether the name can be saved; contact edits accept any non-empty name.
var isNameValid: (String) -> Bool = { !$0.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty }
let footerNote: String?
let deleteLabel: String?
var deleteSectionCaption: String = t("profile__edit_delete_section")
Expand Down Expand Up @@ -154,14 +157,16 @@ struct ProfileEditFormView<Avatar: View>: View {
linkRow(index: index)
}

IconActionButton(
icon: "link",
isSystemIcon: true,
title: t("profile__create_add_link"),
accessibilityId: "ProfileEditAddLink"
) {
dismissKeyboard()
showAddLinkSheet = true
if maxLinks.map({ links.count < $0 }) ?? true {
IconActionButton(
icon: "link",
isSystemIcon: true,
title: t("profile__create_add_link"),
accessibilityId: "ProfileEditAddLink"
) {
dismissKeyboard()
showAddLinkSheet = true
}
}
}
}
Expand Down Expand Up @@ -294,7 +299,7 @@ struct ProfileEditFormView<Avatar: View>: View {
await onSave()
}
.accessibilityIdentifier("ProfileEditSave")
.disabled(name.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty)
.disabled(!isNameValid(name))
}
.padding(.horizontal, 16)
.padding(.top, 16)
Expand Down
Loading