Merge pull request #302 from valory-xyz/staging

Merging staging into main for rc120 full release
valory-xyz · Aug 29, 2024 · d158a63 · d158a63
2 parents aa9235c + f04521d
commit d158a63
Show file tree

Hide file tree

Showing 13 changed files with 731 additions and 462 deletions.
diff --git a/.gitleaksignore b/.gitleaksignore
@@ -29,4 +29,7 @@ d8149e9b5b7bd6a7ed7bc1039900702f1d4f287b:operate/services/manage.py:generic-api-
 99c0f139b037da2587708212fcf6d0e20786d0ba:operate/services/manage.py:generic-api-key:455
 91ec07457f69e9a29f63693ac8ef887e4b5f49f0:operate/services/manage.py:generic-api-key:454
 410bea2bd02ff54da69387fe8f3b58793e09f7b0:operate/services/manage.py:generic-api-key:421
-410bea2bd02ff54da69387fe8f3b58793e09f7b0:operate/services/manage.py:generic-api-key:422
+410bea2bd02ff54da69387fe8f3b58793e09f7b0:operate/services/manage.py:generic-api-key:422
+467e8e64f51fb3659e5af17ba53ab587ec24fc30:operate/services/manage.py:generic-api-key:290
+64afe2ea92daafa2515c054f0e09931622d99f31:operate/services/manage.py:generic-api-key:290
+64afe2ea92daafa2515c054f0e09931622d99f31:operate/services/manage.py:generic-api-key:289
diff --git a/electron/install.js b/electron/install.js
@@ -14,7 +14,7 @@ const { paths } = require('./constants');
  * - use "" (nothing as a suffix) for latest release candidate, for example "0.1.0rc26"
  * - use "alpha" for alpha release, for example "0.1.0rc26-alpha"
  */
-const OlasMiddlewareVersion = '0.1.0rc117';
+const OlasMiddlewareVersion = '0.1.0rc120';
 
 const path = require('path');
 const { app } = require('electron');

diff --git a/frontend/components/MainPage/sections/AddFundsSection.tsx b/frontend/components/MainPage/sections/AddFundsSection.tsx
@@ -18,7 +18,6 @@ import styled from 'styled-components';
 import { UNICODE_SYMBOLS } from '@/constants/symbols';
 import { COW_SWAP_GNOSIS_XDAI_OLAS_URL } from '@/constants/urls';
 import { useWallet } from '@/hooks/useWallet';
-import { Address } from '@/types/Address';
 import { copyToClipboard } from '@/utils/copyToClipboard';
 import { truncateAddress } from '@/utils/truncate';
 
@@ -35,23 +34,6 @@ const CustomizedCardSection = styled(CardSection)<{ border?: boolean }>`
 
 export const AddFundsSection = () => {
   const [isAddFundsVisible, setIsAddFundsVisible] = useState(false);
-  const { masterSafeAddress } = useWallet();
-
-  const fundingAddress: Address | undefined = masterSafeAddress;
-
-  const truncatedFundingAddress: string | undefined = useMemo(
-    () => fundingAddress && truncateAddress(fundingAddress),
-    [fundingAddress],
-  );
-
-  const handleCopyAddress = useCallback(
-    () =>
-      fundingAddress &&
-      copyToClipboard(fundingAddress).then(() =>
-        message.success('Copied successfully!'),
-      ),
-    [fundingAddress],
-  );
 
   return (
     <>
@@ -75,17 +57,36 @@ export const AddFundsSection = () => {
         </Popover>
       </CustomizedCardSection>
 
-      {isAddFundsVisible && (
-        <>
-          <AddFundsWarningAlertSection />
-          <AddFundsAddressSection
-            truncatedFundingAddress={truncatedFundingAddress}
-            fundingAddress={fundingAddress}
-            handleCopy={handleCopyAddress}
-          />
-          <AddFundsGetTokensSection />
-        </>
-      )}
+      {isAddFundsVisible && <OpenAddFundsSection />}
+    </>
+  );
+};
+
+export const OpenAddFundsSection = () => {
+  const { masterSafeAddress } = useWallet();
+
+  const truncatedFundingAddress: string | undefined = useMemo(
+    () => masterSafeAddress && truncateAddress(masterSafeAddress),
+    [masterSafeAddress],
+  );
+
+  const handleCopyAddress = useCallback(
+    () =>
+      masterSafeAddress &&
+      copyToClipboard(masterSafeAddress).then(() =>
+        message.success('Copied successfully!'),
+      ),
+    [masterSafeAddress],
+  );
+  return (
+    <>
+      <AddFundsWarningAlertSection />
+      <AddFundsAddressSection
+        truncatedFundingAddress={truncatedFundingAddress}
+        fundingAddress={masterSafeAddress}
+        handleCopy={handleCopyAddress}
+      />
+      <AddFundsGetTokensSection />
     </>
   );
 };

diff --git a/frontend/components/ManageStakingPage/StakingContractSection/alerts.tsx b/frontend/components/ManageStakingPage/StakingContractSection/alerts.tsx
@@ -6,28 +6,35 @@ import { UNICODE_SYMBOLS } from '@/constants/symbols';
 const { Text } = Typography;
 
 export const AlertInsufficientMigrationFunds = ({
-  totalOlasBalance,
+  masterSafeOlasBalance,
+  stakedOlasBalance,
+  totalOlasRequiredForStaking,
 }: {
-  totalOlasBalance: number;
-}) => (
-  <CustomAlert
-    type="warning"
-    showIcon
-    message={
-      <Flex vertical gap={4}>
-        <Text className="font-weight-600">
-          Insufficient amount of funds to switch
-        </Text>
+  masterSafeOlasBalance: number;
+  stakedOlasBalance: number;
+  totalOlasRequiredForStaking: number;
+}) => {
+  const requiredOlasDeposit =
+    totalOlasRequiredForStaking - (stakedOlasBalance + masterSafeOlasBalance);
 
-        <Text>Add funds to your account to meet the program requirements.</Text>
-        <Text>
-          Your current OLAS balance:{' '}
-          <span className="font-weight-600">{totalOlasBalance} OLAS</span>
-        </Text>
-      </Flex>
-    }
-  />
-);
+  return (
+    <CustomAlert
+      type="warning"
+      showIcon
+      message={
+        <Flex vertical gap={4}>
+          <Text className="font-weight-600">
+            An additional {requiredOlasDeposit} OLAS is required to switch
+          </Text>
+          <Text>
+            Add <strong>{requiredOlasDeposit} OLAS</strong> to your account to
+            meet the contract requirements and switch.
+          </Text>
+        </Flex>
+      }
+    />
+  );
+};
 
 export const AlertNoSlots = () => (
   <CustomAlert