Skip to content

Commit ee547c4

Browse files
authored
Merge pull request #105 from blacksky-algorithms/fix/post-merge-regressions
fix: restore /support nav, go.blacksky.community shortener, 'What's poppin'?' composer copy
2 parents 3ddcef7 + 8d1eea1 commit ee547c4

4 files changed

Lines changed: 18 additions & 3 deletions

File tree

src/analytics/metrics/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ export type Events = {
133133
| 'lists'
134134
| 'saved'
135135
| 'settings'
136+
| 'support'
136137
| 'menu'
137138
surface: 'bottomBar' | 'drawer' | 'drawerHeader' | 'topBar' | 'leftNav'
138139
}

src/lib/strings/url-helpers.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,11 +361,11 @@ export function createProxiedUrl(url: string): string {
361361
return url
362362
}
363363

364-
return `https://go.bsky.app/redirect?u=${encodeURIComponent(url)}`
364+
return `https://go.blacksky.community/redirect?u=${encodeURIComponent(url)}`
365365
}
366366

367367
export function isShortLink(url: string): boolean {
368-
return url.startsWith('https://go.bsky.app/')
368+
return url.startsWith('https://go.blacksky.community/')
369369
}
370370

371371
export function shortLinkToHref(url: string): string {

src/view/com/composer/Composer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1516,7 +1516,7 @@ let ComposerPost = memo(function ComposerPost({
15161516
? isFirstPost
15171517
? l`Write your reply`
15181518
: l`Add another post`
1519-
: l`What's up?`
1519+
: l`What's poppin'?`
15201520
const discardPromptControl = Prompt.usePromptControl()
15211521

15221522
const dispatchPost = useCallback(

src/view/shell/desktop/LeftNav.tsx

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ import {
5757
Hashtag_Filled_Corner0_Rounded as HashtagFilledIcon,
5858
Hashtag_Stroke2_Corner0_Rounded as HashtagIcon,
5959
} from '#/components/icons/Hashtag'
60+
import {
61+
Heart2_Filled_Stroke2_Corner0_Rounded as HeartFilledIcon,
62+
Heart2_Stroke2_Corner0_Rounded as HeartIcon,
63+
} from '#/components/icons/Heart2'
6064
import {
6165
HomeOpen_Filled_Corner0_Rounded as HomeFilledIcon,
6266
HomeOpen_Stoke2_Corner0_Rounded as HomeIcon,
@@ -756,6 +760,16 @@ export function DesktopLeftNav({routeName}: {routeName: string}) {
756760
active: SettingsFilledIcon,
757761
}}
758762
/>
763+
<NavItem
764+
label={l`Support`}
765+
href="/support"
766+
navItem="support"
767+
minimal={leftNavMinimal}
768+
icons={{
769+
inactive: HeartIcon,
770+
active: HeartFilledIcon,
771+
}}
772+
/>
759773

760774
<ComposeBtn minimal={leftNavMinimal} />
761775
</>

0 commit comments

Comments
 (0)