Merge pull request #87 from commons-stack/fixes-oct-31

UAT fixes
commons-stack · Nov 1, 2023 · 257ef49 · 257ef49
2 parents fbb7e56 + b72ef79
commit 257ef49
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/apps/abclaunch/src/components/dao-steps/ConfigureAbc.tsx b/apps/abclaunch/src/components/dao-steps/ConfigureAbc.tsx
@@ -5,7 +5,7 @@ import { collateralTokenList, getCollateralTokenInfo } from "../../utils/token-i
 import { BalanceInput } from "dao-utils";
 import { Input } from 'commons-ui/src/components/Input';
 import ABCGraph from "../charts/ABCGraph";
-import { useCollateralTokenAtom, useEntryTributeAtom, useReserveInitialBalanceAtom, useReserveRatioAtom } from "../../store";
+import { useCollateralTokenAtom, useEntryTributeAtom, useExitTributeAtom, useReserveInitialBalanceAtom, useReserveRatioAtom } from "../../store";
 
 interface ConfigureABCProps {
     abcHelper: () => JSX.Element;
@@ -18,7 +18,7 @@ export default function ConfigureAbc({abcHelper}: ConfigureABCProps) {
     const [collateralToken, setCollateralToken] = useCollateralTokenAtom();
 
     const [entryTribute, setEntryTribute] = useEntryTributeAtom();
-    const [exitTribute, setExitTribute] = useEntryTributeAtom();
+    const [exitTribute, setExitTribute] = useExitTributeAtom();
 
 
     const enoughBalance = reserveInitialBalanceIsEnough !== false;

diff --git a/apps/abclaunch/src/pages/ExistingDao.tsx b/apps/abclaunch/src/pages/ExistingDao.tsx
@@ -19,7 +19,7 @@ function ABCHelper() {
                 <Text>This is how the Initial Reserve Balance will be transferred:</Text>
                 <OrderedList>
                     <ListItem>In order to submit this vote, you must approve that the DAO can remove the amount specified in the Initial Reserve Balance from your wallet. These funds will not be moved unless the vote passes.</ListItem>
-                    <ListItem>When the DAO vote passes, the DAO will retrieve this amount from your wallet to sens to the Reserve Pool.</ListItem>
+                    <ListItem>When the DAO vote passes, the DAO will retrieve this amount from your wallet to send to the Reserve Pool.</ListItem>
                     <ListItem>If the amount specified is no longer in your wallet, then the execution of the vote will fail and the ABC will not launch.</ListItem>
                 </OrderedList>
                 <Text mt="16px">The Reserve Ratio is fixed for the life of the ABC and cannot be changed.</Text>
@@ -67,7 +67,7 @@ export default function ExistingDao({isInsideWizard}: AddAbcProps){
         <DaoStepper
             steps={steps}
             isValid={isValid}
-            onComplete={() => processTransactions("Submit for vote", undefined, txSteps, true, undefined, () => {
+            onComplete={() => processTransactions("Create vote on your DAO.", undefined, txSteps, true, undefined, () => {
                 setNewDaoIsCreated(true)
             })}
             blockingComponent={newDaoIsCreated ? <DaoLaunched /> : undefined}

diff --git a/apps/abcswap/src/pages/Home.tsx b/apps/abcswap/src/pages/Home.tsx
@@ -48,7 +48,7 @@ export default function Home() {
                 </VStack>
             </HStack>
             <VStack spacing={4} mt="100px" mb="100px" textAlign="center" >
-                <Text color="brand.900" fontSize="40px" fontFamily="VictorSerifTrial">Which token do you want to swap?</Text>
+                <Text color="brand.900" fontSize="40px" fontFamily="VictorSerifTrial">Enter DAO name to go to their swap page.</Text>
                 <DaoNameInput daoName={daoName} setDaoName={({name}) => setDaoName(name)} requiredApp='augmented-bonding-curve.open.aragonpm.eth' isInvalid={!!errorMessage} />
                 <HStack spacing={4} h="32px">
                     <HStack visibility={!errorMessage ? "collapse" : undefined}>