src/Zenith/GUI.hs

@@ -975,7 +975,8 @@ buildUI wenv model = widgetTree
         , filler
         ]
     shieldOverlay =
-      box  
+      alert CloseShield $
+      box
         (vstack
            [ filler
            , hstack
@@ -990,39 +991,32 @@ buildUI wenv model = widgetTree
                       , separatorLine `styleBasic` [fgColor btnColor]
                       , spacer    
                       , hstack
-                          [ filler
-                          , label ("Amount : " ) `styleBasic`
+                          [ label "Amount:" `styleBasic`
                             [width 50, textFont "Bold"]
                           , spacer
-                          , label (displayAmount (model ^. network) 100 ) `styleBasic`
-                            [width 50, textFont "Bold"]
-                          , filler
---                          , spacer
---                          , numericField_
---                              sendAmount
---                              [ decimals 8
---                              , minValue 0.0
---                              , maxValue
---                                  (fromIntegral (model ^. tBalance) / 100000000.0)
---                              , validInput tBalanceValid
---                              , onChange CheckAmount
---                              ] `styleBasic`
---                            [ width 150
---                            , styleIf
---                                (not $ model ^. tBalanceValid)
---                                (textColor red)
---                            ]
+                          , numericField_
+                              sendAmount
+                              [ decimals 8
+                              , minValue 0.0
+                              , maxValue
+                                  (fromIntegral (model ^. tBalance) / 100000000.0)
+                              , validInput tBalanceValid
+                              , onChange CheckAmount
+                              ] `styleBasic`
+                            [ width 150
+                            , styleIf
+                                (not $ model ^. tBalanceValid)
+                                (textColor red)
+                            ]
                           ]
                       , spacer
                       , box_
                           [alignMiddle]
                           (hstack
-                              [ filler 
-                              , mainButton "Proceed" NotImplemented `nodeEnabled` True
---                               (model ^. amountValid && model ^. recipientValid)
-                              , spacer 
-                              , mainButton "Cancel" CloseShield `nodeEnabled` True
-                              , filler
+                             [ filler 
+                             , mainButton "Proceed" NotImplemented `nodeEnabled`
+                               (model ^. amountValid && model ^. recipientValid)
+                             , filler
                              ])
                       ]) `styleBasic`
                  [radius 4, border 2 btnColor, bgColor white, padding 4]
@@ -1032,6 +1026,7 @@ buildUI wenv model = widgetTree
            ]) `styleBasic`
       [bgColor (white & L.a .~ 0.5)]
     deShieldOverlay =
+      alert CloseDeShield $
       box
         (vstack
            [ filler
@@ -1080,10 +1075,8 @@ buildUI wenv model = widgetTree
                           [alignMiddle]
                           (hstack
                              [ filler 
-                             , mainButton "Proceed" NotImplemented `nodeEnabled` True
---                               (model ^. amountValid && model ^. recipientValid)
-                             , spacer 
-                             , mainButton "Cancel" CloseDeShield `nodeEnabled` True
+                             , mainButton "Proceed" NotImplemented `nodeEnabled`
+                               (model ^. amountValid && model ^. recipientValid)
                              , filler
                              ])
                       ]) `styleBasic`