Make sure batch fetch resolved data remains consistent (https://github.com/woocommerce/woocommerce-admin/pull/7587)

* Adjust batch fetch logic so data stays the same

* Fix receive options action call

* Resolve returned result

* Add missing await

plugins/woocommerce-admin/packages/admin-e2e-tests/src/specs/homescreen/activity-panel.ts

@@ -99,7 +99,7 @@ const testAdminHomescreenActivityPanel = () => {
 		describe( 'Orders panel', () => {
 			it( 'should show: "you have fullfilled all your orders" when expanding Orders panel if no actionable orders', async () => {
 				await homeScreen.expandActivityPanel( 'Orders' );
-				expect( page ).toMatchElement( 'h4', {
+				await expect( page ).toMatchElement( 'h4', {
 					text: 'You’ve fulfilled all your orders',
 				} );
 			} );

plugins/woocommerce-admin/packages/data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# Unreleased
+
+-   Fix the batch fetch logic for the options data store. #7587
+
 # 1.4.0
 
 -   Fix commonjs module build, allow package to be built in isolation. #7286

plugins/woocommerce-admin/packages/data/src/options/controls.js

@@ -29,7 +29,7 @@ export const controls = {
 				const names = optionNames.join( ',' );
 				if ( fetches[ names ] ) {
 					return fetches[ names ].then( ( result ) => {
-						resolve( result[ optionName ] );
+						resolve( result );
 					} );
 				}