Pull request: a catch-up refused or failed after it stopped being behind shows its error under the up-to-date row
1 file+3−10/1 viewed
| 1039 | 1039 | {catchUp && "error" in catchUp && <ErrorText>{catchUp.error}</ErrorText>} | |
| 1040 | 1040 | </StatusRow> | |
| 1041 | 1041 | ) : ( | |
| 1042 | − | pull.headCommit && ( | |
| 1042 | + | (pull.headCommit || (catchUp && "error" in catchUp)) && ( | |
| 1043 | 1043 | <StatusRow | |
| 1044 | 1044 | icon={<CircleCheck size={16} className="text-accent" />} | |
| 1045 | 1045 | title={ | |
| 1056 | 1056 | </> | |
| 1057 | 1057 | )} | |
| 1058 | 1058 | {agentCatchUp && "g1t merged it in and pushed the result. Its checks run again on the new commit."} | |
| 1059 | + | {/* A catch-up refused or failed after the pull request stopped being behind. */} | |
| 1060 | + | {catchUp && "error" in catchUp && <ErrorText>{catchUp.error}</ErrorText>} | |
| 1059 | 1061 | </StatusRow> | |
| 1060 | 1062 | ) | |
| 1061 | 1063 | )} |