Skip to content

Commit dbcd5af

Browse files
committed
Merge branch 'develop' into feat/replace-select-picker-v3
2 parents f49d604 + 9bf5d80 commit dbcd5af

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/App.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ export default function App() {
9898
}
9999
} else {
100100
didMountRef.current = true
101+
// Removing any toast explicitly due to race condition of offline toast for some users
102+
ToastManager.dismissToast(onlineToastRef.current)
101103
}
102104
}, [isOnline])
103105

src/components/app/details/triggerView/CiWebhookDebuggingModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ export default function CiWebhookModal({
293293
className="mr-20 dc__transparent dc__align-right"
294294
onClick={() => onEditShowEditableCiModal(ciPipelineId, workflowId)}
295295
>
296-
// Here the CI model requires the CiPipelineId not the CiPipelineMaterialId
296+
{/* Here the CI model requires the CiPipelineId not the CiPipelineMaterialId */}
297297
<Edit className=" icon-dim-24" />
298298
</button>
299299
</div>

0 commit comments

Comments
 (0)