rvv001 - Shield - Deshield process

DeShield form  -  Cancel button moved  to the right of process button

src/Zenith/GUI.hs

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