diff --git a/src/status_im2/contexts/chat/messages/navigation/view.cljs b/src/status_im2/contexts/chat/messages/navigation/view.cljs index 8b33a4826fea..5c7418f3e97e 100644 --- a/src/status_im2/contexts/chat/messages/navigation/view.cljs +++ b/src/status_im2/contexts/chat/messages/navigation/view.cljs @@ -36,17 +36,18 @@ more-than-seven-messages? (<= 7 (count messages))] (rn/use-effect (fn [] - (if (or - (and (not composer-active?) - more-than-seven-messages? - (= :initial-render @big-name-visible?)) - (and more-than-two-messages? - (< title-opacity-interpolation-start (reanimated/get-shared-value scroll-y)) - composer-active?) - (and more-than-two-messages? - composer-active?) - @animate-topbar-name? - @animate-topbar-opacity?) + (if (when (and @on-end-reached? (not composer-active?)) + (or + (and (not composer-active?) + more-than-seven-messages? + (= :initial-render @big-name-visible?)) + (and more-than-two-messages? + (< title-opacity-interpolation-start (reanimated/get-shared-value scroll-y)) + composer-active?) + (and more-than-two-messages? + composer-active?) + @animate-topbar-name? + @animate-topbar-opacity?)) (do (reanimated/animate title-opacity-animation 1) (reanimated/animate opacity-animation 1)