review comments

aragon · Oct 24, 2023 · 6274257 · 6274257
1 parent b35ea7d
commit 6274257
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 28 deletions.
diff --git a/src/containers/votingTerminal/index.tsx b/src/containers/votingTerminal/index.tsx
@@ -354,39 +354,35 @@ export const VotingTerminal: React.FC<VotingTerminalProps> = ({
           <>
             <VoteContainer>
               {isMultisigProposal ? (
-                <>
-                  <div className="flex w-full flex-col gap-y-4">
-                    <div className="flex w-full flex-col gap-x-4 gap-y-3 xl:flex-row">
-                      {executableWithNextApproval && (
-                        <ButtonText
-                          label={t(
-                            'transactionModal.multisig.ctaApproveExecute'
-                          )}
-                          size="large"
-                          onClick={() => onApprovalClicked?.(true)}
-                          className="w-full md:w-max"
-                          disabled={voteNowDisabled}
-                        />
-                      )}
+                <div className="flex w-full flex-col gap-y-4">
+                  <div className="flex w-full flex-col gap-x-4 gap-y-3 xl:flex-row">
+                    {executableWithNextApproval && (
                       <ButtonText
-                        label={voteButtonLabel ?? ''}
+                        label={t('transactionModal.multisig.ctaApproveExecute')}
                         size="large"
-                        onClick={() => onApprovalClicked?.(false)}
+                        onClick={() => onApprovalClicked?.(true)}
                         className="w-full md:w-max"
                         disabled={voteNowDisabled}
-                        {...(executableWithNextApproval
-                          ? {mode: 'secondary', bgWhite: true}
-                          : {mode: 'primary'})}
-                      />
-                    </div>
-                    {executableWithNextApproval && (
-                      <AlertInline
-                        label={t('votingTerminal.approveAndExecute.infoAlert')}
-                        mode={'neutral'}
                       />
                     )}
+                    <ButtonText
+                      label={voteButtonLabel ?? ''}
+                      size="large"
+                      onClick={() => onApprovalClicked?.(false)}
+                      className="w-full md:w-max"
+                      disabled={voteNowDisabled}
+                      {...(executableWithNextApproval
+                        ? {mode: 'secondary', bgWhite: true}
+                        : {mode: 'primary'})}
+                    />
                   </div>
-                </>
+                  {executableWithNextApproval && (
+                    <AlertInline
+                      label={t('votingTerminal.approveAndExecute.infoAlert')}
+                      mode={'neutral'}
+                    />
+                  )}
+                </div>
               ) : (
                 <ButtonText
                   label={voteButtonLabel || t('votingTerminal.voteNow')}

diff --git a/src/context/createProposal.tsx b/src/context/createProposal.tsx
@@ -717,7 +717,7 @@ const CreateProposalWrapper: React.FC<Props> = ({
    *************************************************/
   const buttonLabels = {
     [TransactionState.SUCCESS]: t('TransactionModal.goToProposal'),
-    [TransactionState.WAITING]: t('TransactionModal.createProposal'),
+    [TransactionState.WAITING]: t('TransactionModal.createProposalNow'),
   };
 
   if (daoDetailsLoading) {

diff --git a/src/pages/proposeSettings.tsx b/src/pages/proposeSettings.tsx
@@ -807,7 +807,7 @@ const ProposeSettingWrapper: React.FC<Props> = ({
    *************************************************/
   const buttonLabels = {
     [TransactionState.SUCCESS]: t('TransactionModal.goToProposal'),
-    [TransactionState.WAITING]: t('TransactionModal.createProposal'),
+    [TransactionState.WAITING]: t('TransactionModal.createProposalNow'),
   };
 
   if (daoDetailsLoading || tokenSupplyIsLoading) {