Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UAT fixes #87

Merged
merged 3 commits into from
Nov 1, 2023
+5 −5
Merged

UAT fixes #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e052622
Copy changes
jorvixsky Oct 31, 2023
4086987
Fixed atom not properly used
jorvixsky Oct 31, 2023
b72ef79
Fixed copy
jorvixsky Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/abclaunch/src/components/dao-steps/ConfigureAbc.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions apps/abclaunch/src/pages/ExistingDao.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion apps/abcswap/src/pages/Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}>
Expand Down