Skip to content

Commit f6694d0

Browse files
committed
Use title instead of value
1 parent 31b79b7 commit f6694d0

File tree

2 files changed

+23
-14
lines changed

2 files changed

+23
-14
lines changed

app/lib/methods/helpers/openLink.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ const appSchemeURL = (url: string, browser: string): string => {
2323
const { protocol } = parsedUrl;
2424
const isSecure = ['https:'].includes(protocol);
2525

26-
if (browser === 'googlechrome') {
26+
if (browser === 'Chrome') {
2727
if (!isSecure) {
2828
schemeUrl = url.replace(protocol, scheme.chrome);
2929
} else {
3030
schemeUrl = url.replace(protocol, scheme.chromeSecure);
3131
}
32-
} else if (browser === 'firefox') {
32+
} else if (browser === 'Firefox') {
3333
schemeUrl = `${scheme.firefox}//open-url?url=${url}`;
34-
} else if (browser === 'brave') {
34+
} else if (browser === 'Brave') {
3535
schemeUrl = `${scheme.brave}//open-url?url=${url}`;
3636
}
3737

@@ -52,7 +52,7 @@ const openLink = async (url: string, theme: TSupportedThemes = 'light'): Promise
5252
url = ensureSecureProtocol(url);
5353
try {
5454
const browser = UserPreferences.getString(DEFAULT_BROWSER_KEY);
55-
if (browser === 'inApp') {
55+
if (browser === 'In_app') {
5656
await WebBrowser.openBrowserAsync(url, {
5757
toolbarColor: themes[theme].surfaceNeutral,
5858
controlsColor: themes[theme].fontSecondaryInfo,

app/views/DefaultBrowserView/index.tsx

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ import SafeAreaView from '../../containers/SafeAreaView';
1010
import UserPreferences from '../../lib/methods/userPreferences';
1111
import { events, logEvent } from '../../lib/methods/helpers/log';
1212

13-
export type TType = 'In_app' | 'System_default' | 'Chrome' | 'Firefox' | 'Brave';
1413
export type TValue = 'inApp' | 'systemDefault:' | 'googlechrome:' | 'firefox:' | 'brave:';
1514

1615
export interface IBrowsersValues {
17-
title: TType;
16+
title: string;
1817
value: TValue;
1918
}
2019

@@ -26,6 +25,18 @@ const DEFAULT_BROWSERS: IBrowsersValues[] = [
2625
{
2726
title: 'System_default',
2827
value: 'systemDefault:'
28+
},
29+
{
30+
title: 'Chrome',
31+
value: 'googlechrome:'
32+
},
33+
{
34+
title: 'Firefox',
35+
value: 'firefox:'
36+
},
37+
{
38+
title: 'Brave',
39+
value: 'brave:'
2940
}
3041
];
3142

@@ -72,14 +83,12 @@ const DefaultBrowserView = () => {
7283
}
7384
}, []);
7485

75-
const changeDefaultBrowser = useCallback((value: TType) => {
76-
const newBrowser =
77-
DEFAULT_BROWSERS.find(x => x.title === value)?.value || BROWSERS.find(x => x.title === value)?.value || 'systemDefault:';
78-
86+
const changeDefaultBrowser = useCallback((newBrowser: TValue) => {
7987
logEvent(events.DB_CHANGE_DEFAULT_BROWSER, { browser: newBrowser });
8088
try {
81-
UserPreferences.setString(DEFAULT_BROWSER_KEY, newBrowser);
82-
setBrowser(newBrowser);
89+
const browser = newBrowser || 'systemDefault:';
90+
UserPreferences.setString(DEFAULT_BROWSER_KEY, browser);
91+
setBrowser(browser);
8392
} catch {
8493
logEvent(events.DB_CHANGE_DEFAULT_BROWSER_F);
8594
}
@@ -92,7 +101,7 @@ const DefaultBrowserView = () => {
92101
contentContainerStyle={List.styles.contentContainerStyleFlatList}
93102
renderItem={({ item }) => (
94103
<List.Radio
95-
isSelected={(!browser && item.value === 'systemDefault:') || item.value === browser}
104+
isSelected={(!browser && item.value === 'systemDefault:') || item.title === browser}
96105
title={item.title}
97106
value={item.value}
98107
translateTitle={['In_app', 'System_default'].includes(item.title)}
@@ -114,4 +123,4 @@ const DefaultBrowserView = () => {
114123
);
115124
};
116125

117-
export default DefaultBrowserView;
126+
export default DefaultBrowserView;

0 commit comments

Comments
 (0)