@@ -3,8 +3,6 @@ import * as React from 'react'
33import { assertNever } from '../../lib/fatal-error'
44
55import { Banner , BannerType } from '../../models/banner'
6- import { PopupType } from '../../models/popup'
7- import { PreferencesTab } from '../../models/preferences'
86
97import { Dispatcher } from '../dispatcher'
108import { MergeConflictsBanner } from './merge-conflicts-banner'
@@ -21,7 +19,7 @@ import { SuccessfulSquash } from './successful-squash'
2119import { SuccessBanner } from './success-banner'
2220import { ConflictsFoundBanner } from './conflicts-found-banner'
2321import { OSVersionNoLongerSupportedBanner } from './os-version-no-longer-supported-banner'
24- import { LinkButton } from '../lib/link-button '
22+ import { WorktreesEnabledBanner } from './worktrees-enabled-banner '
2523
2624export function renderBanner (
2725 banner : Banner ,
@@ -174,31 +172,14 @@ export function renderBanner(
174172 )
175173 case BannerType . OSVersionNoLongerSupported :
176174 return < OSVersionNoLongerSupportedBanner onDismissed = { onDismissed } />
177- case BannerType . WorktreesEnabled : {
178- const label = __DARWIN__
179- ? 'Appearance Settings'
180- : 'Appearance Options'
175+ case BannerType . WorktreesEnabled :
181176 return (
182- < SuccessBanner
183- key = "worktrees-enabled"
184- timeout = { 8000 }
177+ < WorktreesEnabledBanner
178+ dispatcher = { dispatcher }
185179 onDismissed = { onDismissed }
186- >
187- Worktrees enabled. You can change this in{ ' ' }
188- < LinkButton
189- onClick = { ( ) =>
190- dispatcher . showPopup ( {
191- type : PopupType . Preferences ,
192- initialSelectedTab : PreferencesTab . Appearance ,
193- } )
194- }
195- >
196- { label }
197- </ LinkButton >
198- .
199- </ SuccessBanner >
180+ key = { 'worktrees-enabled' }
181+ />
200182 )
201- }
202183 default :
203184 return assertNever ( banner , `Unknown popup type: ${ banner } ` )
204185 }
0 commit comments