Merge branch 'develop' into ui-refurbishment

NethermindEth · Jun 23, 2024 · 71126ee · 71126ee
2 parents b50d331 + ce8742f
commit 71126ee
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/manual-api-deploy-prod.yml b/.github/workflows/manual-api-deploy-prod.yml
@@ -14,7 +14,7 @@ env:
   PROD_CLUSTER: "zksync-remix-plugin-production-ecs-cluster"
   PROD_SERVICE_NAME: "rocket-production-svc"
   API_SERVICE_URL: "https://zksync-plugin-api.nethermind.io"
-  ZKSYNC_DEVNET_URL: "https://zksync-devnet.nethermind.dev"
+  ZKSYNC_DEVNET_URL: "https://zksync-devnet.nethermind.io"
   WALLETCONNECT_PROJECT_ID: '${{secrets.WALLECTCONNECT_PROJECT_ID_PROD}}'
 
 jobs:

diff --git a/.github/workflows/manual-ui-deploy-prod.yml b/.github/workflows/manual-ui-deploy-prod.yml
@@ -7,7 +7,7 @@ env:
   BUCKET_NAME: 'zksync-remix-plugin-web'
   PROD_BUCKET_NAME: 'zksync-remix-plugin-prod-web'
   API_SERVICE_URL: "https://zksync-plugin-api.nethermind.io"
-  ZKSYNC_DEVNET_URL: "https://zksync-devnet.nethermind.dev"
+  ZKSYNC_DEVNET_URL: "https://zksync-devnet.nethermind.io"
   WALLETCONNECT_PROJECT_ID: '${{secrets.WALLECTCONNECT_PROJECT_ID_PROD}}'
 
 

diff --git a/.github/workflows/remix-deploy.yml b/.github/workflows/remix-deploy.yml
@@ -9,7 +9,7 @@ env:
   BUCKET_NAME: 'zksync-remix-plugin-web'
   PROD_BUCKET_NAME: 'zksync-remix-plugin-prod-web'
   API_SERVICE_URL: "https://zksync-plugin-api.nethermind.dev"
-  ZKSYNC_DEVNET_URL: "https://zksync-devnet.nethermind.dev"
+  ZKSYNC_DEVNET_URL: "https://zksync-devnet.nethermind.io"
   WALLETCONNECT_PROJECT_ID: '${{secrets.WALLECTCONNECT_PROJECT_ID_DEV}}'
 
 

diff --git a/plugin/src/features/Compilation/index.tsx b/plugin/src/features/Compilation/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { useAtom, useAtomValue, useSetAtom } from 'jotai'
+import { useAtomValue, useSetAtom } from 'jotai'
 import { artifactFolder } from '@/utils/utils'
 import Container from '@/ui_components/Container'
 import { type AccordianTabs } from '@/types/common'
@@ -38,7 +38,7 @@ export const Compilation = ({ setAccordian }: CompilationProps) => {
   const activeTomlPath = useAtomValue(activeTomlPathAtom)
   const currentWorkspacePath = useAtomValue(currentWorkspacePathAtom)
 
-  const [contracts, setContracts] = useAtom(contractsAtom)
+  const setContracts = useSetAtom(contractsAtom)
   const setSelectedContract = useSetAtom(selectedContractAtom)
 
   const { status, isCompiling } = useAtomValue(compilationAtom)
@@ -156,7 +156,7 @@ export const Compilation = ({ setAccordian }: CompilationProps) => {
         contractsToAdd.push(contract)
       }
 
-      setContracts([...contractsToAdd, ...contracts])
+      setContracts(contractsToAdd)
       setSelectedContract(contractsToAdd[0])
 
       for (const file of compileResult.file_content) {

diff --git a/plugin/src/utils/network.ts b/plugin/src/utils/network.ts
@@ -3,7 +3,7 @@ import { Wallet } from 'zksync-ethers'
 
 const apiUrl: string = import.meta.env.VITE_API_URL ?? 'solidity-compile-remix-test.nethermind.io'
 const devnetUrl = import.meta.env.VITE_DEVNET_URL ?? 'http://localhost:8011'
-const remoteDevnetUrl = process.env.VITE_REMOTE_DEVNET_URL ?? 'https://zksync-devnet.nethermind.dev'
+const remoteDevnetUrl = process.env.VITE_REMOTE_DEVNET_URL ?? 'https://zksync-devnet.nethermind.io'
 
 interface Devnet {
   name: string