Show AppLoader on first paint before the license resolver kicks in

Author: pauloiankoski

resources/js/context/harbor-data-context.tsx

@@ -83,7 +83,11 @@ export function HarborDataProvider( { children }: { children: ReactNode } ) {
     }
 
     const isLoading        = RESOLVER_KEYS.some( ( key ) => result[ key ].isResolving && ! hasEverResolvedRef.current[ key ] );
-    const isLicenseLoading = result.license.isResolving && ! hasEverResolvedRef.current.license;
+    // True until the license resolver has settled its first cycle. Covers both
+    // the IDLE pre-fetch frame and the RESOLVING in-flight frame, so the
+    // welcome screen never flashes before the resolver has had a chance to
+    // report whether a key exists.
+    const isLicenseLoading = ! hasEverResolvedRef.current.license;
 
     useEffect( () => {
         const found = findErrors( result );

tests/js/context/harbor-data-context.test.tsx

@@ -73,6 +73,16 @@ describe( 'HarborDataContext', () => {
         expect( captured!.isLicenseLoading ).toBe( false );
     } );
 
+    it( 'flags isLicenseLoading on first render before the resolver has started (IDLE)', () => {
+        setResolvers( {
+            license: { isResolving: false, hasResolved: false },
+        } );
+
+        render( <HarborDataProvider><Probe /></HarborDataProvider> );
+
+        expect( captured!.isLicenseLoading ).toBe( true );
+    } );
+
     it( 'flags both loading flags while the license resolver is on its first pass', () => {
         setResolvers( {
             license: { isResolving: true, hasResolved: false },

tests/js/hooks/useWelcomeLicenseForm.test.ts

@@ -135,13 +135,17 @@ describe( 'pickWelcomeErrorMessage', () => {
         );
     }
 
-    it( 'appends the plugin-settings hint for lw-harbor-invalid-key', () => {
+    it( 'returns a single canned message for lw-harbor-invalid-key', () => {
         const error  = withCause( 'lw-harbor-invalid-key', 'License key not recognized.' );
         const result = pickWelcomeErrorMessage( error );
 
-        expect( result.startsWith( 'License key not recognized.' ) ).toBe( true );
+        // The canned message discards the server text and directs the user
+        // toward the plugin-settings path.
+        expect( result ).toMatch( /We couldn't verify this key/ );
         expect( result ).toMatch( /non-unified license/ );
         expect( result ).toMatch( /plugin's own settings page/ );
+        // The server's diagnostic is intentionally not surfaced.
+        expect( result ).not.toMatch( /License key not recognized\./ );
     } );
 
     it.each( [
@@ -170,13 +174,13 @@ describe( 'pickWelcomeErrorMessage', () => {
         expect( result ).not.toMatch( /non-unified license/ );
     } );
 
-    it( 'falls back to error.message when cause.message is whitespace', () => {
+    it( 'returns the canned invalid-key message even when cause.message is whitespace', () => {
         const error  = withCause( 'lw-harbor-invalid-key', '   ' );
         const result = pickWelcomeErrorMessage( error );
 
-        // The wrapper message is preserved, and the plugin-settings hint is
-        // still appended because the server code matched.
-        expect( result.startsWith( 'Liquid Web Software Manager failed to validate your license.' ) ).toBe( true );
+        // Whitespace in the server message doesn't change anything — the
+        // invalid-key branch returns the canned message regardless.
+        expect( result ).toMatch( /We couldn't verify this key/ );
         expect( result ).toMatch( /plugin's own settings page/ );
     } );
 } );