Configure Storybook... fails with new typescript project when setting-up chakra-ui

After setting-up a new typescript project and running yarn redwood setup ui chakra-ui the Configure Storybook step fails… Is this expected?

  ✔ Installing packages...
  ✔ Setting up Chakra UI...
  ✔ Creating Theme File...
  ✖ Configure Storybook...
    → The "original" argument must be of type function. Received undefined
The "original" argument must be of type function. Received undefined

Also, I have a question on customizing the chakra theme. In App.tsx I see import * as theme from 'config/chakra.config' so assume the custom theme objects should be defined there? If that’s the case, then I think we need to get the docs updated here:

//App.tsx
import { ChakraProvider, ColorModeScript, extendTheme } from '@chakra-ui/react'
import * as theme from 'config/chakra.config'

import { FatalErrorBoundary, RedwoodProvider } from '@redwoodjs/web'
import { RedwoodApolloProvider } from '@redwoodjs/web/apollo'

import FatalErrorPage from 'src/pages/FatalErrorPage'
import Routes from 'src/Routes'

import './index.css'

const extendedTheme = extendTheme(theme)

const App = () => (
  <FatalErrorBoundary page={FatalErrorPage}>
    <RedwoodProvider titleTemplate="%PageTitle | %AppTitle">
      <ColorModeScript />
      <ChakraProvider theme={extendedTheme}>
        <RedwoodApolloProvider>
          <Routes />
        </RedwoodApolloProvider>
      </ChakraProvider>
    </RedwoodProvider>
  </FatalErrorBoundary>
)

export default App