From 03a937aca9a1d28bd94f65a1fa45872be5a45fe8 Mon Sep 17 00:00:00 2001 From: GleidsonDaniel Date: Mon, 27 Dec 2021 14:31:12 -0300 Subject: [PATCH 1/3] chore: migrate userPreferents to ts --- .../{userPreferences.js => userPreferences.ts} | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) rename app/lib/{userPreferences.js => userPreferences.ts} (75%) diff --git a/app/lib/userPreferences.js b/app/lib/userPreferences.ts similarity index 75% rename from app/lib/userPreferences.js rename to app/lib/userPreferences.ts index 3377856d630..c8dae9adafe 100644 --- a/app/lib/userPreferences.js +++ b/app/lib/userPreferences.ts @@ -7,11 +7,12 @@ const MMKV = new MMKVStorage.Loader() .initialize(); class UserPreferences { + mmkv: MMKVStorage.API; constructor() { this.mmkv = MMKV; } - async getStringAsync(key) { + async getStringAsync(key: string) { try { const value = await this.mmkv.getStringAsync(key); return value; @@ -20,11 +21,11 @@ class UserPreferences { } } - setStringAsync(key, value) { + setStringAsync(key: string, value: string) { return this.mmkv.setStringAsync(key, value); } - async getBoolAsync(key) { + async getBoolAsync(key: string) { try { const value = await this.mmkv.getBoolAsync(key); return value; @@ -33,11 +34,11 @@ class UserPreferences { } } - setBoolAsync(key, value) { + setBoolAsync(key: string, value: boolean) { return this.mmkv.setBoolAsync(key, value); } - async getMapAsync(key) { + async getMapAsync(key: string) { try { const value = await this.mmkv.getMapAsync(key); return value; @@ -46,11 +47,11 @@ class UserPreferences { } } - setMapAsync(key, value) { + setMapAsync(key: string, value: object) { return this.mmkv.setMapAsync(key, value); } - removeItem(key) { + removeItem(key: string) { return this.mmkv.removeItem(key); } } From 62b323c7111be99efeb89d6e8ff1a2241967b44d Mon Sep 17 00:00:00 2001 From: GleidsonDaniel Date: Mon, 27 Dec 2021 14:32:34 -0300 Subject: [PATCH 2/3] fix: fix logic to browser const to remove null option --- app/views/DefaultBrowserView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/DefaultBrowserView.tsx b/app/views/DefaultBrowserView.tsx index 0282e0df29e..cfe977d2cd5 100644 --- a/app/views/DefaultBrowserView.tsx +++ b/app/views/DefaultBrowserView.tsx @@ -107,7 +107,7 @@ class DefaultBrowserView extends React.Component { logEvent(events.DB_CHANGE_DEFAULT_BROWSER, { browser: newBrowser }); try { - const browser = newBrowser !== 'systemDefault:' ? newBrowser : null; + const browser = newBrowser || 'systemDefault:'; await UserPreferences.setStringAsync(DEFAULT_BROWSER_KEY, browser); this.setState({ browser }); } catch { From 3ddd565b6e2e70d109be8fba305fbff7be568d5b Mon Sep 17 00:00:00 2001 From: Gleidson Daniel Silva Date: Wed, 29 Dec 2021 10:05:20 -0300 Subject: [PATCH 3/3] Update userPreferences.ts --- app/lib/userPreferences.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/userPreferences.ts b/app/lib/userPreferences.ts index c8dae9adafe..6f4818da63e 100644 --- a/app/lib/userPreferences.ts +++ b/app/lib/userPreferences.ts @@ -7,7 +7,7 @@ const MMKV = new MMKVStorage.Loader() .initialize(); class UserPreferences { - mmkv: MMKVStorage.API; + private mmkv: MMKVStorage.API; constructor() { this.mmkv = MMKV; }