tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qrcode: don't default pubkey to ""

Browse Source
This commit is contained in:
William Casarin
2023-04-14 09:22:50 -07:00
parent 5c131e62d7
commit bad6ba3643
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
damus/Views/QRCodeView.swift
View File

@@ -10,7 +10,7 @@ import CoreImage.CIFilterBuiltins
struct QRCodeView: View { struct QRCodeView: View {
let damus_state: DamusState let damus_state: DamusState
@State var pubkey: String = "" @State var pubkey: String
@Environment(\.dismiss) var dismiss @Environment(\.dismiss) var dismiss
@Environment(\.presentationMode) var presentationMode @Environment(\.presentationMode) var presentationMode
@@ -94,11 +94,6 @@ struct QRCodeView: View {
} }
} }
.onAppear() {
if pubkey.isEmpty {
pubkey = damus_state.pubkey
}
}
.modifier(SwipeToDismissModifier(minDistance: nil, onDismiss: { .modifier(SwipeToDismissModifier(minDistance: nil, onDismiss: {
presentationMode.wrappedValue.dismiss() presentationMode.wrappedValue.dismiss()
})) }))
@@ -126,6 +121,6 @@ struct QRCodeView: View {
struct QRCodeView_Previews: PreviewProvider { struct QRCodeView_Previews: PreviewProvider {
static var previews: some View { static var previews: some View {
QRCodeView(damus_state: test_damus_state()) QRCodeView(damus_state: test_damus_state(), pubkey: test_event.pubkey)
} }
} }

2
damus/Views/SideMenuView.swift
View File

@@ -142,7 +142,7 @@ struct SideMenuView: View {
.font(.title) .font(.title)
.foregroundColor(textColor()) .foregroundColor(textColor())
}).fullScreenCover(isPresented: $showQRCode) { }).fullScreenCover(isPresented: $showQRCode) {
QRCodeView(damus_state: damus_state) QRCodeView(damus_state: damus_state, pubkey: damus_state.pubkey)
} }
} }
.padding(.top, verticalSpacing) .padding(.top, verticalSpacing)