From 4284a6c3f25a3f5d0c5339ced499dd5d2eee6bf8 Mon Sep 17 00:00:00 2001 From: nicosampler Date: Tue, 15 Oct 2024 07:57:27 -0300 Subject: [PATCH] Mati feedback --- .../features/Deploy/QueueFromGitOpsPage.tsx | 81 ++++++++++--------- 1 file changed, 42 insertions(+), 39 deletions(-) diff --git a/packages/website/src/features/Deploy/QueueFromGitOpsPage.tsx b/packages/website/src/features/Deploy/QueueFromGitOpsPage.tsx index dd2df9245..ccaa4d1ff 100644 --- a/packages/website/src/features/Deploy/QueueFromGitOpsPage.tsx +++ b/packages/website/src/features/Deploy/QueueFromGitOpsPage.tsx @@ -918,46 +918,49 @@ export default function QueueFromGitOps() { )} - {!!buildState.result?.deployerSteps?.length && ( - - {deployer.queuedTransactions.length === 0 ? ( - - - Some transactions should be executed outside the safe before - staging. You can execute these now in your browser. By - clicking the button below. + {!!buildState.result?.deployerSteps?.length && + (buildState.result?.safeSteps.length || 0) > 0 && ( + + {deployer.queuedTransactions.length === 0 ? ( + + + Some transactions should be executed outside the safe + before staging. You can execute these now in your browser. + By clicking the button below. + + + + ) : deployer.executionProgress.length < + deployer.queuedTransactions.length ? ( + + Deploying txns {deployer.executionProgress.length + 1} /{' '} + {deployer.queuedTransactions.length} - - - ) : deployer.executionProgress.length < - deployer.queuedTransactions.length ? ( - - Deploying txns {deployer.executionProgress.length + 1} /{' '} - {deployer.queuedTransactions.length} - - ) : ( - - All Transactions Queued Successfully. You may now continue the - safe deployment. - - )} - - )} + ) : ( + + All Transactions Queued Successfully. You may now continue + the safe deployment. + + )} + + )} {cannonDefInfo?.def && multicallTxn?.data && (