Fixed found issues with clone UI

libs/remix-ui/settings/src/lib/github-settings.tsx

@@ -46,8 +46,8 @@ export function GithubSettings (props: GithubSettingsProps) {
   return (
     <div className="border-top">
       <div className="card-body pt-3 pb-2">
-        <h6 className="card-title">GitHub Access Token</h6>
-        <p className="mb-1">Manage the access token used to publish to Gist and retrieve GitHub contents.</p>
+        <h6 className="card-title">GitHub Credentials</h6>
+        <p className="mb-1">Manage your GitHub credentials used to publish to Gist and retrieve GitHub contents.</p>
         <p className="">Go to github token page (link below) to create a new token and save it in Remix. Make sure this token has only \'create gist\' permission.</p>
         <p className="mb-1"><a className="text-primary" target="_blank" href="https://github.com/settings/tokens">https://github.com/settings/tokens</a></p>
         <div>

libs/remix-ui/settings/src/lib/settingsAction.ts

@@ -43,12 +43,12 @@ export const useMatomoAnalytics = (config, checked, dispatch) => {
 
 export const saveTokenToast = (config, dispatch, tokenValue, key) => {
   config.set('settings/' + key, tokenValue)
-  dispatch({ type: 'save', payload: { message: 'Access token has been saved' } })
+  dispatch({ type: 'save', payload: { message: 'GitHub credentials updated' } })
 }
 
 export const removeTokenToast = (config, dispatch, key) => {
   config.set('settings/' + key, '')
-  dispatch({ type: 'removed', payload: { message: 'Access token removed' } })
+  dispatch({ type: 'removed', payload: { message: 'GitHub credentials removed' } })
 }
 
 export const saveSwarmSettingsToast = (config, dispatch, privateBeeAddress, postageStampId) => {

libs/remix-ui/workspace/src/lib/actions/workspace.ts

@@ -331,7 +331,7 @@ export const getWorkspaces = async (): Promise<{name: string, isGitRepo: boolean
 
 export const cloneRepository = async (url: string) => {
   const config = plugin.registry.get('config').api
-  const token = config.get('currentFile')
+  const token = config.get('settings/gist-access-token')
   const repoConfig = { url, token }
   const urlArray = url.split('/')
   let repoName = urlArray.length > 0 ? urlArray[urlArray.length - 1] : ''
@@ -349,10 +349,22 @@ export const cloneRepository = async (url: string) => {
       await fetchWorkspaceDirectory(repoName)
       dispatch(cloneRepositorySuccess())
     }).catch((e) => {
-      dispatch(displayNotification('Clone Git Repository', 'An error occured: ' + e, 'Ok', null, async () => {
-        await deleteWorkspace(repoName)
-        dispatch(cloneRepositoryFailed())
-      }))
+      const cloneModal = {
+        id: 'cloneGitRepository',
+        title: 'Clone Git Repository',
+        message: 'An error occured: ' + e,
+        modalType: 'modal',
+        okLabel: 'OK',
+        okFn: async () => {
+          await deleteWorkspace(repoName)
+          dispatch(cloneRepositoryFailed())
+        },
+        hideFn: async () => {
+          await deleteWorkspace(repoName)
+          dispatch(cloneRepositoryFailed())
+        }
+      }
+      plugin.call('notification', 'modal', cloneModal)
     })
   } catch (e) {
     dispatch(displayPopUp('An error occured: ' + e))

libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx

@@ -144,7 +144,7 @@ export function Workspace () {
     if (url) {
       global.dispatchCloneRepository(url)
     } else {
-      global.modal('Create Workspace', 'Please provide a valid github repository url.', 'OK', () => {}, '')
+      global.modal('Clone Git Repository', 'Please provide a valid git repository url.', 'OK', () => {}, '')
     }
   }