From e89db19345051304d6558339e21ca657136d36db Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Wed, 17 Aug 2022 10:03:45 +0200
Subject: [PATCH] fixes

---
 libs/remix-ui/settings/src/lib/github-settings.tsx   | 6 +++---
 libs/remix-ui/settings/src/lib/remix-ui-settings.tsx | 2 +-
 libs/remix-ui/workspace/src/lib/actions/events.ts    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libs/remix-ui/settings/src/lib/github-settings.tsx b/libs/remix-ui/settings/src/lib/github-settings.tsx
index 243598d6ec..6136dd8f95 100644
--- a/libs/remix-ui/settings/src/lib/github-settings.tsx
+++ b/libs/remix-ui/settings/src/lib/github-settings.tsx
@@ -9,9 +9,9 @@ export function GithubSettings (props: GithubSettingsProps) {
 
   useEffect(() => {
     if (props.config) {
-      const githubToken = props.config.get('settings/gist-access-token')
-      const githubUserName = props.config.get('settings/github-user-name')
-      const githubEmail = props.config.get('settings/github-email')
+      const githubToken = props.config.get('settings/gist-access-token') || ''
+      const githubUserName = props.config.get('settings/github-user-name') || ''
+      const githubEmail = props.config.get('settings/github-email') || ''
   
       setGithubToken(githubToken)
       setGithubUsername(githubUserName)
diff --git a/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx b/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
index 912da468f3..1d767c7643 100644
--- a/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
+++ b/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
@@ -214,7 +214,7 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
         <p className="mb-1"><a className="text-primary" target="_blank" href={labels[type].link}>{ labels[type].link }</a></p>
         <div className=""><label>TOKEN:</label>
           <div className="text-secondary mb-0 h6">
-            <input id="gistaccesstoken" data-id="settingsTabGistAccessToken" type="password" className="form-control" onChange={(e) => handleSaveTokenState(e, type)} value={ tokenValue[type] } />
+            <input id="gistaccesstoken" data-id="settingsTabGistAccessToken" type="password" className="form-control" onChange={(e) => handleSaveTokenState(e, type)} value={ tokenValue[type] || '' } />
             <div className="d-flex justify-content-end pt-2">
               <CopyToClipboard content={tokenValue[type]} data-id='copyToClipboardCopyIcon' />
               <input className="btn btn-sm btn-primary ml-2" id="savegisttoken" data-id="settingsTabSaveGistToken" onClick={() => saveToken(type)} value="Save" type="button" disabled={tokenValue === ''}></input>
diff --git a/libs/remix-ui/workspace/src/lib/actions/events.ts b/libs/remix-ui/workspace/src/lib/actions/events.ts
index 62092df30f..ce3c6982f3 100644
--- a/libs/remix-ui/workspace/src/lib/actions/events.ts
+++ b/libs/remix-ui/workspace/src/lib/actions/events.ts
@@ -209,6 +209,6 @@ const rootFolderChanged = async (path) => {
 }
 
 const setFileDecorators = async (items: fileDecoration[], cb?: (err: Error, result?: string | number | boolean | Record<string, any>) => void) => {
-  await dispatch(setFileDecorationSuccess(items))
+  dispatch && await dispatch(setFileDecorationSuccess(items))
   cb && cb(null, true)
 }