1 files changed, 18 insertions, 18 deletions
diff --git a/src/client/elm/LoggedIn/Home/AddPayment/View.elm b/src/client/elm/LoggedIn/Home/AddPayment/View.elm
index 96f3a6a..d97f3ca 100644
--- a/src/client/elm/LoggedIn/Home/AddPayment/View.elm
+++ b/src/client/elm/LoggedIn/Home/AddPayment/View.elm
@@ -1,44 +1,44 @@
-module LoggedIn.Home.AddPayment.View
+module LoggedIn.Home.AddPayment.View exposing
   ( view
-  ) where
+  )
 
 import Result exposing (..)
+import Json.Decode as Json
 
 import Html exposing (..)
 import Html.Attributes exposing (..)
 import Html.Events exposing (..)
 
-import LoggedIn.Action as LoggedInAction
+import Msg exposing (Msg)
 
-import LoggedIn.Home.Action as HomeAction
+import LoggedIn.Msg as LoggedInMsg
+
+import LoggedIn.Home.Msg as HomeMsg
 import LoggedIn.Home.Model as HomeModel
 
-import LoggedIn.Home.AddPayment.Action as AddPaymentAction
+import LoggedIn.Home.AddPayment.Msg as AddPaymentMsg
 import LoggedIn.Home.AddPayment.Model as AddPaymentModel
 
 import Model.Payment exposing (Frequency(..))
 import Model.Translations exposing (getMessage)
 import LoggedData exposing (LoggedData)
 
-import Action
-import Mailbox
-
 import View.Events exposing (onSubmitPrevDefault)
 import View.Icon exposing (..)
 
 import Utils.Maybe exposing (isJust)
 import Utils.Either exposing (toMaybeError)
 
-view : LoggedData -> HomeModel.Model -> Html
+view : LoggedData -> HomeModel.Model -> Html Msg
 view loggedData homeModel =
   Html.form
     [ let update =
             if homeModel.add.waitingServer
               then
-                Action.NoOp
+                Msg.NoOp
               else
-                Action.UpdateLoggedIn <| LoggedInAction.AddPayment homeModel.add.name homeModel.add.cost homeModel.add.frequency
-      in  onSubmitPrevDefault Mailbox.address update
+                Msg.UpdateLoggedIn <| LoggedInMsg.AddPayment homeModel.add.name homeModel.add.cost homeModel.add.frequency
+      in  onSubmitPrevDefault update
     , class "addPayment"
     ]
     [ addPaymentName loggedData homeModel.add
@@ -56,7 +56,7 @@ view loggedData homeModel =
         ]
     ]
 
-addPaymentName : LoggedData -> AddPaymentModel.Model -> Html
+addPaymentName : LoggedData -> AddPaymentModel.Model -> Html Msg
 addPaymentName loggedData addPayment =
   div
     [ classList
@@ -67,7 +67,7 @@ addPaymentName loggedData addPayment =
     [ input
         [ id "nameInput"
         , value addPayment.name
-        , on "input" targetValue (Signal.message Mailbox.address << Action.UpdateLoggedIn << LoggedInAction.HomeAction << HomeAction.UpdateAdd << AddPaymentAction.UpdateName)
+        , on "input" (targetValue |> (Json.map <| Msg.UpdateLoggedIn << LoggedInMsg.HomeMsg << HomeMsg.UpdateAdd << AddPaymentMsg.UpdateName))
         , maxlength 20
         ]
         []
@@ -81,7 +81,7 @@ addPaymentName loggedData addPayment =
           text ""
     ]
 
-addPaymentCost : LoggedData -> AddPaymentModel.Model -> Html
+addPaymentCost : LoggedData -> AddPaymentModel.Model -> Html Msg
 addPaymentCost loggedData addPayment =
   div
     [ classList
@@ -92,7 +92,7 @@ addPaymentCost loggedData addPayment =
     [ input
         [ id "costInput"
         , value addPayment.cost
-        , on "input" targetValue (Signal.message Mailbox.address << Action.UpdateLoggedIn << LoggedInAction.HomeAction << HomeAction.UpdateAdd << AddPaymentAction.UpdateCost)
+        , on "input" (targetValue |> (Json.map <| Msg.UpdateLoggedIn << LoggedInMsg.HomeMsg << HomeMsg.UpdateAdd << AddPaymentMsg.UpdateCost))
         , maxlength 7
         ]
         []
@@ -106,12 +106,12 @@ addPaymentCost loggedData addPayment =
           text ""
     ]
 
-paymentFrequency : LoggedData -> AddPaymentModel.Model -> Html
+paymentFrequency : LoggedData -> AddPaymentModel.Model -> Html Msg
 paymentFrequency loggedData addPayment =
   button
     [ type' "button"
     , class "frequency"
-    , onClick Mailbox.address (Action.UpdateLoggedIn << LoggedInAction.HomeAction << HomeAction.UpdateAdd <| AddPaymentAction.ToggleFrequency)
+    , onClick (Msg.UpdateLoggedIn << LoggedInMsg.HomeMsg << HomeMsg.UpdateAdd <| AddPaymentMsg.ToggleFrequency)
     ]
     [ div
         [ classList