Merge branch 'main' into HEAD

This commit is contained in:
Scott Nonnenberg 2024-07-30 15:53:28 -07:00
commit fed6bbfc8b
1127 changed files with 263697 additions and 302446 deletions

View file

@ -154,7 +154,6 @@ const useProps = (overrideProps: OverridePropsType = {}): PropsType => {
i18n,
isMacOS: false,
preferredWidthFromStorage: 320,
regionCode: 'US',
challengeStatus: 'idle',
crashReportCount: 0,
@ -204,6 +203,7 @@ const useProps = (overrideProps: OverridePropsType = {}): PropsType => {
i18n={i18n}
socketStatus={SocketStatus.CLOSED}
isOnline={false}
isOutage={false}
manualReconnect={action('manualReconnect')}
{...overrideProps.dialogNetworkStatus}
{...props}
@ -267,6 +267,7 @@ const useProps = (overrideProps: OverridePropsType = {}): PropsType => {
toast={undefined}
megaphone={undefined}
containerWidthBreakpoint={containerWidthBreakpoint}
isInFullScreenCall={false}
/>
),
selectedConversationId: undefined,