chore(git): merge pull request #219 from fixes-10-7 into staging

Reviewed-on: #219
Reviewed-by: eugene <eugene@nostrdev.com>

src/components/MarkFormField/index.tsx

@@ -1,7 +1,7 @@
 import { CurrentUserMark } from '../../types/mark.ts'
 import styles from './style.module.scss'
 
-import { MARK_TYPE_TRANSLATION, NEXT, SIGN } from '../../utils/const.ts'
+import { MARK_TYPE_TRANSLATION } from '../../utils/const.ts'
 import {
   findNextIncompleteCurrentUserMark,
   isCurrentUserMarksComplete,
@@ -32,7 +32,6 @@ const MarkFormField = ({
   handleCurrentUserMarkChange
 }: MarkFormFieldProps) => {
   const [displayActions, setDisplayActions] = useState(true)
-  const getSubmitButtonText = () => (isReadyToSign() ? SIGN : NEXT)
   const isReadyToSign = () =>
     isCurrentUserMarksComplete(currentUserMarks) ||
     isCurrentValueLast(currentUserMarks, selectedMark, selectedMarkValue)
@@ -61,6 +60,7 @@ const MarkFormField = ({
           onClick={toggleActions}
           className={styles.triggerBtn}
           type="button"
+          title="Toggle"
         >
           <svg
             xmlns="http://www.w3.org/2000/svg"
@@ -93,7 +93,7 @@ const MarkFormField = ({
               />
               <div className={styles.actionsBottom}>
                 <button type="submit" className={styles.submitButton}>
-                  {getSubmitButtonText()}
+                  NEXT
                 </button>
               </div>
             </form>

src/utils/const.ts

@@ -4,8 +4,6 @@ export const EMPTY: string = ''
 export const MARK_TYPE_TRANSLATION: { [key: string]: string } = {
   [MarkType.FULLNAME.valueOf()]: 'Full Name'
 }
-export const SIGN: string = 'Sign'
-export const NEXT: string = 'Next'
 export const ARRAY_BUFFER = 'arraybuffer'
 export const DEFLATE = 'DEFLATE'
 

src/utils/mark.ts

@@ -153,6 +153,11 @@ const findOtherUserMarks = (marks: Mark[], pubkey: string): Mark[] => {
 }
 
 export const DEFAULT_TOOLBOX: DrawTool[] = [
+  {
+    identifier: MarkType.TEXT,
+    icon: faT,
+    label: 'Text'
+  },
   {
     identifier: MarkType.FULLNAME,
     icon: faIdCard,
@@ -177,11 +182,6 @@ export const DEFAULT_TOOLBOX: DrawTool[] = [
     label: 'Date Time',
     isComingSoon: true
   },
-  {
-    identifier: MarkType.TEXT,
-    icon: faT,
-    label: 'Text'
-  },
   {
     identifier: MarkType.NUMBER,
     icon: fa1,