diff --git a/desktop/flipper-ui-browser/src/HMRClient.tsx b/desktop/flipper-ui-browser/src/HMRClient.tsx index f4de7d9b1..ad76b730e 100644 --- a/desktop/flipper-ui-browser/src/HMRClient.tsx +++ b/desktop/flipper-ui-browser/src/HMRClient.tsx @@ -270,7 +270,7 @@ function showCompileError() { // Symbolicating compile errors is wasted effort // because the stack trace is meaningless: (error as any).preventSymbolication = true; - window.flipperShowError?.(message); + window.flipperShowMessage?.(message); throw error; } diff --git a/desktop/flipper-ui-browser/src/global.tsx b/desktop/flipper-ui-browser/src/global.tsx index f927c0c4b..21158a317 100644 --- a/desktop/flipper-ui-browser/src/global.tsx +++ b/desktop/flipper-ui-browser/src/global.tsx @@ -17,7 +17,8 @@ declare global { debug: boolean; }; - flipperShowError?(error: string): void; - flipperHideError?(): void; + flipperShowMessage?(message: string): void; + flipperHideMessage?(): void; + flipperShowNoConnection?(): void; } } diff --git a/desktop/flipper-ui-browser/src/index.tsx b/desktop/flipper-ui-browser/src/index.tsx index f836700b5..164e1bf39 100644 --- a/desktop/flipper-ui-browser/src/index.tsx +++ b/desktop/flipper-ui-browser/src/index.tsx @@ -47,13 +47,13 @@ async function start() { (state: FlipperServerState) => { switch (state) { case FlipperServerState.CONNECTING: - window.flipperShowError?.('Connecting to server...'); + window.flipperShowMessage?.('Connecting to server...'); break; case FlipperServerState.CONNECTED: - window?.flipperHideError?.(); + window?.flipperHideMessage?.(); break; case FlipperServerState.DISCONNECTED: - window?.flipperShowError?.('Lost connection to server'); + window?.flipperShowNoConnection?.(); break; } }, @@ -78,17 +78,17 @@ async function start() { // This prevent issues where the render host is referred at module initialisation level, // but not set yet, which might happen when using normal imports. // TODO: remove - window.flipperShowError?.('Connected to Flipper Server successfully'); + window.flipperShowMessage?.('Connected to Flipper Server successfully'); // @ts-ignore // eslint-disable-next-line import/no-commonjs require('flipper-ui-core').startFlipperDesktop(flipperServer); - window.flipperHideError?.(); + window.flipperHideMessage?.(); } start().catch((e) => { console.error('Failed to start flipper-ui-browser', e); - window.flipperShowError?.('Failed to start flipper-ui-browser: ' + e); + window.flipperShowMessage?.('Failed to start flipper-ui-browser: ' + e); }); async function initializePWA() { diff --git a/desktop/flipper-ui-browser/src/initializeRenderHost.tsx b/desktop/flipper-ui-browser/src/initializeRenderHost.tsx index 4decaff5f..3e82cc1ce 100644 --- a/desktop/flipper-ui-browser/src/initializeRenderHost.tsx +++ b/desktop/flipper-ui-browser/src/initializeRenderHost.tsx @@ -169,7 +169,7 @@ export function initializeRenderHost( ); }, restartFlipper() { - window.flipperShowError?.( + window.flipperShowMessage?.( 'Flipper settings have changed, please restart flipper server for the changes to take effect', ); }, diff --git a/desktop/static/index.web.dev.html b/desktop/static/index.web.dev.html index 8d27031d5..b90fee0e4 100644 --- a/desktop/static/index.web.dev.html +++ b/desktop/static/index.web.dev.html @@ -21,7 +21,7 @@ }
+ +