diff --git a/src/Simplex/Chat.hs b/src/Simplex/Chat.hs index 2e1d427af..d96baba18 100644 --- a/src/Simplex/Chat.hs +++ b/src/Simplex/Chat.hs @@ -2857,7 +2857,7 @@ processAgentMsgRcvFile _corrId aFileId msg = liftIO $ updateFileCancelled db user fileId CIFSRcvError getChatItemByFileId db user fileId agentXFTPDeleteRcvFile aFileId fileId - toView $ CRRcvFileError user ci + toView $ CRRcvFileError user ci e processAgentMessageConn :: forall m. ChatMonad m => User -> ACorrId -> ConnId -> ACommand 'Agent 'AEConn -> m () processAgentMessageConn user _ agentConnId END = diff --git a/src/Simplex/Chat/Controller.hs b/src/Simplex/Chat/Controller.hs index af9aa964c..b2403e858 100644 --- a/src/Simplex/Chat/Controller.hs +++ b/src/Simplex/Chat/Controller.hs @@ -506,7 +506,7 @@ data ChatResponse | CRRcvFileComplete {user :: User, chatItem :: AChatItem} | CRRcvFileCancelled {user :: User, chatItem :: AChatItem, rcvFileTransfer :: RcvFileTransfer} | CRRcvFileSndCancelled {user :: User, chatItem :: AChatItem, rcvFileTransfer :: RcvFileTransfer} - | CRRcvFileError {user :: User, chatItem :: AChatItem} + | CRRcvFileError {user :: User, chatItem :: AChatItem, agentError :: AgentErrorType} | CRSndFileStart {user :: User, chatItem :: AChatItem, sndFileTransfer :: SndFileTransfer} | CRSndFileComplete {user :: User, chatItem :: AChatItem, sndFileTransfer :: SndFileTransfer} | CRSndFileRcvCancelled {user :: User, chatItem :: AChatItem, sndFileTransfer :: SndFileTransfer} diff --git a/src/Simplex/Chat/View.hs b/src/Simplex/Chat/View.hs index ce3da51c8..65e90c096 100644 --- a/src/Simplex/Chat/View.hs +++ b/src/Simplex/Chat/View.hs @@ -178,7 +178,7 @@ responseToView user_ ChatConfig {logLevel, showReactions, showReceipts, testView CRRcvFileStart u ci -> ttyUser u $ receivingFile_' "started" ci CRRcvFileComplete u ci -> ttyUser u $ receivingFile_' "completed" ci CRRcvFileSndCancelled u _ ft -> ttyUser u $ viewRcvFileSndCancelled ft - CRRcvFileError u ci -> ttyUser u $ receivingFile_' "error" ci + CRRcvFileError u ci e -> ttyUser u $ receivingFile_' "error" ci <> [sShow e] CRSndFileStart u _ ft -> ttyUser u $ sendingFile_ "started" ft CRSndFileComplete u _ ft -> ttyUser u $ sendingFile_ "completed" ft CRSndFileStartXFTP {} -> [] diff --git a/tests/ChatTests/Files.hs b/tests/ChatTests/Files.hs index 927705f4d..9b4c46672 100644 --- a/tests/ChatTests/Files.hs +++ b/tests/ChatTests/Files.hs @@ -1368,6 +1368,7 @@ testXFTPRcvError tmp = do "started receiving file 1 (test.pdf) from alice" ] bob <## "error receiving file 1 (test.pdf) from alice" + _ <- getTermLine bob bob ##> "/fs 1" bob <## "receiving file 1 (test.pdf) error"