Merge branch 'assistant' into assistant-longpolling-rewrite
This commit is contained in:
commit
2e54a611c7
1 changed files with 3 additions and 4 deletions
|
@ -164,11 +164,9 @@ transfersDisplay warnNoScript = do
|
|||
if null transfers
|
||||
then ifM (lift $ showIntro <$> getWebAppState)
|
||||
( introDisplay ident
|
||||
, noop
|
||||
, $(widgetFile "transfers")
|
||||
)
|
||||
else do
|
||||
lift $ modifyWebAppState $ \s -> s { showIntro = False }
|
||||
$(widgetFile "transfers")
|
||||
else $(widgetFile "transfers")
|
||||
|
||||
transfersDisplayIdent :: Text
|
||||
transfersDisplayIdent = "transfers"
|
||||
|
@ -189,6 +187,7 @@ introDisplay ident = do
|
|||
let barelyenough = n == 2
|
||||
let morethanenough = n > 2
|
||||
$(widgetFile "intro")
|
||||
lift $ modifyWebAppState $ \s -> s { showIntro = False }
|
||||
where
|
||||
counter = map show ([1..] :: [Int])
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue