diff --git a/bin/solid.pill b/bin/solid.pill index b3218cb318..25d345926d 100644 --- a/bin/solid.pill +++ b/bin/solid.pill @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a5a96460c864525f0a31cf5518bbc67f0b298fe637b461abdf4868ec5da83e6 -size 9537961 +oid sha256:b99c4ea8e73d810e4e8b515a662cdd36933affbed47c461fe4258dcdb3b656b1 +size 9601365 diff --git a/pkg/arvo/app/glob.hoon b/pkg/arvo/app/glob.hoon index c038346c1c..a31a1a88db 100644 --- a/pkg/arvo/app/glob.hoon +++ b/pkg/arvo/app/glob.hoon @@ -5,7 +5,7 @@ /- glob /+ default-agent, verb, dbug |% -++ hash 0v2.gfefu.pffjo.rphqi.mlmpu.smaq4 +++ hash 0v3.nmpms.bgjpu.9gd2j.klgii.qgeal +$ state-0 [%0 hash=@uv glob=(unit (each glob:glob tid=@ta))] +$ all-states $% state-0 diff --git a/pkg/arvo/app/landscape/index.html b/pkg/arvo/app/landscape/index.html index 1f0cd0626a..8b034c3c9e 100644 --- a/pkg/arvo/app/landscape/index.html +++ b/pkg/arvo/app/landscape/index.html @@ -24,6 +24,6 @@
- + diff --git a/pkg/interface/src/views/apps/chat/components/ChatWindow.tsx b/pkg/interface/src/views/apps/chat/components/ChatWindow.tsx index 6a838fe96c..d8af2d0783 100644 --- a/pkg/interface/src/views/apps/chat/components/ChatWindow.tsx +++ b/pkg/interface/src/views/apps/chat/components/ChatWindow.tsx @@ -98,6 +98,10 @@ class ChatWindow extends Component< calculateUnreadIndex() { const { graph, unreadCount } = this.props; + const { state } = this; + if(state.unreadIndex.neq(bigInt.zero)) { + return; + } const unreadIndex = graph.keys()[unreadCount]; if (!unreadIndex || unreadCount === 0) { this.setState({ @@ -110,6 +114,11 @@ class ChatWindow extends Component< }); } + dismissedInitialUnread() { + const { unreadCount, graph } = this.props; + return this.state.unreadIndex.neq(graph.keys()?.[unreadCount]?.[0] ?? bigInt.zero) + } + handleWindowBlur() { this.setState({ idle: true }); } @@ -126,6 +135,10 @@ class ChatWindow extends Component< if(this.prevSize !== graphSize) { this.prevSize = graphSize; + if(this.dismissedInitialUnread() && + this.virtualList?.startOffset() < 5) { + this.dismissUnread(); + } if(this.state.unreadIndex.eq(bigInt.zero)) { this.calculateUnreadIndex(); } @@ -305,7 +318,8 @@ class ChatWindow extends Component< return ( - + />)} { this.virtualList = list;