Fix import and naming

react/features/filmstrip/components/web/Thumbnail.js

@@ -43,11 +43,11 @@ import {
     computeDisplayModeFromInput,
     getActiveParticipantsIds,
     getDisplayModeInput,
+    getThumbnailTypeFromLayout,
     isVideoPlayable,
-    showGridInVerticalView,
-    isStageFilmstripAvailable
+    isStageFilmstripAvailable,
+    showGridInVerticalView
 } from '../../functions';
-import { getThumbnailTypeFromLayout } from '../../functions.web';
 
 import FakeScreenShareParticipant from './FakeScreenShareParticipant';
 import ThumbnailAudioIndicator from './ThumbnailAudioIndicator';

react/features/filmstrip/functions.native.js

@@ -120,12 +120,3 @@ export function isStageFilmstripAvailable() {
 export function isStageFilmstripEnabled() {
     return false;
 }
-
-/**
- * Whether the stage filmstrip should be displayed or not.
- *
- * @returns {boolean}
- */
-export function shouldDisplayStageFilmstrip() {
-    return false;
-}

react/features/filmstrip/functions.web.js

@@ -722,16 +722,6 @@ export function isStageFilmstripAvailable(state, minParticipantCount = 0) {
         && activeParticipants.length >= minParticipantCount;
 }
 
-/**
- * Get whether or not the stage filmstrip should be displayed.
- *
- * @param {Object} state - Redux state.
- * @returns {boolean}
- */
-export function shouldDisplayStageFilmstrip(state) {
-    return isStageFilmstripAvailable(state, 2);
-}
-
 /**
  * Whether the stage filmstrip is disabled or not.
  *

react/features/filmstrip/subscriber.web.js

@@ -12,12 +12,12 @@ import { setOverflowDrawer } from '../toolbox/actions.web';
 import { getCurrentLayout, shouldDisplayTileView, LAYOUTS } from '../video-layout';
 
 import {
+    clearStageParticipants,
     setHorizontalViewDimensions,
     setStageFilmstripViewDimensions,
     setTileViewDimensions,
     setVerticalViewDimensions
 } from './actions';
-import { clearStageParticipants } from './actions.web';
 import {
     ASPECT_RATIO_BREAKPOINT,
     DISPLAY_DRAWER_THRESHOLD

react/features/large-video/actions.any.js

@@ -9,7 +9,7 @@ import {
     getPinnedParticipant,
     getRemoteParticipants
 } from '../base/participants';
-import { isStageFilmstripAvailable, shouldDisplayStageFilmstrip } from '../filmstrip/functions';
+import { isStageFilmstripAvailable } from '../filmstrip/functions';
 
 import {
     SELECT_LARGE_VIDEO_PARTICIPANT,
@@ -30,7 +30,7 @@ export function selectParticipantInLargeVideo(participant: ?string) {
     return (dispatch: Dispatch<any>, getState: Function) => {
         const state = getState();
 
-        if (shouldDisplayStageFilmstrip(state)) {
+        if (isStageFilmstripAvailable(state, 2)) {
             return;
         }
 

react/features/video-layout/functions.any.js

@@ -7,7 +7,7 @@ import {
     getParticipantCount,
     pinParticipant
 } from '../base/participants';
-import { shouldDisplayStageFilmstrip } from '../filmstrip/functions.web';
+import { isStageFilmstripAvailable } from '../filmstrip/functions';
 import { isVideoPlaying } from '../shared-video/functions';
 import { VIDEO_QUALITY_LEVELS } from '../video-quality/constants';
 
@@ -41,7 +41,7 @@ export function getCurrentLayout(state: Object) {
     if (shouldDisplayTileView(state)) {
         return LAYOUTS.TILE_VIEW;
     } else if (interfaceConfig.VERTICAL_FILMSTRIP) {
-        if (shouldDisplayStageFilmstrip(state)) {
+        if (isStageFilmstripAvailable(state, 2)) {
             return LAYOUTS.STAGE_FILMSTRIP_VIEW;
         }