OBS 31.1.2 Merge

app/components-react/windows/go-live/platforms/TwitchEditStreamInfo.tsx

@@ -55,6 +55,10 @@ export function TwitchEditStreamInfo(p: IPlatformComponentParams<'twitch'>) {
     p.isStreamShiftMode,
   ]);
 
+  // Twitch enhanced broadcasting is only available on Windows and Apple Silicon Macs due to hardware encoding requirements
+  const isEnhancedBroadcastingVisible =
+    process.platform !== 'darwin' || (process.platform === 'darwin' && process.arch === 'arm64');
+
   const optionalFields = (
     <div key="optional">
       <TwitchTagsInput label={$t('Twitch Tags')} {...bind.tags} layout={p.layout} />
@@ -65,7 +69,7 @@ export function TwitchEditStreamInfo(p: IPlatformComponentParams<'twitch'>) {
       >
         <CheckboxInput label={$t('Stream features branded content')} {...bind.isBrandedContent} />
       </InputWrapper>
-      {process.platform !== 'darwin' && (
+      {isEnhancedBroadcastingVisible && (
         <InputWrapper
           layout={p.layout}
           className={cx(styles.twitchCheckbox, { [styles.hideLabel]: p.layout === 'vertical' })}

test/regular/obs-importer.ts

@@ -51,12 +51,6 @@ test('OBS Importer', async t => {
   await click('button=Continue');
   await click('button=Skip');
 
-  /*
-  await click('a=Login');
-  await isDisplayed('button=Log in with Twitch');
-  await click('button=Skip');
-  */
-
   await logIn(t, 'twitch', { prime: false }, false, true);
   await sleep(1000);
 
@@ -93,6 +87,11 @@ test('OBS Importer', async t => {
   // check that widgets have been migrated
   await focusMain();
   await switchCollection('Widgets');
+
+  // Without this sleep widgetsService might have empty widgetSources
+  // TODO: Certainly, there is a race condition that should be addressed.
+  await sleep(1000);
+
   const api = await getApiClient();
   const widgetsService = api.getResource<WidgetsService>('WidgetsService');