fix merge conflict

the-collab-lab · Oct 7, 2023 · 041c52f · 041c52f
1 parent ed433ec
commit 041c52f
Showing 1 changed file with 11 additions and 22 deletions.
diff --git a/src/views/Home.jsx b/src/views/Home.jsx
@@ -130,38 +130,27 @@ export function Home({ createToken, setListToken }) {
 							</RoughNotation>
 						)}
 					</div>
+				</div>
+				<div className="flex flex-col items-center gap-10 mt-40">
 					<Button
 						onClick={(e) => handleCreateClick(e)}
 						text="CREATE LIST"
 						className="max-w-4xl"
 					/>
 					<button
 						onClick={() => setShowModal(true)}
-						className="underline underline-offset-8 font-semibold text-green dark:text-light-green"
+						className="underline underline-offset-8 font-semibold text-green dark:text-teal-200"
 					>
-						{createListMessage}
-					</RoughNotation>
-				)}
-			</div>
-			<div className="flex flex-col items-center gap-10 mt-40">
-				<Button
-					onClick={(e) => handleCreateClick(e)}
-					text="CREATE LIST"
-					className="max-w-4xl"
+						Join existing list
+					</button>
+				</div>
+				<Modal
+					showModal={showModal}
+					setShowModal={setShowModal}
+					modalBody={modalBody}
+					confirmationAction={handleTokenInputFormSubmit}
 				/>
-				<button
-					onClick={() => setShowModal(true)}
-					className="underline underline-offset-8 font-semibold text-green dark:text-teal-200"
-				>
-					Join existing list
-				</button>
 			</div>
-			<Modal
-				showModal={showModal}
-				setShowModal={setShowModal}
-				modalBody={modalBody}
-				confirmationAction={handleTokenInputFormSubmit}
-			/>
 		</div>
 	);
 }