Skip to content

Commit e854413

Browse files
committed
Delay showing RHS of top bar on desktop until sign in state decided.
1 parent 310935d commit e854413

File tree

1 file changed

+55
-47
lines changed

1 file changed

+55
-47
lines changed

dotcom-rendering/src/components/TopBar.importable.tsx

Lines changed: 55 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -147,61 +147,69 @@ export const TopBar = ({
147147
/>
148148
</TopBarLinkContainer>
149149

150-
<Hide until="desktop">
151-
<TopBarLinkContainer>
152-
<TopBarLink
153-
dataLinkName={nestedOphanComponents(
154-
'header',
155-
'topbar',
156-
'printsubs',
157-
)}
158-
href={printSubscriptionsHref}
159-
>
160-
Print subscriptions
161-
</TopBarLink>
162-
</TopBarLinkContainer>
163-
</Hide>
164-
165-
<Hide until="desktop">
166-
<TopBarLinkContainer>
167-
{
168-
/** We replace "Search jobs" with "Newsletters" for AU and US editions */
169-
['AU', 'US'].includes(editionId) ? (
150+
{authStatus.kind !== 'Pending' && (
151+
<>
152+
<Hide until="desktop">
153+
<TopBarLinkContainer>
170154
<TopBarLink
171155
dataLinkName={nestedOphanComponents(
172156
'header',
173157
'topbar',
174-
'newsletters',
158+
'printsubs',
175159
)}
176-
href="/email-newsletters"
160+
href={printSubscriptionsHref}
177161
>
178-
Newsletters
162+
Print subscriptions
179163
</TopBarLink>
180-
) : (
181-
<TopBarLink
182-
dataLinkName={nestedOphanComponents(
183-
'header',
184-
'topbar',
185-
'job-cta',
186-
)}
187-
href="https://jobs.theguardian.com"
188-
>
189-
Search jobs
190-
</TopBarLink>
191-
)
192-
}
193-
</TopBarLinkContainer>
194-
</Hide>
164+
</TopBarLinkContainer>
165+
</Hide>
195166

196-
<TopBarLinkContainer isLastChild={true}>
197-
<TopBarMyAccount
198-
mmaUrl={mmaUrl ?? 'https://manage.theguardian.com'}
199-
idUrl={idUrl ?? 'https://profile.theguardian.com'}
200-
discussionApiUrl={discussionApiUrl}
201-
idApiUrl={idApiUrl}
202-
authStatus={authStatus}
203-
/>
204-
</TopBarLinkContainer>
167+
<Hide until="desktop">
168+
<TopBarLinkContainer>
169+
{
170+
/** We replace "Search jobs" with "Newsletters" for AU and US editions */
171+
['AU', 'US'].includes(editionId) ? (
172+
<TopBarLink
173+
dataLinkName={nestedOphanComponents(
174+
'header',
175+
'topbar',
176+
'newsletters',
177+
)}
178+
href="/email-newsletters"
179+
>
180+
Newsletters
181+
</TopBarLink>
182+
) : (
183+
<TopBarLink
184+
dataLinkName={nestedOphanComponents(
185+
'header',
186+
'topbar',
187+
'job-cta',
188+
)}
189+
href="https://jobs.theguardian.com"
190+
>
191+
Search jobs
192+
</TopBarLink>
193+
)
194+
}
195+
</TopBarLinkContainer>
196+
</Hide>
197+
198+
<TopBarLinkContainer isLastChild={true}>
199+
<TopBarMyAccount
200+
mmaUrl={
201+
mmaUrl ?? 'https://manage.theguardian.com'
202+
}
203+
idUrl={
204+
idUrl ?? 'https://profile.theguardian.com'
205+
}
206+
discussionApiUrl={discussionApiUrl}
207+
idApiUrl={idApiUrl}
208+
authStatus={authStatus}
209+
/>
210+
</TopBarLinkContainer>
211+
</>
212+
)}
205213
</div>
206214
</Grid>
207215
);

0 commit comments

Comments
 (0)