Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/slimy-readers-refuse.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@ledgerhq/live-countervalues-react": patch
"live-mobile": patch
---

Fix clearing cache crashes on Android
7 changes: 3 additions & 4 deletions apps/ledger-live-mobile/src/context/Reboot.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Fragment, useContext, useCallback, useState } from "react";
import { useCountervaluesWipeIfAvailable } from "@ledgerhq/live-countervalues-react";
import hoistNonReactStatic from "hoist-non-react-statics";
import { useCountervaluesPolling } from "@ledgerhq/live-countervalues-react";
import React, { Fragment, useCallback, useContext, useState } from "react";
import { clearDb } from "../db";

export type RebootFunc = (_?: boolean) => Promise<void>;
Expand All @@ -17,8 +17,7 @@ export default function RebootProvider({
children: React.ReactNode;
}) {
const [rebootId, setRebootId] = useState(0);
// TODO decouple countervalues state from polling actions so that RebootProvider can be moved back to the root of the Provider tree.
const { wipe } = useCountervaluesPolling();
const wipe = useCountervaluesWipeIfAvailable();
const reboot: RebootFunc = useCallback(
async (resetData = false) => {
if (onRebootStart) onRebootStart();
Expand Down
94 changes: 47 additions & 47 deletions apps/ledger-live-mobile/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -303,58 +303,58 @@ export default class Root extends Component {

render() {
return (
<LedgerStoreProvider onInitFinished={this.onInitFinished} store={store}>
{(ready, initialCountervalues) =>
ready ? (
<>
<SetEnvsFromSettings />
{/* TODO: delete the following HookSentry when Sentry will be completelyy switched off */}
<HookSentry />
<SegmentSetup />
<HookNotifications />
<HookDynamicContentCards />
<TermsAndConditionMigrateLegacyData />
<QueuedDrawersContextProvider>
<FirebaseRemoteConfigProvider>
<FirebaseFeatureFlagsProvider getFeature={getFeature}>
<I18nextProvider i18n={i18n}>
<LocaleProvider>
<PlatformAppProviderWrapper>
<SafeAreaProvider>
<PerformanceProvider>
<StorylyProvider>
<StylesProvider>
<StyledStatusBar />
<NavBarColorHandler />
<AuthPass>
<GestureHandlerRootView style={styles.root}>
<AppProviders initialCountervalues={initialCountervalues}>
<RebootProvider onRebootStart={this.onRebootStart}>
<RebootProvider onRebootStart={this.onRebootStart}>
<LedgerStoreProvider onInitFinished={this.onInitFinished} store={store}>
{(ready, initialCountervalues) =>
ready ? (
<>
<SetEnvsFromSettings />
{/* TODO: delete the following HookSentry when Sentry will be completelyy switched off */}
<HookSentry />
<SegmentSetup />
<HookNotifications />
<HookDynamicContentCards />
<TermsAndConditionMigrateLegacyData />
<QueuedDrawersContextProvider>
<FirebaseRemoteConfigProvider>
<FirebaseFeatureFlagsProvider getFeature={getFeature}>
<I18nextProvider i18n={i18n}>
<LocaleProvider>
<PlatformAppProviderWrapper>
<SafeAreaProvider>
<PerformanceProvider>
<StorylyProvider>
<StylesProvider>
<StyledStatusBar />
<NavBarColorHandler />
<AuthPass>
<GestureHandlerRootView style={styles.root}>
<AppProviders initialCountervalues={initialCountervalues}>
<AppGeoBlocker>
<AppVersionBlocker>
<App />
</AppVersionBlocker>
</AppGeoBlocker>
</RebootProvider>
</AppProviders>
</GestureHandlerRootView>
</AuthPass>
</StylesProvider>
</StorylyProvider>
</PerformanceProvider>
</SafeAreaProvider>
</PlatformAppProviderWrapper>
</LocaleProvider>
</I18nextProvider>
</FirebaseFeatureFlagsProvider>
</FirebaseRemoteConfigProvider>
</QueuedDrawersContextProvider>
</>
) : (
<LoadingApp />
)
}
</LedgerStoreProvider>
</AppProviders>
</GestureHandlerRootView>
</AuthPass>
</StylesProvider>
</StorylyProvider>
</PerformanceProvider>
</SafeAreaProvider>
</PlatformAppProviderWrapper>
</LocaleProvider>
</I18nextProvider>
</FirebaseFeatureFlagsProvider>
</FirebaseRemoteConfigProvider>
</QueuedDrawersContextProvider>
</>
) : (
<LoadingApp />
)
}
</LedgerStoreProvider>
</RebootProvider>
);
}
}
11 changes: 11 additions & 0 deletions libs/live-countervalues-react/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,17 @@ export function useCountervaluesState(): CounterValuesState {
return useCountervaluesBridgeContext().useState();
}

export function useCountervaluesWipeIfAvailable(): () => void {
const bridge = useContext(CountervaluesContext);
return useCallback(() => {
if (!bridge) {
console.warn("'CountervaluesContext' is not provided, cannot wipe countervalues state.");
return;
}
bridge.wipe();
}, [bridge]);
}

/** Allows consumer to access the countervalues polling control object */
export function useCountervaluesPolling(): Polling {
const bridge = useCountervaluesBridgeContext();
Expand Down
Loading