Robosats/robosats
1
0
Fork 0
mirror of https://github.com/RoboSats/robosats.git synced 2025-08-05 11:20:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix load garage android (#372)

Browse Source 
* Refactor constructor

* Test
This commit is contained in:
Reckless_Satoshi
2023-03-03 16:54:03 +00:00
committed by GitHub
parent 74398a019c
commit 7f6b2bb79e
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/App.tsx
View File

@ -45,11 +45,7 @@ const App = (): JSX.Element => {
<ThemeProvider theme={theme}> <ThemeProvider theme={theme}>
<AppContextProvider settings={settings} setSettings={setSettings}> <AppContextProvider settings={settings} setSettings={setSettings}>
<CssBaseline /> <CssBaseline />
{window.NativeRobosats === undefined ? ( {window.NativeRobosats === undefined ? <UnsafeAlert /> : <TorConnectionBadge />}
<UnsafeAlert settings={settings} setSettings={setSettings} />
) : (
<TorConnectionBadge />
)}
<Main /> <Main />
</AppContextProvider> </AppContextProvider>
</ThemeProvider> </ThemeProvider>

7
frontend/src/models/Garage.model.ts
View File

@ -10,13 +10,14 @@ const emptySlot: Slot = { robot: new Robot(), order: null };
class Garage { class Garage {
constructor(initialState?: Garage) { constructor(initialState?: Garage) {
if (initialState?.slots === undefined && systemClient.getItem('garage') != '') { const slotsDump: string | undefined = systemClient.getItem('garage');
this.slots = JSON.parse(systemClient.getItem('garage')); if (initialState?.slots === undefined && slotsDump != '') {
this.slots = JSON.parse(slotsDump);
console.log('Robot Garage was loaded from local storage'); console.log('Robot Garage was loaded from local storage');
} else { } else {
this.slots = [emptySlot]; this.slots = [emptySlot];
} }
this.setGarage = initialState?.setGarage != null || (() => {}); this.setGarage = initialState?.setGarage || (() => {});
} }
slots: Slot[] = [emptySlot]; slots: Slot[] = [emptySlot];

4
mobile/App.tsx
View File

@ -45,13 +45,11 @@ const App = () => {
EncryptedStorage.removeItem('sessionid'); EncryptedStorage.removeItem('sessionid');
EncryptedStorage.removeItem('csrftoken'); EncryptedStorage.removeItem('csrftoken');
loadCookie('robot_token');
loadCookie('pub_key');
loadCookie('settings_fontsize_basic'); loadCookie('settings_fontsize_basic');
loadCookie('settings_language'); loadCookie('settings_language');
loadCookie('settings_mode'); loadCookie('settings_mode');
loadCookie('settings_network'); loadCookie('settings_network');
loadCookie('enc_priv_key').then(() => injectMessageResolve(reponseId)); loadCookie('garage').then(() => injectMessageResolve(reponseId));
}; };
const onMessage = async (event: WebViewMessageEvent) => { const onMessage = async (event: WebViewMessageEvent) => {