From f306b0ce1f9d71e2012c8b19c27b2caba7a2efc7 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 21 Sep 2025 14:00:23 -0500 Subject: [PATCH 1/9] ios: 26 --- LDKNodeMonday.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/LDKNodeMonday.xcodeproj/project.pbxproj b/LDKNodeMonday.xcodeproj/project.pbxproj index 8de3a99..1cf0963 100644 --- a/LDKNodeMonday.xcodeproj/project.pbxproj +++ b/LDKNodeMonday.xcodeproj/project.pbxproj @@ -843,6 +843,7 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; INFOPLIST_KEY_UISupportsDocumentBrowser = YES; + IPHONEOS_DEPLOYMENT_TARGET = 26.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -877,6 +878,7 @@ INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; INFOPLIST_KEY_UISupportsDocumentBrowser = YES; + IPHONEOS_DEPLOYMENT_TARGET = 26.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", From 43c9571cc188502281050ed240a7b7dd9bf921ec Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 21 Sep 2025 14:17:31 -0500 Subject: [PATCH 2/9] onboardingview --- LDKNodeMonday/View/Home/OnboardingView.swift | 195 ++++++++++--------- 1 file changed, 98 insertions(+), 97 deletions(-) diff --git a/LDKNodeMonday/View/Home/OnboardingView.swift b/LDKNodeMonday/View/Home/OnboardingView.swift index eb7ab7c..9b93ba5 100644 --- a/LDKNodeMonday/View/Home/OnboardingView.swift +++ b/LDKNodeMonday/View/Home/OnboardingView.swift @@ -19,118 +19,119 @@ struct OnboardingView: View { @State private var animateContent = false var body: some View { + NavigationView { + ZStack { + Color(uiColor: .systemBackground) + .ignoresSafeArea() - ZStack { - Color(uiColor: .systemBackground) - .ignoresSafeArea() - - VStack { - - // Network settings - HStack { - Spacer() - Button( - action: { - showingNetworkSettingsSheet.toggle() - }, - label: { - HStack(spacing: 5) { - Text( - viewModel.walletClient.network.description - .capitalized - ) - .opacity(animateContent ? 1 : 0) - .offset(x: animateContent ? 0 : 100) - Image(systemName: "gearshape") - .opacity(animateContent ? 1 : 0) - .offset(x: animateContent ? 0 : 100) - } - } - ) - .sheet(isPresented: $showingNetworkSettingsSheet) { - NavigationView { - NetworkSettingsView(walletClient: viewModel.$walletClient) + VStack { + // Logo, name and description + VStack { + Image(systemName: "bolt.horizontal.fill") + .resizable() + .aspectRatio(contentMode: .fit) + .foregroundColor(.accent) + .frame(width: 150, height: 150, alignment: .center) + .padding(40) +// .scaleEffect(animateContent ? 1 : 0) +// .opacity(animateContent ? 1 : 0) +// .animation( +// .spring(response: 0.6, dampingFraction: 0.5), +// value: animateContent +// ) + Group { + Text("Monday Wallet") + .font(.largeTitle.weight(.semibold)) + Text("An example bitcoin wallet\npowered by LDK Node") + .font(.body) + .multilineTextAlignment(.center) + .fixedSize(horizontal: false, vertical: true) } +// .opacity(animateContent ? 1 : 0) +// .offset(y: animateContent ? 0 : 20) +// .animation(.easeOut(duration: 0.5).delay(0.3), value: animateContent) } - } - .fontWeight(.medium) - .padding() - .animation(.easeOut(duration: 0.5).delay(0.6), value: animateContent) - // Logo, name and description - VStack { - Image(systemName: "bolt.horizontal.fill") - .resizable() - .aspectRatio(contentMode: .fit) - .foregroundColor(.accent) - .frame(width: 150, height: 150, alignment: .center) - .padding(40) - .scaleEffect(animateContent ? 1 : 0) - .opacity(animateContent ? 1 : 0) - .animation( - .spring(response: 0.6, dampingFraction: 0.5), - value: animateContent - ) - Group { - Text("Monday Wallet") - .font(.largeTitle.weight(.semibold)) - Text("An example bitcoin wallet\npowered by LDK Node") - .font(.body) - .multilineTextAlignment(.center) - .fixedSize(horizontal: false, vertical: true) - } - .opacity(animateContent ? 1 : 0) - .offset(y: animateContent ? 0 : 20) - .animation(.easeOut(duration: 0.5).delay(0.3), value: animateContent) - } + Spacer() - Spacer() + // Buttons for creating and importing wallet - // Buttons for creating and importing wallet + Group { - Group { - Button("Create wallet") { - Task { - await viewModel.saveSeed() + Button { + Task { + await viewModel.saveSeed() + } + } label: { + Text("Create wallet") + .padding(.all, 10) + .padding(.horizontal, 20) + } + .buttonStyle(.borderedProminent) + + Button { + showingImportWalletSheet.toggle() + } label: { + Text("Import wallet") + .padding(.all, 10) + .padding(.horizontal, 20) } + .buttonStyle(.bordered) + .sheet(isPresented: $showingImportWalletSheet) { + ImportWalletView().environmentObject(viewModel) + } + } - .buttonStyle( - BitcoinFilled( - tintColor: .accent, - isCapsule: true - ) - ) +// .opacity(animateContent ? 1 : 0) +// .offset(y: animateContent ? 0 : 30) +// .animation(.easeOut(duration: 0.5).delay(0.6), value: animateContent) - Button("Import wallet") { - showingImportWalletSheet.toggle() - } - .buttonStyle(BitcoinPlain(tintColor: .accent)) - .sheet(isPresented: $showingImportWalletSheet) { - ImportWalletView().environmentObject(viewModel) + } + .dynamicTypeSize(...DynamicTypeSize.accessibility2) + .toolbar { + ToolbarItem(placement: .navigationBarTrailing) { + Button( + action: { + showingNetworkSettingsSheet.toggle() + }, + label: { + HStack(spacing: 5) { + Text( + viewModel.walletClient.network.description + .capitalized + ) + Image(systemName: "gearshape") + } + .fontWeight(.medium) + } + ) +// .opacity(animateContent ? 1 : 0) +// .offset(x: animateContent ? 0 : 100) +// .animation(.easeOut(duration: 0.5).delay(0.6), value: animateContent) } } - .opacity(animateContent ? 1 : 0) - .offset(y: animateContent ? 0 : 30) - .animation(.easeOut(duration: 0.5).delay(0.6), value: animateContent) - - }.dynamicTypeSize(...DynamicTypeSize.accessibility2) // Sets max dynamic size for all Text - - }.padding(.bottom, 20) - .alert(isPresented: $showingOnboardingViewErrorAlert) { - Alert( - title: Text(viewModel.onboardingViewError?.title ?? "Unknown error"), - message: Text(viewModel.onboardingViewError?.detail ?? "No details"), - dismissButton: .default(Text("OK")) { - viewModel.onboardingViewError = nil + .sheet(isPresented: $showingNetworkSettingsSheet) { + NavigationView { + NetworkSettingsView(walletClient: viewModel.$walletClient) } - ) - } - .onAppear { - withAnimation { - animateContent = true } - } + }.padding(.bottom, 20) + .alert(isPresented: $showingOnboardingViewErrorAlert) { + Alert( + title: Text(viewModel.onboardingViewError?.title ?? "Unknown error"), + message: Text(viewModel.onboardingViewError?.detail ?? "No details"), + dismissButton: .default(Text("OK")) { + viewModel.onboardingViewError = nil + } + ) + } +// .onAppear { +// withAnimation { +// animateContent = true +// } +// } + } } } From 3c9afceda734464c5c6ff4b71a715066b33f109a Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 21 Sep 2025 14:26:29 -0500 Subject: [PATCH 3/9] bitcoinview --- LDKNodeMonday/View/Home/BitcoinView.swift | 182 ++++++++-------------- 1 file changed, 66 insertions(+), 116 deletions(-) diff --git a/LDKNodeMonday/View/Home/BitcoinView.swift b/LDKNodeMonday/View/Home/BitcoinView.swift index 234b5d3..b735005 100644 --- a/LDKNodeMonday/View/Home/BitcoinView.swift +++ b/LDKNodeMonday/View/Home/BitcoinView.swift @@ -18,6 +18,9 @@ struct BitcoinView: View { @State private var showToast = false @State private var showingNodeIDView = false @State private var displayBalanceType = DisplayBalanceType.userDefaults + @State private var isReceiveSheetPresented = false + @State private var isSendSheetManualPresented = false + @State private var isSendSheetCameraPresented = false @StateObject var viewModel: BitcoinViewModel @StateObject private var eventService = EventService() @Binding var sendNavigationPath: NavigationPath @@ -28,9 +31,6 @@ struct BitcoinView: View { BalanceHeader(displayBalanceType: $displayBalanceType, viewModel: viewModel) .padding(.vertical, 40) - TransactionButtons(viewModel: viewModel) - .padding(.horizontal, 40) - PaymentsListView( payments: $viewModel.payments, displayBalanceType: $displayBalanceType, @@ -59,6 +59,38 @@ struct BitcoinView: View { } } } + ToolbarItemGroup(placement: .bottomBar) { + // Send button + Button { + isSendSheetManualPresented = true + } label: { + Label("Send", systemImage: "arrow.up") + }.disabled(viewModel.unifiedBalance == 0) + .glassEffect() + + Spacer() + + // Scan QR button + Button { + isSendSheetCameraPresented = true + } label: { + Label("Scan QR", systemImage: "qrcode.viewfinder") + } + .font(.title) + .disabled(viewModel.unifiedBalance == 0) + .glassEffect() + + Spacer() + + // Receive button + Button { + isReceiveSheetPresented = true + } label: { + Label("Receive", systemImage: "arrow.down") + } + .sensoryFeedback(.increase, trigger: isReceiveSheetPresented) + .glassEffect() + } } .dynamicTypeSize(...DynamicTypeSize.accessibility2) // Sets max dynamic size for all Text .onAppear { viewModel.update() } @@ -66,6 +98,11 @@ struct BitcoinView: View { of: eventService.lastEvent, { _, _ in showToast = eventService.lastEvent != nil + withAnimation { + isReceiveSheetPresented = false + isSendSheetManualPresented = false + isSendSheetCameraPresented = false + } } ) .onReceive(viewModel.$bitcoinViewError) { errorMessage in @@ -107,6 +144,32 @@ struct BitcoinView: View { viewModel: .init(lightningClient: viewModel.lightningClient) ) } + .sheet(isPresented: $isSendSheetManualPresented, onDismiss: { Task { viewModel.update() } }) { + SendView( + viewModel: SendViewModel.init( + lightningClient: viewModel.lightningClient, + sendViewState: .manualEntry, + price: viewModel.price, + balances: viewModel.balances + ) + ) + .presentationDetents([.large]) + } + .sheet(isPresented: $isSendSheetCameraPresented, onDismiss: { Task { viewModel.update() } }) { + SendView( + viewModel: SendViewModel.init( + lightningClient: viewModel.lightningClient, + sendViewState: .scanAddress, + price: viewModel.price, + balances: viewModel.balances + ) + ) + .presentationDetents([.large]) + } + .sheet(isPresented: $isReceiveSheetPresented, onDismiss: { Task { viewModel.update() } }) { + ReceiveView(viewModel: .init(lightningClient: viewModel.lightningClient)) + .presentationDetents([.large]) + } } } @@ -197,119 +260,6 @@ struct BalanceHeader: View { } } -struct TransactionButtons: View { - @ObservedObject var viewModel: BitcoinViewModel - @State private var isReceiveSheetPresented = false - @State private var isSendSheetManualPresented = false - @State private var isSendSheetCameraPresented = false - @StateObject private var eventService = EventService() - - var body: some View { - HStack(alignment: .center) { - - // Send button - Button { - isSendSheetManualPresented = true - } label: { - Text("Send") - }.buttonStyle( - BitcoinFilled( - width: 120, - tintColor: .accent, - isCapsule: true - ) - ).disabled(viewModel.unifiedBalance == 0) - - Spacer() - - // Scan QR button - Button { - isSendSheetCameraPresented = true - } label: { - Label("Scan QR", systemImage: "qrcode.viewfinder") - .font(.title) - .frame(height: 60, alignment: .center) - .labelStyle(.iconOnly) - .foregroundColor(.accentColor) - .padding() - }.disabled(viewModel.unifiedBalance == 0) - - Spacer() - - // Receive button - Button("Receive") { - isReceiveSheetPresented = true - } - .sensoryFeedback(.increase, trigger: isReceiveSheetPresented) - .buttonStyle( - BitcoinFilled( - width: 120, - tintColor: .accent, - isCapsule: true - ) - ) - .sheet( - isPresented: $isSendSheetManualPresented, - onDismiss: { - Task { - viewModel.update() - } - } - ) { - SendView( - viewModel: SendViewModel.init( - lightningClient: viewModel.lightningClient, - sendViewState: .manualEntry, - price: viewModel.price, - balances: viewModel.balances - ) - ) - .presentationDetents([.large]) - } - .sheet( - isPresented: $isSendSheetCameraPresented, - onDismiss: { - Task { - viewModel.update() - } - } - ) { - SendView( - viewModel: SendViewModel.init( - lightningClient: viewModel.lightningClient, - sendViewState: .scanAddress, - price: viewModel.price, - balances: viewModel.balances - ) - ) - .presentationDetents([.large]) - } - .sheet( - isPresented: $isReceiveSheetPresented, - onDismiss: { - Task { - viewModel.update() - } - } - ) { - ReceiveView(viewModel: .init(lightningClient: viewModel.lightningClient)) - .presentationDetents([.large]) - } - - }.onChange( - of: eventService.lastEvent, - { _, _ in - withAnimation { - isReceiveSheetPresented = false - isSendSheetManualPresented = false - isSendSheetCameraPresented = false - } - } - ) - } - -} - public enum DisplayBalanceType: String { case fiatSats case fiatBtc From 70752356aa2b7300ed64a53b9d9d930dcc8ed01c Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 21 Sep 2025 14:29:01 -0500 Subject: [PATCH 4/9] sendview --- LDKNodeMonday/View/Home/Send/SendView.swift | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/LDKNodeMonday/View/Home/Send/SendView.swift b/LDKNodeMonday/View/Home/Send/SendView.swift index 072a531..798227e 100644 --- a/LDKNodeMonday/View/Home/Send/SendView.swift +++ b/LDKNodeMonday/View/Home/Send/SendView.swift @@ -35,18 +35,18 @@ struct SendView: View { .frame(width: 150, height: 150, alignment: .center) .padding(40) Spacer() - Button { + + Button.init { dismiss() } label: { Text("Done") + .padding(.all, 10) + .padding(.horizontal, 80) } - .buttonStyle( - BitcoinFilled( - tintColor: .accent, - isCapsule: true - ) - ) .padding(.bottom, 40) + .buttonStyle(.borderedProminent) + + } } } From c759fe90721d8aff83d631a150c1be4e6c5bed0a Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 21 Sep 2025 14:30:51 -0500 Subject: [PATCH 5/9] SendReviewView --- .../View/Home/Send/SendReviewView.swift | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/LDKNodeMonday/View/Home/Send/SendReviewView.swift b/LDKNodeMonday/View/Home/Send/SendReviewView.swift index cb69f80..91f738a 100644 --- a/LDKNodeMonday/View/Home/Send/SendReviewView.swift +++ b/LDKNodeMonday/View/Home/Send/SendReviewView.swift @@ -40,8 +40,8 @@ struct SendReviewView: View { Label("Insufficient Funds", systemImage: "x.circle") .padding(40) } - - Button { + + Button.init { Task { try await viewModel.send() } @@ -54,15 +54,13 @@ struct SendReviewView: View { } } label: { Text("Send") + .padding(.all, 10) + .padding(.horizontal, 80) } - .buttonStyle( - BitcoinFilled( - tintColor: .accent, - isCapsule: true - ) - ) - .disabled(disableSend()) .padding(.bottom, 40) + .buttonStyle(.borderedProminent) + .disabled(disableSend()) + } } From 7ae8ee260269c53c0e9ecc81f1cb7190a7eaf57a Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 21 Sep 2025 14:32:13 -0500 Subject: [PATCH 6/9] SendManualEntry --- .../View/Home/Send/SendManualEntry.swift | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/LDKNodeMonday/View/Home/Send/SendManualEntry.swift b/LDKNodeMonday/View/Home/Send/SendManualEntry.swift index 4dc15ac..db453ba 100644 --- a/LDKNodeMonday/View/Home/Send/SendManualEntry.swift +++ b/LDKNodeMonday/View/Home/Send/SendManualEntry.swift @@ -117,19 +117,19 @@ struct SendManualEntry: View { }.padding(.vertical, 40) Spacer() - - Button { + + Button.init { viewModel.sendViewState = .reviewPayment } label: { Text("Review") + .padding(.all, 10) + .padding(.horizontal, 80) } - .buttonStyle( - BitcoinFilled( - tintColor: .accent, - isCapsule: true - ) - ).disabled(viewModel.amountSat == 0) .padding(.bottom, 40) + .buttonStyle(.borderedProminent) + .disabled(viewModel.amountSat == 0) + + } } From 6a52699adf66026eb6600cbf724b8be4c172b757 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 21 Sep 2025 14:33:31 -0500 Subject: [PATCH 7/9] AmountEntryView --- .../View/Home/Receive/AmountEntryView.swift | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/LDKNodeMonday/View/Home/Receive/AmountEntryView.swift b/LDKNodeMonday/View/Home/Receive/AmountEntryView.swift index bc29d9e..4fb6b69 100644 --- a/LDKNodeMonday/View/Home/Receive/AmountEntryView.swift +++ b/LDKNodeMonday/View/Home/Receive/AmountEntryView.swift @@ -51,18 +51,30 @@ struct AmountEntryView: View { .padding(.horizontal, 50) .padding(.bottom, 30) - Button { +// Button { +// amount = UInt64(numpadAmount) ?? 0 +// dismiss() +// } label: { +// Text("Done") +// } +// .buttonStyle( +// BitcoinOutlined( +// tintColor: .accent, +// isCapsule: true +// ) +// ) + + Button.init { amount = UInt64(numpadAmount) ?? 0 dismiss() } label: { Text("Done") + .padding(.all, 10) + .padding(.horizontal, 80) } - .buttonStyle( - BitcoinOutlined( - tintColor: .accent, - isCapsule: true - ) - ) + .buttonStyle(.borderedProminent) + + } .padding(.bottom, 20) From 9096ccd58ac0bcc0e68ed17bfa7813fc11ceff76 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 21 Sep 2025 14:39:36 -0500 Subject: [PATCH 8/9] SeedView --- .../View/Settings/Danger/SeedView.swift | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/LDKNodeMonday/View/Settings/Danger/SeedView.swift b/LDKNodeMonday/View/Settings/Danger/SeedView.swift index a8c3bb5..bd35a35 100644 --- a/LDKNodeMonday/View/Settings/Danger/SeedView.swift +++ b/LDKNodeMonday/View/Settings/Danger/SeedView.swift @@ -30,16 +30,21 @@ struct SeedView: View { .multilineTextAlignment(.center) .padding(40) Spacer() - Button("Show Recovery Phrase") { + Button.init { showAlert = true - }.buttonStyle(BitcoinFilled(tintColor: .accentColor, isCapsule: true)) - .alert( - "Are you sure you want to view the recovery phrase?", - isPresented: $showAlert - ) { - Button("Yes", role: .destructive) { showRecoveryPhrase = true } - Button("No", role: .cancel) {} - } + } label: { + Text("Show Recovery Phrase") + .padding(.all, 10) + .padding(.horizontal, 60) + } + .buttonStyle(.borderedProminent) + .alert( + "Are you sure you want to view the recovery phrase?", + isPresented: $showAlert + ) { + Button("Yes", role: .destructive) { showRecoveryPhrase = true } + Button("No", role: .cancel) {} + } } else { SeedPhraseView( words: viewModel.seed.mnemonic.components(separatedBy: " "), From 4af159abe2ce4fbfdc7d805fbec8f0bdb3098401 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 21 Sep 2025 14:44:44 -0500 Subject: [PATCH 9/9] format --- LDKNodeMonday/View/Home/BitcoinView.swift | 6 ++- LDKNodeMonday/View/Home/OnboardingView.swift | 44 +++++++++---------- .../View/Home/Receive/AmountEntryView.swift | 28 ++++++------ .../View/Home/Send/SendManualEntry.swift | 3 +- .../View/Home/Send/SendReviewView.swift | 2 +- LDKNodeMonday/View/Home/Send/SendView.swift | 3 +- 6 files changed, 42 insertions(+), 44 deletions(-) diff --git a/LDKNodeMonday/View/Home/BitcoinView.swift b/LDKNodeMonday/View/Home/BitcoinView.swift index b735005..230d1c5 100644 --- a/LDKNodeMonday/View/Home/BitcoinView.swift +++ b/LDKNodeMonday/View/Home/BitcoinView.swift @@ -144,7 +144,8 @@ struct BitcoinView: View { viewModel: .init(lightningClient: viewModel.lightningClient) ) } - .sheet(isPresented: $isSendSheetManualPresented, onDismiss: { Task { viewModel.update() } }) { + .sheet(isPresented: $isSendSheetManualPresented, onDismiss: { Task { viewModel.update() } }) + { SendView( viewModel: SendViewModel.init( lightningClient: viewModel.lightningClient, @@ -155,7 +156,8 @@ struct BitcoinView: View { ) .presentationDetents([.large]) } - .sheet(isPresented: $isSendSheetCameraPresented, onDismiss: { Task { viewModel.update() } }) { + .sheet(isPresented: $isSendSheetCameraPresented, onDismiss: { Task { viewModel.update() } }) + { SendView( viewModel: SendViewModel.init( lightningClient: viewModel.lightningClient, diff --git a/LDKNodeMonday/View/Home/OnboardingView.swift b/LDKNodeMonday/View/Home/OnboardingView.swift index 9b93ba5..6d34e80 100644 --- a/LDKNodeMonday/View/Home/OnboardingView.swift +++ b/LDKNodeMonday/View/Home/OnboardingView.swift @@ -33,12 +33,12 @@ struct OnboardingView: View { .foregroundColor(.accent) .frame(width: 150, height: 150, alignment: .center) .padding(40) -// .scaleEffect(animateContent ? 1 : 0) -// .opacity(animateContent ? 1 : 0) -// .animation( -// .spring(response: 0.6, dampingFraction: 0.5), -// value: animateContent -// ) + // .scaleEffect(animateContent ? 1 : 0) + // .opacity(animateContent ? 1 : 0) + // .animation( + // .spring(response: 0.6, dampingFraction: 0.5), + // value: animateContent + // ) Group { Text("Monday Wallet") .font(.largeTitle.weight(.semibold)) @@ -47,9 +47,9 @@ struct OnboardingView: View { .multilineTextAlignment(.center) .fixedSize(horizontal: false, vertical: true) } -// .opacity(animateContent ? 1 : 0) -// .offset(y: animateContent ? 0 : 20) -// .animation(.easeOut(duration: 0.5).delay(0.3), value: animateContent) + // .opacity(animateContent ? 1 : 0) + // .offset(y: animateContent ? 0 : 20) + // .animation(.easeOut(duration: 0.5).delay(0.3), value: animateContent) } Spacer() @@ -68,7 +68,7 @@ struct OnboardingView: View { .padding(.horizontal, 20) } .buttonStyle(.borderedProminent) - + Button { showingImportWalletSheet.toggle() } label: { @@ -80,11 +80,11 @@ struct OnboardingView: View { .sheet(isPresented: $showingImportWalletSheet) { ImportWalletView().environmentObject(viewModel) } - + } -// .opacity(animateContent ? 1 : 0) -// .offset(y: animateContent ? 0 : 30) -// .animation(.easeOut(duration: 0.5).delay(0.6), value: animateContent) + // .opacity(animateContent ? 1 : 0) + // .offset(y: animateContent ? 0 : 30) + // .animation(.easeOut(duration: 0.5).delay(0.6), value: animateContent) } .dynamicTypeSize(...DynamicTypeSize.accessibility2) @@ -105,9 +105,9 @@ struct OnboardingView: View { .fontWeight(.medium) } ) -// .opacity(animateContent ? 1 : 0) -// .offset(x: animateContent ? 0 : 100) -// .animation(.easeOut(duration: 0.5).delay(0.6), value: animateContent) + // .opacity(animateContent ? 1 : 0) + // .offset(x: animateContent ? 0 : 100) + // .animation(.easeOut(duration: 0.5).delay(0.6), value: animateContent) } } .sheet(isPresented: $showingNetworkSettingsSheet) { @@ -126,11 +126,11 @@ struct OnboardingView: View { } ) } -// .onAppear { -// withAnimation { -// animateContent = true -// } -// } + // .onAppear { + // withAnimation { + // animateContent = true + // } + // } } } } diff --git a/LDKNodeMonday/View/Home/Receive/AmountEntryView.swift b/LDKNodeMonday/View/Home/Receive/AmountEntryView.swift index 4fb6b69..1e0953e 100644 --- a/LDKNodeMonday/View/Home/Receive/AmountEntryView.swift +++ b/LDKNodeMonday/View/Home/Receive/AmountEntryView.swift @@ -51,19 +51,19 @@ struct AmountEntryView: View { .padding(.horizontal, 50) .padding(.bottom, 30) -// Button { -// amount = UInt64(numpadAmount) ?? 0 -// dismiss() -// } label: { -// Text("Done") -// } -// .buttonStyle( -// BitcoinOutlined( -// tintColor: .accent, -// isCapsule: true -// ) -// ) - + // Button { + // amount = UInt64(numpadAmount) ?? 0 + // dismiss() + // } label: { + // Text("Done") + // } + // .buttonStyle( + // BitcoinOutlined( + // tintColor: .accent, + // isCapsule: true + // ) + // ) + Button.init { amount = UInt64(numpadAmount) ?? 0 dismiss() @@ -73,8 +73,6 @@ struct AmountEntryView: View { .padding(.horizontal, 80) } .buttonStyle(.borderedProminent) - - } .padding(.bottom, 20) diff --git a/LDKNodeMonday/View/Home/Send/SendManualEntry.swift b/LDKNodeMonday/View/Home/Send/SendManualEntry.swift index db453ba..f822218 100644 --- a/LDKNodeMonday/View/Home/Send/SendManualEntry.swift +++ b/LDKNodeMonday/View/Home/Send/SendManualEntry.swift @@ -117,7 +117,7 @@ struct SendManualEntry: View { }.padding(.vertical, 40) Spacer() - + Button.init { viewModel.sendViewState = .reviewPayment } label: { @@ -129,7 +129,6 @@ struct SendManualEntry: View { .buttonStyle(.borderedProminent) .disabled(viewModel.amountSat == 0) - } } diff --git a/LDKNodeMonday/View/Home/Send/SendReviewView.swift b/LDKNodeMonday/View/Home/Send/SendReviewView.swift index 91f738a..7c83b1c 100644 --- a/LDKNodeMonday/View/Home/Send/SendReviewView.swift +++ b/LDKNodeMonday/View/Home/Send/SendReviewView.swift @@ -40,7 +40,7 @@ struct SendReviewView: View { Label("Insufficient Funds", systemImage: "x.circle") .padding(40) } - + Button.init { Task { try await viewModel.send() diff --git a/LDKNodeMonday/View/Home/Send/SendView.swift b/LDKNodeMonday/View/Home/Send/SendView.swift index 798227e..ade5b37 100644 --- a/LDKNodeMonday/View/Home/Send/SendView.swift +++ b/LDKNodeMonday/View/Home/Send/SendView.swift @@ -35,7 +35,7 @@ struct SendView: View { .frame(width: 150, height: 150, alignment: .center) .padding(40) Spacer() - + Button.init { dismiss() } label: { @@ -46,7 +46,6 @@ struct SendView: View { .padding(.bottom, 40) .buttonStyle(.borderedProminent) - } } }