diff --git a/enzevalos_iphone/SwiftUI/Inbox/categorized/Helpers/UI/SupportingViews/MailOptionsView.swift b/enzevalos_iphone/SwiftUI/Inbox/categorized/Helpers/UI/SupportingViews/MailOptionsView.swift index b7d6ce8a389b67f8f94d00dac5f1a28ef63a04cf..0c3c4bbaa7cd59e92c8d2bc8ff7c1ea0d14ef17d 100644 --- a/enzevalos_iphone/SwiftUI/Inbox/categorized/Helpers/UI/SupportingViews/MailOptionsView.swift +++ b/enzevalos_iphone/SwiftUI/Inbox/categorized/Helpers/UI/SupportingViews/MailOptionsView.swift @@ -92,16 +92,10 @@ fileprivate struct MailOptionsWrapper<Content:View> : View { @State private var opens : Bool = false @State private var dst : AnyView = AnyView() func newMail(to receivers : [AddressRecord?]){ - var receivers = receivers.compactMap{$0} - let to = receivers.removeFirst() + let receivers = receivers.compactMap{$0}.map{$0.email} setDst( - ComposeView(model: - ComposeModel(model: - SelectReceiverModel( - to: to, - ccs: receivers - ) - ) + ComposeView( + preData: PreMailData(to: receivers) ) ) open() diff --git a/enzevalos_iphone/SwiftUI/Inbox/categorized/Helpers/UI/SupportingViews/UnreadCountIcon.swift b/enzevalos_iphone/SwiftUI/Inbox/categorized/Helpers/UI/SupportingViews/UnreadCountIcon.swift index 0cdff4f9b49e761349cdf10794480bfc0dbcaf4d..72bf5070f7f5c264883b174ff386b439e5af2cb1 100644 --- a/enzevalos_iphone/SwiftUI/Inbox/categorized/Helpers/UI/SupportingViews/UnreadCountIcon.swift +++ b/enzevalos_iphone/SwiftUI/Inbox/categorized/Helpers/UI/SupportingViews/UnreadCountIcon.swift @@ -25,7 +25,7 @@ struct UnreadCountIcon: View { var body: some View { FloatingActionButton( radius:5, - elevation:0, + //elevation:0,//now depricated onShortPress: onPress ){ VStack{ diff --git a/enzevalos_iphone/SwiftUI/Read/ReadModel.swift b/enzevalos_iphone/SwiftUI/Read/ReadModel.swift index 9ed72bffe5acd58edddbbd9831c413ca1e3960fc..fcc8bc8dd9b16ae7ba0ce265a92d039c21c870f9 100644 --- a/enzevalos_iphone/SwiftUI/Read/ReadModel.swift +++ b/enzevalos_iphone/SwiftUI/Read/ReadModel.swift @@ -102,11 +102,11 @@ class ReadModel <M: DisplayMail>: ObservableObject { struct PreMailData: Identifiable { var id = UUID() - var body: String - var subject: String - var to: [String] - var cc: [String] - var bcc: [String] + var body: String = "" + var subject: String = "" + var to: [String] = [] + var cc: [String] = [] + var bcc: [String] = [] // TODO: Consider message ids for response mail static func invitePerson<M: DisplayMail> (mail: M) -> PreMailData? {