From afd4f4e4b138bf02b03d78d44dfc2477dc4c4ac4 Mon Sep 17 00:00:00 2001
From: Conor Gallagher <dontlisten33@gmail.com>
Date: Thu, 18 Jan 2024 13:49:21 -0800
Subject: [PATCH 1/5] updated v4-periphery to v4-template

---
 apps/remix-ide-e2e/src/tests/workspace_git.test.ts     | 4 ++--
 apps/remix-ide/src/app/tabs/locales/en/filePanel.json  | 4 ++--
 libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx | 4 ++--
 libs/remix-ui/workspace/src/lib/types/index.ts         | 2 +-
 libs/remix-ui/workspace/src/lib/utils/constants.ts     | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

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 fb74ce1bee..9bb7038a83 100644
--- a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
+++ b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
@@ -370,14 +370,14 @@ module.exports = {
 
    // GIT WORKSPACE E2E STARTS
 
-   'Should create a git workspace (uniswapV4Periphery) #group4': function (browser: NightwatchBrowser) {
+   'Should create a git workspace (uniswapV4Template) #group4': function (browser: NightwatchBrowser) {
     browser
       .click('*[data-id="workspacesMenuDropdown"]')
       .click('*[data-id="workspacecreate"]')
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
       .waitForElementVisible('[data-id="fileSystemModalDialogModalFooter-react"] > button')
       .click('select[id="wstemplate"]')
-      .click('select[id="wstemplate"] option[value=uniswapV4Periphery]')
+      .click('select[id="wstemplate"] option[value=uniswapV4Template]')
       .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
       .execute(function () { (document.querySelector('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok') as HTMLElement).click() })
       .pause(100)
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 4f917fe861..3b790fa706 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/filePanel.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/filePanel.json
@@ -113,7 +113,7 @@
   "filePanel.hashchecker": "Hash Checker",
   "filePanel.rln": "Rate-Limiting Nullifier",
   "filePanel.breakthroughLabsUniswapv4Hooks": "Breakthrough-Labs Hooks",
-  "filePanel.uniswapV4Periphery": "v4 Periphery",
+  "filePanel.uniswapV4Template": "v4 Template",
   "filePanel.uniswapV4HookBookMultiSigSwapHook": "HookBook MultiSigSwapHook",
   "filePanel.transparent": "Transparent",
   "filePanel.initGitRepoTitle": "Check option to initialize workspace as a new git repository",
@@ -136,4 +136,4 @@
   "filePanel.movingFolderFailedMsg": "Unexpected error while moving folder: {src}",
   "filePanel.workspaceActions": "Workspace actions",
   "filePanel.saveCodeSample": "This code-sample workspace will not be persisted. Click here to save it."
-}
+}
\ No newline at end of file
diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
index 2022f6d2af..400aa1de2c 100644
--- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
@@ -791,8 +791,8 @@ export function Workspace() {
             </option>
           </optgroup>
           <optgroup style={{fontSize: 'medium'}} label="Uniswap V4">
-            <option style={{fontSize: 'small'}} value="uniswapV4Periphery">
-              {intl.formatMessage({id: 'filePanel.uniswapV4Periphery'})}
+            <option style={{fontSize: 'small'}} value="uniswapV4Template">
+              {intl.formatMessage({id: 'filePanel.uniswapV4Template'})}
             </option>
             <option style={{fontSize: 'small'}} value="breakthroughLabsUniswapv4Hooks">
               {intl.formatMessage({id: 'filePanel.breakthroughLabsUniswapv4Hooks'})}
diff --git a/libs/remix-ui/workspace/src/lib/types/index.ts b/libs/remix-ui/workspace/src/lib/types/index.ts
index d225976eab..14ff7864d2 100644
--- a/libs/remix-ui/workspace/src/lib/types/index.ts
+++ b/libs/remix-ui/workspace/src/lib/types/index.ts
@@ -19,7 +19,7 @@ export interface JSONStandardInput {
   }
 }
 export type MenuItems = action[]
-export type WorkspaceTemplate = 'gist-template' | 'code-template' | 'remixDefault' | 'blank' | 'ozerc20' | 'zeroxErc20' | 'ozerc721' | 'playground' | 'semaphore' | 'hashchecker' | 'rln' | 'breakthroughLabsUniswapv4Hooks' | 'uniswapV4Periphery' | 'uniswapV4HookBookMultiSigSwapHook'
+export type WorkspaceTemplate = 'gist-template' | 'code-template' | 'remixDefault' | 'blank' | 'ozerc20' | 'zeroxErc20' | 'ozerc721' | 'playground' | 'semaphore' | 'hashchecker' | 'rln' | 'breakthroughLabsUniswapv4Hooks' | 'uniswapV4Template' | 'uniswapV4HookBookMultiSigSwapHook'
 export interface WorkspaceProps {
   plugin: FilePanelType
 }
diff --git a/libs/remix-ui/workspace/src/lib/utils/constants.ts b/libs/remix-ui/workspace/src/lib/utils/constants.ts
index be8b7bdb4d..e5a4b21523 100644
--- a/libs/remix-ui/workspace/src/lib/utils/constants.ts
+++ b/libs/remix-ui/workspace/src/lib/utils/constants.ts
@@ -87,7 +87,7 @@ export const TEMPLATE_NAMES = {
   'hashchecker': 'Hash Checker',
   'rln': 'Rate-Limiting Nullifier',
   'breakthroughLabsUniswapv4Hooks': 'Breakthrough-Labs Uniswapv4Hooks',
-  'uniswapV4Periphery': 'Uniswap v4 Periphery',
+  'uniswapV4Template': 'Uniswap v4 Template',
   'uniswapV4HookBookMultiSigSwapHook': 'Uniswap V4 HookBook MultiSigSwapHook',
 }
 
@@ -97,9 +97,9 @@ export const TEMPLATE_METADATA: Record<string, TemplateType> = {
     url: 'https://github.com/Breakthrough-Labs/Uniswapv4Hooks',
     branch: 'foundry_pure'
   },
-  'uniswapV4Periphery': {
+  'uniswapV4Template': {
     type: 'git',
-    url: 'https://github.com/Uniswap/v4-periphery',
+    url: 'https://github.com/Breakthrough-Labs/v4-template',
     branch: 'main'
   },
   'uniswapV4HookBookMultiSigSwapHook': {

From 615c31d7b72d107927be815487b5dbb8bc8d2717 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 29 Jan 2024 11:34:17 +0100
Subject: [PATCH 2/5] fix test

---
 apps/remix-ide-e2e/src/tests/workspace_git.test.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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 9bb7038a83..3142dedf15 100644
--- a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
+++ b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
@@ -382,13 +382,11 @@ module.exports = {
       .execute(function () { (document.querySelector('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok') as HTMLElement).click() })
       .pause(100)
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
-      .openFile('contracts')
-      .openFile('contracts/hooks')
-      .openFile('contracts/hooks/examples')
-      .openFile('contracts/hooks/examples/FullRange.sol')
+      .openFile('src')
+      .openFile('src/Counter.sol')
       .pause(1000)
       .getEditorValue((content) => {
-        browser.assert.ok(content.indexOf(`contract FullRange is BaseHook`) !== -1,
+        browser.assert.ok(content.indexOf(`contract Counter is BaseHook {`) !== -1,
           'Incorrect content')
       })
   }, 
@@ -406,4 +404,4 @@ url = https://github.com/bunsenstraat/empty3
 [submodule "testactionsub"]
 path = testactionsub
 url = https://github.com/bunsenstraat/testactions
-`
\ No newline at end of file
+`

From 7c17138d40dc1eb3c3aa80f04cab7d3b109ef7b6 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 29 Jan 2024 11:48:56 +0100
Subject: [PATCH 3/5] fix test

---
 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 3142dedf15..e5e571f67f 100644
--- a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
+++ b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
@@ -381,7 +381,7 @@ module.exports = {
       .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
       .execute(function () { (document.querySelector('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok') as HTMLElement).click() })
       .pause(100)
-      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemsrc"]')
       .openFile('src')
       .openFile('src/Counter.sol')
       .pause(1000)

From 715e02de435c514514c081541e411b1f4f791897 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 30 Jan 2024 10:18:26 +0100
Subject: [PATCH 4/5] Update workspace_git.test.ts

---
 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 e5e571f67f..c49ecb3372 100644
--- a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
+++ b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
@@ -386,7 +386,7 @@ module.exports = {
       .openFile('src/Counter.sol')
       .pause(1000)
       .getEditorValue((content) => {
-        browser.assert.ok(content.indexOf(`contract Counter is BaseHook {`) !== -1,
+        browser.assert.ok(content.indexOf(`contract Counter is BaseHook { `) !== -1,
           'Incorrect content')
       })
   }, 

From c280f2307c55f720f830dbc46b00cbd1212468f5 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Tue, 30 Jan 2024 11:34:19 +0100
Subject: [PATCH 5/5] fix test

---
 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 c49ecb3372..e5e571f67f 100644
--- a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
+++ b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
@@ -386,7 +386,7 @@ module.exports = {
       .openFile('src/Counter.sol')
       .pause(1000)
       .getEditorValue((content) => {
-        browser.assert.ok(content.indexOf(`contract Counter is BaseHook { `) !== -1,
+        browser.assert.ok(content.indexOf(`contract Counter is BaseHook {`) !== -1,
           'Incorrect content')
       })
   },