[#21] Fix question path and apply currentColor to close-btn

src/routes/index.tsx

@@ -8,16 +8,13 @@ import SurveyScreen from 'screens/Survey';
 
 import ProtectedRoute from './ProtectedRoute';
 
+export const questionPath = 'questions';
+
 export const paths = {
   root: '/',
   signIn: '/sign-in',
   survey: '/surveys/:id',
-  question: '/surveys/:id/questions',
-};
-
-export const questionPath = (): string => {
-  const questionPaths = paths.question.split('/');
-  return questionPaths[questionPaths.length - 1];
+  question: `/surveys/:id/${questionPath}`,
 };
 
 const routes: RouteObject[] = [

src/screens/Question/index.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { ReactComponent as ArrowRight } from 'assets/images/icons/arrow-right.svg';
-import { ReactComponent as CloseButton } from 'assets/images/icons/close-btn-white.svg';
+import { ReactComponent as CloseButton } from 'assets/images/icons/close-btn.svg';
 import AppSlider from 'components/AppSlider';
 import MainView from 'components/MainView';
 
@@ -16,7 +16,7 @@ const QuestionScreen = (): JSX.Element => {
   return (
     <MainView backgroundUrl="https://dhdbhh0jsld0o.cloudfront.net/m/1ea51560991bcb7d00d0_">
       <div className="flex flex-col h-full">
-        <button className="mt-8 mr-8 p-1 self-end" data-test-id={questionScreenTestIds.closeButton}>
+        <button className="mt-8 mr-8 p-1 self-end text-white" data-test-id={questionScreenTestIds.closeButton}>
           <CloseButton />
         </button>
         <div className="w-1/2 self-center flex-1 flex flex-col justify-center">

src/screens/Survey/index.tsx

@@ -72,7 +72,7 @@ const SurveyScreen = (): JSX.Element => {
               {survey?.description}
             </p>
             <div className="pt-8">
-              <Link to={questionPath()}>
+              <Link to={questionPath}>
                 <ElevatedButton isFullWidth type="submit" data-test-id={surveyScreenTestIds.startSurveyButton}>
                   Start Survey
                 </ElevatedButton>