Merge branch 'master' into HEAD

2022-02-27 20:47:49 +01:00
parent 64e807beef f8f1ddfebb
commit 72400af679
63 changed files with 6212 additions and 8646 deletions
--- a/app/src/components/Sidebar/Publish/Publish.tsx
+++ b/app/src/components/Sidebar/Publish/Publish.tsx
@@ -122,7 +122,7 @@ const EditorMode = memo(function EditorMode(props: {
        const str = JSON.stringify(JSON.parse(props.payload), undefined, '  ')
        updatePayload(str)
      } catch (error) {
-        props.globalActions.showError(`Format error: ${error.message}`)
+        props.globalActions.showError(`Format error: ${(error as Error)?.message}`)
      }
    }
  }, [props.payload])