Skip to content

Commit 53a35a8

Browse files
committed
resolve the mergre conficts
1 parent c60c796 commit 53a35a8

File tree

1 file changed

+25
-24
lines changed

1 file changed

+25
-24
lines changed

app/components/CodeEditor/CodeEditor.tsx

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -128,31 +128,32 @@ const EditorControls = ({
128128
Reset
129129
</MyBtn>
130130
</Flex>
131-
{nextStepPath ? (
132-
<>
131+
{
132+
nextStepPath?(
133+
<>
133134
<MyBtn
134-
onClick={() => {
135-
if (nextStepPath) router.push("/" + nextStepPath);
136-
}}
137-
variant={
138-
outputResult.validityStatus === "valid" ? "default" : "success"
139-
}
140-
isDisabled={!!isValidating}
141-
size={outputResult.validityStatus === "valid" ? "sm" : "xs"}
142-
>
143-
Next <span style={{ marginLeft: "4px" }}></span>
144-
<FiChevronRight
145-
color={
146-
outputResult.validityStatus === "valid"
147-
? "white"
148-
: "hsl(var(--success))"
149-
}
150-
/>
151-
</MyBtn>
152-
</>
153-
) : (
154-
<CertificateButton />
155-
)}
135+
onClick={() => {
136+
if (nextStepPath) router.push("/" + nextStepPath);
137+
}}
138+
variant={
139+
outputResult.validityStatus === "valid" ? "default" : "success"
140+
}
141+
isDisabled={!nextStepPath}
142+
size={outputResult.validityStatus === "valid" ? "sm" : "xs"}
143+
>
144+
Next <span style={{ marginLeft: "4px" }}></span>
145+
<FiChevronRight
146+
color={
147+
outputResult.validityStatus === "valid"
148+
? "white"
149+
: "hsl(var(--success))"
150+
}
151+
/>
152+
</MyBtn>
153+
</>
154+
):
155+
<CertificateButton/>
156+
}
156157
</div>
157158
);
158159
};

0 commit comments

Comments
 (0)