From 1abc076802712e6266ea22c04fc7f9b56676e686 Mon Sep 17 00:00:00 2001 From: David Vilela Date: Mon, 11 Mar 2024 17:57:33 +0100 Subject: [PATCH 1/3] fix: do not clone the repo --- electron/install.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/electron/install.js b/electron/install.js index b7b5fafdc..16f243d65 100644 --- a/electron/install.js +++ b/electron/install.js @@ -108,7 +108,7 @@ function isGitInstalledUbuntu() { } function installPythonUbuntu() { - return runSudoUnix('apt', 'install -y python3.10 python3.10-dev'); + return runSudoUnix('apt', 'install -y python3.10 python3.10-dev python3-pip'); } function installGitUbuntu() { @@ -119,12 +119,11 @@ function createVirtualEnvUbuntu(path) { return runCmdUnix('python3.10', ['-m', 'venv', path]); } -function cloneRepositoryUnix() { - runCmdUnix('git', ['clone', 'git@github.com:valory-xyz/olas-operate-app']) -} - function installOperatePackageUnix(path) { - runCmdUnix(`${path}/venv/bin/python3.10`, ['-m', 'pip', 'install', `${path}/temp/olas-operate-app`]) + runCmdUnix( + `${path}/venv/bin/python3.10`, + ['-m', 'pip', 'install', '--index-url', 'https://test.pypi.org/simple/', '--extra-index-url', 'https://pypi.org/simple/', 'operate==0.1.1'] + ) } function installOperateCliDarwin(path) { @@ -191,7 +190,6 @@ async function setupDarwin() { console.log("Installing operate backend") process.chdir(`${OperateDirectory}/temp`) - cloneRepositoryUnix() installOperatePackageUnix(OperateDirectory) console.log("Installing operate CLI") @@ -228,7 +226,6 @@ async function setupUbuntu() { console.log("Installing operate backend") process.chdir(`${OperateDirectory}/temp`) - cloneRepositoryUnix() installOperatePackageUnix(OperateDirectory) console.log("Installing operate CLI") From 0ff0c8f1905bfa24cc6c9d5e4775d28f229ecfe1 Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Tue, 12 Mar 2024 12:40:21 +0530 Subject: [PATCH 2/3] fix: import statement --- frontend/hooks/useMasterWallet.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/hooks/useMasterWallet.tsx b/frontend/hooks/useMasterWallet.tsx index c0977e70f..729394e99 100644 --- a/frontend/hooks/useMasterWallet.tsx +++ b/frontend/hooks/useMasterWallet.tsx @@ -1,6 +1,6 @@ -import { useEffect, useState } from 'react'; -import { useAppInfo } from '.'; -import EthersService from '@/service/Ethers'; +import { useEffect, useState } from "react"; +import { useAppInfo } from "."; +import { EthersService } from "@/service/Ethers"; type useMasterWalletProps = { rpc: string; @@ -9,7 +9,7 @@ type useMasterWalletProps = { export const useMasterWallet = ({ rpc }: useMasterWalletProps) => { const { userPublicKey } = useAppInfo(); const [nativeBalance, setNativeBalance] = useState( - undefined, + undefined ); useEffect(() => { From c444ac5b300f0b5e38599461b5b2e4122e6bf5af Mon Sep 17 00:00:00 2001 From: angrybayblade Date: Tue, 12 Mar 2024 12:40:30 +0530 Subject: [PATCH 3/3] fix: use pypi published package instead of test pypi --- electron/install.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/electron/install.js b/electron/install.js index 16f243d65..48318572f 100644 --- a/electron/install.js +++ b/electron/install.js @@ -120,9 +120,9 @@ function createVirtualEnvUbuntu(path) { } function installOperatePackageUnix(path) { - runCmdUnix( + return runCmdUnix( `${path}/venv/bin/python3.10`, - ['-m', 'pip', 'install', '--index-url', 'https://test.pypi.org/simple/', '--extra-index-url', 'https://pypi.org/simple/', 'operate==0.1.1'] + ['-m', 'pip', 'install', 'olas-operate-middleware==0.1.0rc0'] ) }