Fix build & minor cleanup

src/Foundation.hs

@@ -2221,12 +2221,9 @@ instance YesodMail UniWorX where
   mailT ctx mail = defMailT ctx $ do
     void setMailObjectId
     setDateCurrent
-    replaceMailHeader "Sender" . Just . addressEmail =<< getsYesod (view _appMailFrom)
+    replaceMailHeader "Sender" . Just . addressEmail =<< getsYesod (appMailFrom . appSettings)
 
-    ret <- mail
+    mail <* setMailSmtpData
-
-    setMailSmtpData
-    return ret
 
 
 instance (MonadThrow m, MonadHandler m, HandlerSite m ~ UniWorX) => MonadCrypto m where

src/Handler/Help.hs

@@ -48,11 +48,6 @@ postHelpR = do
   MsgRenderer mr <- getMsgRenderer
 
   ((res,formWidget),formEnctype) <- runFormPost $ renderAForm FormStandard $ helpForm mr mReferer mUid
-  let form = wrapForm formWidget def
-        { formAction = Just $ SomeRoute HelpR
-        , formEncoding = formEnctype
-        , formAttrs = [ ("data-ajax-submit", "") | isModal ]
-        }
 
   formResultModal res HelpR $ \HelpForm{..} -> do
     now <- liftIO getCurrentTime
@@ -68,4 +63,8 @@ postHelpR = do
 
   defaultLayout $ do
     setTitleI MsgHelpTitle
-    $(widgetFile "help")
+    wrapForm $(widgetFile "help") def
+      { formAction = Just $ SomeRoute HelpR
+      , formEncoding = formEnctype
+      , formAttrs = [ ("data-ajax-submit", "") | isModal ]
+      }

templates/help.hamlet

@@ -1,3 +1,3 @@
 <p>
   _{MsgHelpIntroduction}
-^{form}
+^{formWidget}