Skip to content

Commit 45371a4

Browse files
abaillyabailly
authored
Remove network page from deposit web UI (#4986)
### Changes - remove network page from deposit web UI ### Issues fix #4963
2 parents 62d79d2 + 496a8b2 commit 45371a4

File tree

4 files changed

+11
-87
lines changed

4 files changed

+11
-87
lines changed

‎lib/exe/lib/Cardano/Wallet/Application.hs‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -450,9 +450,6 @@ serveWallet
450450
bootEnv
451451
databaseDir'
452452
socket
453-
sNetwork
454-
netLayer
455-
blockchainSource
456453
ContT $ \k ->
457454
withAsync uiService $ \_ -> k ()
458455
pure $ Just (databaseDir', resource)
@@ -649,25 +646,17 @@ serveWallet
649646
socket
650647
application
651648
startDepositUiServer
652-
:: forall n
653-
. ( HasSNetworkId n
654-
)
655-
=> UILayer WalletResource
649+
:: UILayer WalletResource
656650
-> WalletBootEnv IO
657651
-> FilePath
658652
-> Socket
659-
-> SNetworkId n
660-
-> NetworkLayer IO (CardanoBlock StandardCrypto)
661-
-> BlockchainSource
662653
-> IO ()
663654
startDepositUiServer
664655
ui
665656
bootEnv
666657
databaseDir'
667658
socket
668-
_proxy
669-
nl
670-
bs = do
659+
= do
671660
let serverSettings = Warp.defaultSettings
672661
api = Proxy @DepositUi.UI
673662
application =
@@ -679,9 +668,6 @@ serveWallet
679668
bootEnv
680669
databaseDir'
681670
(PageConfig "" "Deposit Cardano Wallet")
682-
_proxy
683-
nl
684-
bs
685671
start
686672
serverSettings
687673
apiServerTracer

‎lib/ui/src/Cardano/Wallet/UI/Deposit/API.hs‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ instance FromForm PostWalletViaXPub
8585

8686
data Page
8787
= About
88-
| Network
8988
| Settings
9089
| Wallet
9190
| Addresses
@@ -96,7 +95,6 @@ makePrisms ''Page
9695

9796
instance ToHttpApiData Page where
9897
toUrlPiece About = "about"
99-
toUrlPiece Network = "network"
10098
toUrlPiece Settings = "settings"
10199
toUrlPiece Wallet = "wallet"
102100
toUrlPiece Addresses = "addresses"
@@ -105,7 +103,6 @@ instance ToHttpApiData Page where
105103

106104
instance FromHttpApiData Page where
107105
parseUrlPiece "about" = Right About
108-
parseUrlPiece "network" = Right Network
109106
parseUrlPiece "settings" = Right Settings
110107
parseUrlPiece "wallet" = Right Wallet
111108
parseUrlPiece "addresses" = Right Addresses
@@ -116,7 +113,6 @@ instance FromHttpApiData Page where
116113
-- | Pages endpoints
117114
type Pages =
118115
"about" :> SessionedHtml Get
119-
:<|> "network" :> SessionedHtml Get
120116
:<|> "settings" :> SessionedHtml Get
121117
:<|> "wallet" :> SessionedHtml Get
122118
:<|> "addresses" :> SessionedHtml Get
@@ -125,8 +121,7 @@ type Pages =
125121

126122
-- | Data endpoints
127123
type Data =
128-
"network" :> "info" :> SessionedHtml Get
129-
:<|> "settings" :> SessionedHtml Get
124+
"settings" :> SessionedHtml Get
130125
:<|> "settings" :> "sse" :> "toggle" :> SessionedHtml Post
131126
:<|> "sse" :> (CookieRequest :> SSE)
132127
:<|> "favicon.ico" :> Get '[Image] BL.ByteString
@@ -260,13 +255,11 @@ type UI =
260255

261256
homePageLink :: Link
262257
aboutPageLink :: Link
263-
networkPageLink :: Link
264258
settingsPageLink :: Link
265259
walletPageLink :: Link
266260
addressesPageLink :: Link
267261
depositPageLink :: Link
268262
paymentsPageLink :: Link
269-
networkInfoLink :: Link
270263
settingsGetLink :: Link
271264
settingsSseToggleLink :: Link
272265
sseLink :: Link
@@ -306,13 +299,11 @@ paymentsResetLink :: Link
306299
walletStatusLink :: Link
307300
homePageLink
308301
:<|> aboutPageLink
309-
:<|> networkPageLink
310302
:<|> settingsPageLink
311303
:<|> walletPageLink
312304
:<|> addressesPageLink
313305
:<|> depositPageLink
314306
:<|> paymentsPageLink
315-
:<|> networkInfoLink
316307
:<|> settingsGetLink
317308
:<|> settingsSseToggleLink
318309
:<|> sseLink

‎lib/ui/src/Cardano/Wallet/UI/Deposit/Html/Pages/Page.hs‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ import Cardano.Wallet.UI.Common.Html.Modal
2323
import Cardano.Wallet.UI.Common.Html.Pages.Lib
2424
( sseH
2525
)
26-
import Cardano.Wallet.UI.Common.Html.Pages.Network
27-
( networkH
28-
)
2926
import Cardano.Wallet.UI.Common.Html.Pages.Settings
3027
( settingsPageH
3128
)
@@ -44,7 +41,6 @@ import Cardano.Wallet.UI.Deposit.API
4441
, _About
4542
, _Addresses
4643
, _Deposits
47-
, _Network
4844
, _Payments
4945
, _Settings
5046
, _Wallet
@@ -54,8 +50,6 @@ import Cardano.Wallet.UI.Deposit.API
5450
, depositsLink
5551
, faviconLink
5652
, navigationLink
57-
, networkInfoLink
58-
, networkPageLink
5953
, paymentsLink
6054
, paymentsPageLink
6155
, settingsGetLink
@@ -112,7 +106,6 @@ page c p = RawHtml
112106
imageOverlay
113107
case p of
114108
About -> aboutH
115-
Network -> networkH networkInfoLink
116109
Settings -> settingsPageH settingsGetLink
117110
Wallet -> walletH
118111
Addresses -> addressesH
@@ -136,8 +129,7 @@ headerElementH p wp =
136129
<> [ (is' _Payments, paymentsPageLink, "Payments")
137130
| isPresent wp
138131
]
139-
<> [ (is' _Network, networkPageLink, "Network")
140-
, (is' _Settings, settingsPageLink, "Settings")
132+
<> [ (is' _Settings, settingsPageLink, "Settings")
141133
, (is' _About, aboutPageLink, "About")
142134
]
143135
where

‎lib/ui/src/Cardano/Wallet/UI/Deposit/Server.hs‎

Lines changed: 7 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,19 @@
33
{-# LANGUAGE FlexibleContexts #-}
44
{-# LANGUAGE RankNTypes #-}
55
{-# LANGUAGE ScopedTypeVariables #-}
6-
{-# LANGUAGE TypeApplications #-}
76

87
module Cardano.Wallet.UI.Deposit.Server
98
( serveUI
109
) where
1110

1211
import Prelude
1312

14-
import Cardano.Wallet.Api.Http.Server.Handlers.NetworkInformation
15-
( getNetworkInformation
16-
)
17-
import Cardano.Wallet.Api.Types
18-
( ApiWalletMode (..)
19-
)
2013
import Cardano.Wallet.Deposit.IO
2114
( WalletBootEnv (networkEnv)
2215
)
2316
import Cardano.Wallet.Deposit.REST
2417
( WalletResource
2518
)
26-
import Cardano.Wallet.Network
27-
( NetworkLayer
28-
)
29-
import Cardano.Wallet.Primitive.NetworkId
30-
( HasSNetworkId (..)
31-
, SNetworkId
32-
, networkIdVal
33-
)
34-
import Cardano.Wallet.Shelley.BlockchainSource
35-
( BlockchainSource (..)
36-
)
3719
import Cardano.Wallet.UI.Common.Handlers.Session
3820
( withSessionLayer
3921
, withSessionLayerRead
@@ -51,9 +33,6 @@ import Cardano.Wallet.UI.Common.Handlers.State
5133
import Cardano.Wallet.UI.Common.Html.Html
5234
( RawHtml (..)
5335
)
54-
import Cardano.Wallet.UI.Common.Html.Pages.Network
55-
( networkInfoH
56-
)
5736
import Cardano.Wallet.UI.Common.Html.Pages.Settings
5837
( settingsStateH
5938
)
@@ -67,7 +46,6 @@ import Cardano.Wallet.UI.Common.Layer
6746
import Cardano.Wallet.UI.Cookies
6847
( CookieResponse
6948
, RequestCookies
70-
, sessioning
7149
)
7250
import Cardano.Wallet.UI.Deposit.API
7351
( UI
@@ -78,7 +56,6 @@ import Cardano.Wallet.UI.Deposit.Handlers.Lib
7856
)
7957
import Cardano.Wallet.UI.Deposit.Html.Common
8058
( modalElementH
81-
, showTimeSecs
8259
)
8360
import Cardano.Wallet.UI.Deposit.Html.Pages.Page
8461
( Page (..)
@@ -149,32 +126,28 @@ import Servant.Types.SourceT
149126
( SourceT
150127
)
151128

152-
import qualified Cardano.Read.Ledger.Block.Block as Read
153-
154129
serveUI
155-
:: forall n
156-
. HasSNetworkId n
157-
=> Tracer IO ()
130+
:: Tracer IO ()
158131
-- ^ Tracer for wallet tip changes
159132
-> Tracer IO String
133+
-- ^ Tracer for logging
160134
-> UILayer WalletResource
135+
-- ^ UI layer
161136
-> WalletBootEnv IO
137+
-- ^ Wallet boot environment
162138
-> FilePath
139+
-- ^ Database directory
163140
-> PageConfig
164-
-> SNetworkId n
165-
-> NetworkLayer IO Read.ConsensusBlock
166-
-> BlockchainSource
141+
-- ^ Page configuration
167142
-> Server UI
168-
serveUI wtc tr ul env dbDir config nid nl bs =
143+
serveUI wtc tr ul env dbDir config =
169144
serveTabPage ul config Wallet
170145
:<|> serveTabPage ul config About
171-
:<|> serveTabPage ul config Network
172146
:<|> serveTabPage ul config Settings
173147
:<|> serveTabPage ul config Wallet
174148
:<|> serveTabPage ul config Addresses
175149
:<|> serveTabPage ul config Deposits
176150
:<|> serveTabPage ul config Payments
177-
:<|> serveNetworkInformation nid nl bs
178151
:<|> serveSSESettings ul
179152
:<|> serveToggleSSE ul
180153
:<|> serveSSE ul
@@ -236,24 +209,6 @@ serveNavigation ul mp = withSessionLayer ul $ \l -> do
236209
wp <- walletPresence l
237210
pure $ renderSmoothHtml $ headerElementH mp wp
238211

239-
serveNetworkInformation
240-
:: forall n
241-
. HasSNetworkId n
242-
=> SNetworkId n
243-
-> NetworkLayer IO Read.ConsensusBlock
244-
-> BlockchainSource
245-
-> Maybe RequestCookies
246-
-> Handler (CookieResponse RawHtml)
247-
serveNetworkInformation _ nl bs =
248-
sessioning
249-
$ renderSmoothHtml . networkInfoH showTimeSecs
250-
<$> getNetworkInformation nid nl mode
251-
where
252-
nid = networkIdVal (sNetworkId @n)
253-
mode = case bs of
254-
NodeSource{} -> Node
255-
_ = networkInfoH
256-
257212
serveSSESettings
258213
:: UILayer WalletResource
259214
-> Maybe RequestCookies

0 commit comments

Comments
 (0)