diff --git a/images/icons/v3/grid/grid.svg b/images/icons/v3/grid/grid.svg
index 07ac09dd02..5fc5598beb 100644
--- a/images/icons/v3/grid/grid.svg
+++ b/images/icons/v3/grid/grid.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/images/icons/v3/grid/overflow_view.svg b/images/icons/v3/grid/overflow_view.svg
deleted file mode 100644
index 31ed17fe09..0000000000
--- a/images/icons/v3/grid/overflow_view.svg
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/images/icons/v3/sidebar_view/sidebar_view.svg b/images/icons/v3/sidebar_view/sidebar_view.svg
new file mode 100644
index 0000000000..7b58d61460
--- /dev/null
+++ b/images/icons/v3/sidebar_view/sidebar_view.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/images/icons/v3/speaker_view/speaker_view.svg b/images/icons/v3/speaker_view/speaker_view.svg
index f173074eb6..551c521166 100644
--- a/images/icons/v3/speaker_view/speaker_view.svg
+++ b/images/icons/v3/speaker_view/speaker_view.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/stylesheets/components/CallSettingsButton.scss b/stylesheets/components/CallSettingsButton.scss
index 0ebc27488a..229a4cce8c 100644
--- a/stylesheets/components/CallSettingsButton.scss
+++ b/stylesheets/components/CallSettingsButton.scss
@@ -34,8 +34,10 @@
@include CallSettingsButton-icon('../images/icons/v3/x/x.svg');
}
-.CallSettingsButton__Icon--OverflowView {
- @include CallSettingsButton-icon('../images/icons/v3/grid/overflow_view.svg');
+.CallSettingsButton__Icon--SidebarView {
+ @include CallSettingsButton-icon(
+ '../images/icons/v3/sidebar_view/sidebar_view.svg'
+ );
}
.CallSettingsButton__Icon--PaginatedView {
diff --git a/ts/components/CallScreen.stories.tsx b/ts/components/CallScreen.stories.tsx
index 98fc8f65e6..760dbc1421 100644
--- a/ts/components/CallScreen.stories.tsx
+++ b/ts/components/CallScreen.stories.tsx
@@ -164,7 +164,7 @@ const createActiveCallProp = (
hasLocalAudio: overrideProps.hasLocalAudio ?? false,
hasLocalVideo: overrideProps.hasLocalVideo ?? false,
localAudioLevel: overrideProps.localAudioLevel ?? 0,
- viewMode: overrideProps.viewMode ?? CallViewMode.Overflow,
+ viewMode: overrideProps.viewMode ?? CallViewMode.Sidebar,
outgoingRing: true,
pip: false,
settingsDialogOpen: false,
@@ -450,7 +450,7 @@ export function GroupCallManyOverflow(): JSX.Element {
{...createProps({
callMode: CallMode.Group,
remoteParticipants: allRemoteParticipants,
- viewMode: CallViewMode.Overflow,
+ viewMode: CallViewMode.Sidebar,
})}
/>
);
@@ -461,7 +461,7 @@ export function GroupCallManyOverflowEveryoneTalking(): JSX.Element {
createProps({
callMode: CallMode.Group,
remoteParticipants: allRemoteParticipants,
- viewMode: CallViewMode.Overflow,
+ viewMode: CallViewMode.Sidebar,
})
);
@@ -668,7 +668,7 @@ export function GroupCallReactions(): JSX.Element {
createProps({
callMode: CallMode.Group,
remoteParticipants,
- viewMode: CallViewMode.Overflow,
+ viewMode: CallViewMode.Sidebar,
})
);
@@ -685,7 +685,7 @@ export function GroupCallReactionsSpam(): JSX.Element {
createProps({
callMode: CallMode.Group,
remoteParticipants,
- viewMode: CallViewMode.Overflow,
+ viewMode: CallViewMode.Sidebar,
})
);
@@ -703,7 +703,7 @@ export function GroupCallReactionsSkinTones(): JSX.Element {
createProps({
callMode: CallMode.Group,
remoteParticipants,
- viewMode: CallViewMode.Overflow,
+ viewMode: CallViewMode.Sidebar,
})
);
@@ -731,7 +731,7 @@ export function GroupCallReactionsManyInOrder(): JSX.Element {
createProps({
callMode: CallMode.Group,
remoteParticipants,
- viewMode: CallViewMode.Overflow,
+ viewMode: CallViewMode.Sidebar,
reactions,
})
);
@@ -790,7 +790,7 @@ export function GroupCallHandRaising(): JSX.Element {
createProps({
callMode: CallMode.Group,
remoteParticipants,
- viewMode: CallViewMode.Overflow,
+ viewMode: CallViewMode.Sidebar,
})
);
diff --git a/ts/components/CallingHeader.tsx b/ts/components/CallingHeader.tsx
index 920cd8ba3d..bb3002504e 100644
--- a/ts/components/CallingHeader.tsx
+++ b/ts/components/CallingHeader.tsx
@@ -48,10 +48,10 @@ export function CallingHeader({
value: CallViewMode.Paginated,
},
{
- icon: 'CallSettingsButton__Icon--OverflowView',
+ icon: 'CallSettingsButton__Icon--SidebarView',
label: i18n('icu:calling__view_mode--overflow'),
- onClick: () => changeCallView(CallViewMode.Overflow),
- value: CallViewMode.Overflow,
+ onClick: () => changeCallView(CallViewMode.Sidebar),
+ value: CallViewMode.Sidebar,
},
{
icon: 'CallSettingsButton__Icon--SpeakerView',
@@ -146,7 +146,7 @@ export function CallingHeader({
}
const CALL_VIEW_MODE_ICON_CLASSNAMES: Record = {
- [CallViewMode.Overflow]: 'CallSettingsButton__Icon--OverflowView',
+ [CallViewMode.Sidebar]: 'CallSettingsButton__Icon--SidebarView',
[CallViewMode.Paginated]: 'CallSettingsButton__Icon--PaginatedView',
[CallViewMode.Speaker]: 'CallSettingsButton__Icon--SpeakerView',
[CallViewMode.Presentation]: 'CallSettingsButton__Icon--SpeakerView',
diff --git a/ts/components/GroupCallRemoteParticipants.tsx b/ts/components/GroupCallRemoteParticipants.tsx
index 093e1ae9e5..9c8f20495f 100644
--- a/ts/components/GroupCallRemoteParticipants.tsx
+++ b/ts/components/GroupCallRemoteParticipants.tsx
@@ -229,7 +229,7 @@ export function GroupCallRemoteParticipants({
0
);
- // In speaker or overflow views, not all participants will be on the grid; they'll
+ // In speaker or sidebar views, not all participants will be on the grid; they'll
// get put in the overflow zone.
const overflowedParticipants: Array = useMemo(
() =>
diff --git a/ts/test-electron/state/ducks/calling_test.ts b/ts/test-electron/state/ducks/calling_test.ts
index e4da90ddda..8f9e32f648 100644
--- a/ts/test-electron/state/ducks/calling_test.ts
+++ b/ts/test-electron/state/ducks/calling_test.ts
@@ -2788,7 +2788,7 @@ describe('calling duck', () => {
it('switches to previously selected view after presentation', () => {
const stateOverflow = reducer(
stateWithActiveGroupCall,
- changeCallView(CallViewMode.Overflow)
+ changeCallView(CallViewMode.Sidebar)
);
const statePresentation = reducer(
stateOverflow,
@@ -2805,7 +2805,7 @@ describe('calling duck', () => {
);
assert.strictEqual(
stateAfterPresentation.activeCallState?.viewMode,
- CallViewMode.Overflow
+ CallViewMode.Sidebar
);
});
});
diff --git a/ts/types/Calling.ts b/ts/types/Calling.ts
index de75376add..28e3694f20 100644
--- a/ts/types/Calling.ts
+++ b/ts/types/Calling.ts
@@ -15,7 +15,7 @@ export const CALLING_REACTIONS_LIFETIME = 4000;
// once presentation is complete
export enum CallViewMode {
Paginated = 'Paginated',
- Overflow = 'Overflow',
+ Sidebar = 'Sidebar',
Speaker = 'Speaker',
Presentation = 'Presentation',
}