From 43e41e51df18df1f57b6b338bdeb0255d87b0f49 Mon Sep 17 00:00:00 2001 From: lianahus Date: Mon, 27 Mar 2023 15:57:12 +0200 Subject: [PATCH 1/2] updated warning for github settings --- apps/remix-ide/src/app/tabs/locales/en/filePanel.json | 2 +- libs/remix-ui/workspace/src/lib/actions/workspace.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/remix-ide/src/app/tabs/locales/en/filePanel.json b/apps/remix-ide/src/app/tabs/locales/en/filePanel.json index 6c1091bd63..e1dd413634 100644 --- a/apps/remix-ide/src/app/tabs/locales/en/filePanel.json +++ b/apps/remix-ide/src/app/tabs/locales/en/filePanel.json @@ -54,7 +54,7 @@ "filePanel.checkoutGitBranch": "Checkout Git Branch", "filePanel.findOrCreateABranch": "Find or create a branch.", "filePanel.initGitRepositoryLabel": "Initialize workspace as a new git repository", - "filePanel.initGitRepositoryWarning": "Please add username and email to Remix GitHub Settings to use git features.", + "filePanel.initGitRepositoryWarning": "To use Git features, add username and email to the Github section of the Settings panel.", "filePanel.workspaceName": "Workspace name", "filePanel.customizeTemplate": "Customize template", "filePanel.features": "Features", diff --git a/libs/remix-ui/workspace/src/lib/actions/workspace.ts b/libs/remix-ui/workspace/src/lib/actions/workspace.ts index c4323cc4f5..0e23965cdb 100644 --- a/libs/remix-ui/workspace/src/lib/actions/workspace.ts +++ b/libs/remix-ui/workspace/src/lib/actions/workspace.ts @@ -97,7 +97,7 @@ export const createWorkspace = async (workspaceName: string, workspaceTemplateNa if (!currentBranch) { if (!name || !email) { - await plugin.call('notification', 'toast', 'Please add username and email to Remix GitHub Settings to use git features.') + await plugin.call('notification', 'toast', 'To use Git features, add username and email to the Github section of the Settings panel.') } else { // commit the template as first commit plugin.call('notification', 'toast', 'Creating initial git commit ...') From 45a0eaa5bf6d955b4beed6addf0455bb26a8c2a8 Mon Sep 17 00:00:00 2001 From: Aniket-Engg Date: Fri, 28 Apr 2023 14:11:34 +0530 Subject: [PATCH 2/2] fix e2e --- apps/remix-ide-e2e/src/tests/workspace_git.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts index fd2c261493..e4f95a67ea 100644 --- a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts +++ b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts @@ -15,7 +15,7 @@ module.exports = { .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]') .waitForElementVisible('[data-id="fileSystemModalDialogModalFooter-react"] > button') .waitForElementVisible({ - selector: "//*[@class='text-warning' and contains(.,'Please add username and email')]", + selector: "//*[@class='text-warning' and contains(.,'add username and email')]", locateStrategy: 'xpath' }) .waitForElementPresent({