fix continue

Signed-off-by: shmck <[email protected]>

Author: ShMcK

Diff for: web-app/src/containers/Start/index.tsx

@@ -86,7 +86,11 @@ interface ContainerProps {
 const StartPageContainer = ({ context, send }: ContainerProps) => {
   const tutorial = context.tutorial || undefined
   return (
-    <StartPage onContinue={() => send('CONTINUE_TUTORIAL')} onNew={() => send('NEW_TUTORIAL')} tutorial={tutorial} />
+    <StartPage
+      onContinue={() => send({ type: 'CONTINUE_TUTORIAL' })}
+      onNew={() => send({ type: 'NEW_TUTORIAL' })}
+      tutorial={tutorial}
+    />
   )
 }
 

Diff for: web-app/src/services/state/actions/context.ts

@@ -3,7 +3,7 @@ import * as TT from 'typings/tutorial'
 import { assign, send, ActionFunctionMap } from 'xstate'
 import * as selectors from '../../selectors'
 import onError from '../../../services/sentry/onError'
-import logger from 'services/logger'
+import logger from '../../../services/logger'
 
 const contextActions: ActionFunctionMap<T.MachineContext, T.MachineEvent> = {
   // @ts-ignore
@@ -16,25 +16,20 @@ const contextActions: ActionFunctionMap<T.MachineContext, T.MachineEvent> = {
     },
   }),
   // @ts-ignore
-  storeContinuedTutorial: assign({
-    env: (context: T.MachineContext, event: T.MachineEvent) => {
-      return {
+  loadContinuedTutorial: assign((context: T.MachineContext, event: T.MachineEvent): any => {
+    return {
+      env: {
         ...context.env,
         ...event.payload.env,
-      }
-    },
-    tutorial: (context: T.MachineContext, event: T.MachineEvent) => {
-      return event.payload.tutorial
-    },
-    progress: (context: T.MachineContext, event: T.MachineEvent) => {
-      return event.payload.progress
-    },
-    position: (context: T.MachineContext, event: T.MachineEvent) => {
-      return event.payload.position
-    },
+      },
+      tutorial: event.payload.tutorial,
+      progress: event.payload.progress,
+      position: event.payload.position,
+    }
   }),
+
   // @ts-ignore
-  startTutorial: assign({
+  initProgressPosition: assign({
     position: (context: T.MachineContext, event: T.MachineEvent): any => {
       const position: T.Position = selectors.initialPosition(context)
       return position

Diff for: web-app/src/services/state/machine.ts

@@ -64,7 +64,7 @@ export const createMachine = (options: any) => {
                 },
                 LOAD_STORED_TUTORIAL: {
                   target: 'Start',
-                  actions: ['storeContinuedTutorial'],
+                  actions: ['loadContinuedTutorial'],
                 },
                 START_NEW_TUTORIAL: {
                   target: 'Start',
@@ -97,7 +97,7 @@ export const createMachine = (options: any) => {
               on: {
                 NEW_TUTORIAL: 'ValidateSetup',
                 CONTINUE_TUTORIAL: {
-                  target: 'StartTutorial',
+                  target: '#tutorial',
                   actions: ['continueConfig'],
                 },
                 CONTINUE_FAILED: {
@@ -127,7 +127,7 @@ export const createMachine = (options: any) => {
               },
             },
             StartTutorial: {
-              onEntry: ['startTutorial'],
+              onEntry: ['initProgressPosition'],
               after: {
                 0: '#tutorial',
               },