diff --git a/desktop/flipper-ui-core/src/chrome/VideoRecordingButton.tsx b/desktop/flipper-ui-core/src/chrome/VideoRecordingButton.tsx index 5d899238f..cdada365f 100644 --- a/desktop/flipper-ui-core/src/chrome/VideoRecordingButton.tsx +++ b/desktop/flipper-ui-core/src/chrome/VideoRecordingButton.tsx @@ -11,7 +11,7 @@ import React, {Component} from 'react'; import BaseDevice from '../devices/BaseDevice'; import {Button, Glyph, colors} from '../ui'; import path from 'path'; -import os from 'os'; +import {getRenderHostInstance} from '../RenderHost'; type OwnProps = { recordingFinished: (path: string | null) => void; @@ -41,7 +41,10 @@ export default class VideoRecordingButton extends Component { return; } - const flipperDirectory = path.join(os.homedir(), '.flipper'); + const flipperDirectory = path.join( + getRenderHostInstance().serverConfig.paths.homePath, + '.flipper', + ); const fileName = `screencap-${new Date() .toISOString() .replace(/:/g, '')}.mp4`; diff --git a/desktop/flipper-ui-core/src/fb-stubs/checkForUpdate.tsx b/desktop/flipper-ui-core/src/fb-stubs/checkForUpdate.tsx index d04305041..e24005e86 100644 --- a/desktop/flipper-ui-core/src/fb-stubs/checkForUpdate.tsx +++ b/desktop/flipper-ui-core/src/fb-stubs/checkForUpdate.tsx @@ -7,13 +7,13 @@ * @format */ -import os from 'os'; import {VersionCheckResult} from '../chrome/UpdateIndicator'; +import {getRenderHostInstance} from '../RenderHost'; const updateServer = 'https://www.facebook.com/fbflipper/public/latest.json'; const getPlatformSpecifier = (): string => { - switch (os.platform()) { + switch (getRenderHostInstance().serverConfig.environmentInfo.os.platform) { case 'win32': return 'windows'; case 'linux': diff --git a/desktop/flipper-ui-core/src/utils/exportData.tsx b/desktop/flipper-ui-core/src/utils/exportData.tsx index e36c9086e..596cbe501 100644 --- a/desktop/flipper-ui-core/src/utils/exportData.tsx +++ b/desktop/flipper-ui-core/src/utils/exportData.tsx @@ -8,7 +8,6 @@ */ import * as React from 'react'; -import os from 'os'; import path from 'path'; import {getLogger} from 'flipper-common'; import {Store, MiddlewareAPI} from '../reducers'; @@ -623,7 +622,10 @@ export function canFileExport() { export async function startFileExport(dispatch: Store['dispatch']) { const file = await getRenderHostInstance().showSaveDialog?.({ title: 'FlipperExport', - defaultPath: path.join(os.homedir(), 'FlipperExport.flipper'), + defaultPath: path.join( + getRenderHostInstance().serverConfig.paths.homePath, + 'FlipperExport.flipper', + ), }); if (!file) { return;