Merge pull request #2629 from decentdao/eng-2/Unable-to-create-ERC-20…

…-DAO-on-dev `[Eng-2]` Unable to create ERC-20 DAO on dev
decentdao · Dec 13, 2024 · 5822b54 · 5822b54
2 parents 55f2429 + 8908b6f
commit 5822b54
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/models/AzoriusTxBuilder.ts b/src/models/AzoriusTxBuilder.ts
@@ -88,8 +88,13 @@ export class AzoriusTxBuilder extends BaseTxBuilder {
 
     if (daoData.votingStrategyType === VotingStrategyType.LINEAR_ERC20) {
       daoData = daoData as AzoriusERC20DAO;
-      if (daoData.isVotesToken) {
-        this.predictedTokenAddress = daoData.tokenImportAddress as Address;
+      if (!daoData.isTokenImported) {
+        this.setEncodedSetupTokenData();
+        this.setPredictedTokenAddress();
+      } else {
+        if (daoData.isVotesToken) {
+          this.predictedTokenAddress = daoData.tokenImportAddress as Address;
+        }
       }
     }
   }

diff --git a/src/models/DaoTxBuilder.ts b/src/models/DaoTxBuilder.ts
@@ -136,7 +136,7 @@ export class DaoTxBuilder extends BaseTxBuilder {
     ]);
 
     // build token if token is not imported
-    if (data.isVotesToken && data.votingStrategyType === VotingStrategyType.LINEAR_ERC20) {
+    if (!data.isTokenImported && data.votingStrategyType === VotingStrategyType.LINEAR_ERC20) {
       txs.push(azoriusTxBuilder.buildCreateTokenTx());
     }