let's include the null check in the promise chain

Opentrons · Nov 7, 2024 · 5b40f90 · 5b40f90
1 parent 96619a3
commit 5b40f90
Showing 1 changed file with 31 additions and 28 deletions.
diff --git a/app/src/organisms/DropTipWizardFlows/hooks/useDropTipCommands.ts b/app/src/organisms/DropTipWizardFlows/hooks/useDropTipCommands.ts
@@ -109,35 +109,38 @@ export function useDropTipCommands({
     isPredefinedLocation: boolean
   ): Promise<void> => {
     return new Promise((resolve, reject) => {
-      const addressableAreaFromConfig = getAddressableAreaFromConfig(
-        addressableArea,
-        deckConfig,
-        instrumentModelSpecs.channels,
-        robotType
-      )
-
-      if (addressableAreaFromConfig == null) {
-        throw new Error('invalid addressable area.')
-      }
-
-      const moveToAACommand = buildMoveToAACommand(
-        addressableAreaFromConfig,
-        pipetteId,
-        isPredefinedLocation,
-        issuedCommandsType
-      )
+      Promise.resolve()
+        .then(() => {
+          const addressableAreaFromConfig = getAddressableAreaFromConfig(
+            addressableArea,
+            deckConfig,
+            instrumentModelSpecs.channels,
+            robotType
+          )
+
+          if (addressableAreaFromConfig == null) {
+            throw new Error('invalid addressable area.')
+          }
 
-      return chainRunCommands(
-        isFlex
-          ? [
-              ENGAGE_AXES,
-              UPDATE_ESTIMATORS_EXCEPT_PLUNGERS,
-              Z_HOME,
-              moveToAACommand,
-            ]
-          : [Z_HOME, moveToAACommand],
-        false
-      )
+          const moveToAACommand = buildMoveToAACommand(
+            addressableAreaFromConfig,
+            pipetteId,
+            isPredefinedLocation,
+            issuedCommandsType
+          )
+
+          return chainRunCommands(
+            isFlex
+              ? [
+                  ENGAGE_AXES,
+                  UPDATE_ESTIMATORS_EXCEPT_PLUNGERS,
+                  Z_HOME,
+                  moveToAACommand,
+                ]
+              : [Z_HOME, moveToAACommand],
+            false
+          )
+        })
         .then((commandData: CommandData[]) => {
           const error = commandData[0].data.error
           if (error != null) {