.eslintrc.cjs

@@ -6,7 +6,7 @@ module.exports = {
     'plugin:@typescript-eslint/recommended',
     'plugin:react-hooks/recommended'
   ],
-  ignorePatterns: ['dist', '.eslintrc.cjs', 'licenseChecker.cjs', "*.min.js"],
+  ignorePatterns: ['dist', '.eslintrc.cjs'],
   parser: '@typescript-eslint/parser',
   plugins: ['react-refresh'],
   rules: {

.git-hooks/commit-msg

@@ -1,19 +0,0 @@
-#!/bin/sh
-# Get the commit message (the parameter we're given is just the path to the
-# temporary file which holds the message).
-commit_message=$(cat "$1")
-
-if (echo "$commit_message" | grep -Eq "^(build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test)(\([a-z0-9 \-]+\))?!?: .+$") then
-   tput setaf 2;
-   echo "✔ Commit message meets Conventional Commit standards"
-   tput sgr0;
-   exit 0
-fi
-
-tput setaf 1;
-echo "❌ Commit message does not meet the Conventional Commit standard!"
-tput sgr0;
-echo "An example of a valid message is:"
-echo "  feat(login): add the 'remember me' button"
-echo "📝 More details at: https://www.conventionalcommits.org/en/v1.0.0/#summary"
-exit 1

.git-hooks/pre-commit

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# Avoid commits to the master branch
-BRANCH=`git rev-parse --abbrev-ref HEAD`
-REGEX="^(master|main|staging|development)$"
-
-if [[ "$BRANCH" =~ $REGEX ]]; then
-  echo "You are on branch $BRANCH. Are you sure you want to commit to this branch?"
-  echo "If so, commit with -n to bypass the pre-commit hook."
-  exit 1
-fi
-
-npm run lint-staged

.gitea/workflows/release-staging.yaml

@@ -17,21 +17,9 @@ jobs:
         with:
           node-version: 18
 
-      - name: Audit
-        run: npm audit --omit=dev
-
       - name: Install Dependencies
         run: npm ci
 
-      - name: License check
-        run: npm run license-checker
-
-      - name: Lint check
-        run: npm run lint
-
-      - name: Formatter check
-        run: npm run formatter:check
-
       - name: Create .env File
         run: echo "VITE_MOST_POPULAR_RELAYS=${{ vars.VITE_MOST_POPULAR_RELAYS }}" > .env
 
@@ -41,6 +29,6 @@ jobs:
       - name: Release Build
         run: |
           npm -g install cloudron-surfer
-          surfer config --token ${{ secrets.STAGING_CLOUDRON_SURFER_TOKEN }} --server staging.sigit.io
+          surfer config --token ${{ secrets.STAGING_CLOUDRON_SURFER_TOKEN }} --server staging.sigit.io 
           surfer put dist/* / --all -d
-          surfer put dist/.well-known / --all
+          surfer put dist/.well-known / --all  

.gitea/workflows/staging-pull-request.yaml

@@ -1,34 +0,0 @@
-name: Open PR on Staging
-on:
-  pull_request:
-    types: [opened, edited, synchronize]
-    branches:
-      - staging
-
-jobs:
-  audit_and_check:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 18
-
-      - name: Audit
-        run: npm audit --omit=dev
-
-      - name: Install Dependencies
-        run: npm ci
-
-      - name: License check
-        run: npm run license-checker
-
-      - name: Lint check
-        run: npm run lint
-
-      - name: Formatter check
-        run: npm run formatter:check

LICENSE

@@ -1,661 +1,9 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
+MIT License
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright (c) 2024 sig
 
-                            Preamble
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

index.html

@@ -8,7 +8,6 @@
   </head>
   <body>
     <div id="root"></div>
-    <script src="/opentimestamps.min.js"></script>
     <script type="module" src="/src/main.tsx"></script>
   </body>
 </html>

licenseChecker.cjs

@@ -1,28 +0,0 @@
-const process = require('node:process')
-const licenseChecker = require('license-checker')
-
-const check = (cwd) => {
-  return new Promise((resolve, reject) => {
-    licenseChecker.init(
-      {
-        production: true,
-        start: cwd,
-        excludePrivatePackages: true,
-        onlyAllow:
-          'AFLv2.1;Apache 2.0;Apache-2.0;Apache*;Artistic-2.0;0BSD;BSD*;BSD-2-Clause;BSD-3-Clause;BSD 3-Clause;CC0-1.0;CC-BY-3.0;CC-BY-4.0;ISC;MIT;MPL-2.0;ODC-By-1.0;Python-2.0;Unlicense;',
-        excludePackages: ''
-      },
-      (error, json) => {
-        if (error) {
-          reject(error)
-        } else {
-          resolve(json)
-        }
-      }
-    )
-  })
-}
-
-check(process.cwd(), true)
-  .then(() => console.log('All packages are licensed properly'))
-  .catch((err) => console.log('license checker err', err))

package.json

@@ -1,23 +1,17 @@
 {
-  "name": "sigit",
+  "name": "web",
   "private": true,
-  "version": "0.0.0-beta",
+  "version": "0.0.0",
   "type": "module",
   "homepage": "https://sigit.io/",
-  "license": "AGPL-3.0-or-later ",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "lint:fix": "eslint . --fix --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
-    "lint:staged": "eslint --fix --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
     "formatter:check": "prettier --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
     "formatter:fix": "prettier --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
-    "formatter:staged": "prettier --write --ignore-unknown",
-    "preview": "vite preview",
-    "preinstall": "git config core.hooksPath .git-hooks",
-    "license-checker": "node licenseChecker.cjs",
-    "lint-staged": "lint-staged"
+    "preview": "vite preview"
   },
   "dependencies": {
     "@emotion/react": "11.11.4",
@@ -31,9 +25,8 @@
     "@mui/material": "5.15.11",
     "@noble/hashes": "^1.4.0",
     "@nostr-dev-kit/ndk": "2.5.0",
-    "@pdf-lib/fontkit": "^1.1.1",
     "@reduxjs/toolkit": "2.2.1",
-    "axios": "^1.7.4",
+    "axios": "1.6.7",
     "crypto-hash": "3.0.0",
     "crypto-js": "^4.2.0",
     "dnd-core": "16.0.1",
@@ -42,22 +35,17 @@
     "jszip": "3.10.1",
     "lodash": "4.17.21",
     "mui-file-input": "4.0.4",
-    "nostr-login": "^1.6.6",
     "nostr-tools": "2.7.0",
     "pdf-lib": "^1.17.1",
     "pdfjs-dist": "^4.4.168",
-    "rdndmb-html5-to-touch": "^8.0.3",
     "react": "^18.2.0",
-    "react-dnd": "^16.0.1",
-    "react-dnd-multi-backend": "^8.0.3",
+    "react-dnd": "16.0.1",
+    "react-dnd-html5-backend": "16.0.1",
     "react-dom": "^18.2.0",
-    "react-dropzone": "^14.2.3",
     "react-redux": "9.1.0",
     "react-router-dom": "6.22.1",
-    "react-singleton-hook": "^4.0.1",
     "react-toastify": "10.0.4",
     "redux": "5.0.1",
-    "svgo": "^3.3.2",
     "tseep": "1.2.1"
   },
   "devDependencies": {
@@ -67,26 +55,16 @@
     "@types/pdfjs-dist": "^2.10.378",
     "@types/react": "^18.2.56",
     "@types/react-dom": "^18.2.19",
-    "@types/svgo": "^3.0.0",
     "@typescript-eslint/eslint-plugin": "^7.0.2",
     "@typescript-eslint/parser": "^7.0.2",
     "@vitejs/plugin-react": "^4.2.1",
     "eslint": "^8.56.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.5",
-    "license-checker": "^25.0.1",
-    "lint-staged": "^15.2.8",
     "prettier": "3.2.5",
     "ts-css-modules-vite-plugin": "1.0.20",
     "typescript": "^5.2.2",
     "vite": "^5.1.4",
-    "vite-plugin-node-polyfills": "^0.22.0",
     "vite-tsconfig-paths": "4.3.2"
-  },
-  "lint-staged": {
-    "*.{js,jsx,ts,tsx}": [
-      "npm run lint:staged"
-    ],
-    "*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}": "npm run formatter:staged"
   }
 }

public/.well-known/nostr.json

@@ -1,15 +1,15 @@
 {
-  "names": {
-    "_": "6bf1024c6336093b632db2da21b65a44c7d82830454fb4d75634ba281e161c90"
-  },
-  "relays": {
-    "6bf1024c6336093b632db2da21b65a44c7d82830454fb4d75634ba281e161c90": [
-      "wss://brb.io",
-      "wss://nostr.v0l.io",
-      "wss://nostr.coinos.io",
-      "wss://rsslay.nostr.net",
-      "wss://relay.current.fyi",
-      "wss://nos.io"
-    ]
-  }
+    "names": {
+        "_": "6bf1024c6336093b632db2da21b65a44c7d82830454fb4d75634ba281e161c90"
+    },
+    "relays": {
+        "6bf1024c6336093b632db2da21b65a44c7d82830454fb4d75634ba281e161c90": [
+            "wss://brb.io",
+            "wss://nostr.v0l.io",
+            "wss://nostr.coinos.io",
+            "wss://rsslay.nostr.net",
+            "wss://relay.current.fyi",
+            "wss://nos.io"
+        ]
+    }
 }

src/App.scss

@@ -41,7 +41,6 @@ p {
 
 body {
   color: $text-color;
-  background: $body-background-color;
   font-family: $font-familiy;
   letter-spacing: $letter-spacing;
   font-size: $body-font-size;
@@ -57,115 +56,10 @@ a {
   text-decoration: none;
   text-decoration-color: inherit;
   transition: ease 0.4s;
-  outline: none;
 
-  &:focus,
   &:hover {
     color: $primary-light;
     text-decoration: underline;
     text-decoration-color: inherit;
   }
 }
-
-input {
-  font-family: inherit;
-}
-
-ul {
-  list-style-type: none; /* Removes bullet points */
-  margin: 0; /* Removes default margin */
-  padding: 0; /* Removes default padding */
-}
-
-li {
-  list-style-type: none; /* Removes the bullets */
-  margin: 0; /* Removes any default margin */
-  padding: 0; /* Removes any default padding */
-}
-
-// Shared styles for center content (Create, Sign, Verify)
-.files-wrapper {
-  display: flex;
-  flex-direction: column;
-  gap: 25px;
-}
-
-.file-wrapper {
-  display: flex;
-  flex-direction: column;
-  gap: 15px;
-  position: relative;
-
-  // CSS, scroll position when scrolling to the files is adjusted by
-  // - first-child Header height, default body padding, and center content border (10px) and padding (10px)
-  // - others We don't include border and padding and scroll to the top of the image
-  &:first-child {
-    scroll-margin-top: $body-vertical-padding + 20px;
-  }
-  &:not(:first-child) {
-    scroll-margin-top: $body-vertical-padding;
-  }
-}
-
-// For pdf marks
-.image-wrapper {
-  position: relative;
-  -webkit-user-select: none;
-  user-select: none;
-
-  > img {
-    display: block;
-    width: 100%;
-    height: auto;
-    object-fit: contain; /* Ensure the image fits within the container */
-  }
-}
-
-// For image rendering (uploaded image as a file)
-.file-image {
-  -webkit-user-select: none;
-  user-select: none;
-
-  display: block;
-  width: 100%;
-  height: auto;
-  object-fit: contain; /* Ensure the image fits within the container */
-}
-
-// Consistent styling for every file mark
-// Reverts some of the design defaults for font
-.file-mark {
-  font-family: 'Roboto';
-  font-style: normal;
-  font-weight: normal;
-  letter-spacing: normal;
-  line-height: 1;
-
-  font-size: 16px;
-  color: black;
-  outline: 1px solid transparent;
-
-  justify-content: start;
-  align-items: start;
-
-  scroll-margin-top: $body-vertical-padding;
-}
-
-[data-dev='true'] {
-  .image-wrapper {
-    // outline: 1px solid #ccc; /* Optional: for visual debugging */
-    background-color: #e0f7fa; /* Optional: for visual debugging */
-  }
-}
-
-.extension-file-box {
-  border-radius: 4px;
-  background: rgba(255, 255, 255, 0.5);
-  height: 100px;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  color: rgba(0, 0, 0, 0.25);
-  font-size: 14px;
-}

src/App.tsx

@@ -1,7 +1,7 @@
 import { useEffect } from 'react'
-import { useAppSelector } from './hooks/store'
+import { useSelector } from 'react-redux'
 import { Navigate, Route, Routes } from 'react-router-dom'
-import { AuthController } from './controllers'
+import { AuthController, NostrController } from './controllers'
 import { MainLayout } from './layouts/Main'
 import {
   appPrivateRoutes,
@@ -10,10 +10,12 @@ import {
   publicRoutes,
   recursiveRouteRenderer
 } from './routes'
+import { State } from './store/rootReducer'
+import { getNsecBunkerDelegatedKey, saveNsecBunkerDelegatedKey } from './utils'
 import './App.scss'
 
 const App = () => {
-  const authState = useAppSelector((state) => state.auth)
+  const authState = useSelector((state: State) => state.auth)
 
   useEffect(() => {
     if (window.location.hostname === '0.0.0.0') {
@@ -23,10 +25,23 @@ const App = () => {
       window.location.hostname = 'localhost'
     }
 
+    generateBunkerDelegatedKey()
+
     const authController = new AuthController()
     authController.checkSession()
   }, [])
 
+  const generateBunkerDelegatedKey = () => {
+    const existingKey = getNsecBunkerDelegatedKey()
+
+    if (!existingKey) {
+      const nostrController = NostrController.getInstance()
+      const newDelegatedKey = nostrController.generateDelegatedKey()
+
+      saveNsecBunkerDelegatedKey(newDelegatedKey)
+    }
+  }
+
   const handleRootRedirect = () => {
     if (authState.loggedIn) return appPrivateRoutes.homePage
     const callbackPathEncoded = btoa(

src/components/AppBar/AppBar.tsx

@@ -9,42 +9,55 @@ import {
 } from '@mui/material'
 
 import { useEffect, useState } from 'react'
-import { useAppSelector } from '../../hooks/store'
+import { useDispatch, useSelector } from 'react-redux'
+import {
+  setAuthState,
+  setMetadataEvent,
+  userLogOutAction
+} from '../../store/actions'
+import { State } from '../../store/rootReducer'
+import { Dispatch } from '../../store/store'
 import Username from '../username'
 
 import { Link, useNavigate } from 'react-router-dom'
+import { MetadataController, NostrController } from '../../controllers'
 import {
   appPublicRoutes,
   appPrivateRoutes,
   getProfileRoute
 } from '../../routes'
-import { getProfileUsername, hexToNpub } from '../../utils'
+import {
+  clearAuthToken,
+  hexToNpub,
+  saveNsecBunkerDelegatedKey,
+  shorten
+} from '../../utils'
 import styles from './style.module.scss'
+import { setUserRobotImage } from '../../store/userRobotImage/action'
 import { Container } from '../Container'
 import { ButtonIcon } from '../ButtonIcon'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { faClose } from '@fortawesome/free-solid-svg-icons'
-import useMediaQuery from '@mui/material/useMediaQuery'
-import { useLogout } from '../../hooks/useLogout'
 
-import { launch as launchNostrLoginDialog } from 'nostr-login'
+const metadataController = new MetadataController()
 
 export const AppBar = () => {
   const navigate = useNavigate()
-  const logout = useLogout()
+
+  const dispatch: Dispatch = useDispatch()
+
   const [username, setUsername] = useState('')
   const [userAvatar, setUserAvatar] = useState('')
   const [anchorElUser, setAnchorElUser] = useState<null | HTMLElement>(null)
 
-  const authState = useAppSelector((state) => state.auth)
-  const metadataState = useAppSelector((state) => state.metadata)
-  const userRobotImage = useAppSelector((state) => state.userRobotImage)
+  const authState = useSelector((state: State) => state.auth)
+  const metadataState = useSelector((state: State) => state.metadata)
+  const userRobotImage = useSelector((state: State) => state.userRobotImage)
 
   useEffect(() => {
     if (metadataState) {
       if (metadataState.content) {
-        const profileMetadata = JSON.parse(metadataState.content)
-        const { picture } = profileMetadata
+        const { picture, display_name, name } = JSON.parse(
+          metadataState.content
+        )
 
         if (picture || userRobotImage) {
           setUserAvatar(picture || userRobotImage)
@@ -54,7 +67,7 @@ export const AppBar = () => {
           ? hexToNpub(authState.usersPubkey)
           : ''
 
-        setUsername(getProfileUsername(npub, profileMetadata))
+        setUsername(shorten(display_name || name || npub, 7))
       } else {
         setUserAvatar(userRobotImage || '')
         setUsername('')
@@ -79,157 +92,151 @@ export const AppBar = () => {
 
   const handleLogout = () => {
     handleCloseUserMenu()
-    logout()
+    dispatch(
+      setAuthState({
+        keyPair: undefined,
+        loggedIn: false,
+        usersPubkey: undefined,
+        loginMethod: undefined,
+        nsecBunkerPubkey: undefined
+      })
+    )
+    dispatch(setMetadataEvent(metadataController.getEmptyMetadataEvent()))
+    dispatch(setUserRobotImage(null))
+
+    // clear authToken saved in local storage
+    clearAuthToken()
+
+    dispatch(userLogOutAction())
+
+    // update nsecBunker delegated key after logout
+    const nostrController = NostrController.getInstance()
+    const newDelegatedKey = nostrController.generateDelegatedKey()
+    saveNsecBunkerDelegatedKey(newDelegatedKey)
+
     navigate('/')
   }
   const isAuthenticated = authState?.loggedIn === true
 
-  const matches = useMediaQuery('(max-width:767px)')
-  const [isBannerVisible, setIsBannerVisible] = useState(true)
-  const handleBannerHide = () => {
-    setIsBannerVisible(false)
-  }
-
   return (
-    <>
-      {isAuthenticated && isBannerVisible && (
-        <div className={styles.banner}>
-          <Container>
-            <div className={styles.bannerInner}>
-              <p className={styles.bannerText}>
-                SIGit is currently Beta software (available for user experience
-                testing), use at your own risk!
-              </p>
+    <AppBarMui
+      position="fixed"
+      className={styles.AppBar}
+      sx={{
+        boxShadow: 'none'
+      }}
+    >
+      <Container>
+        <Toolbar className={styles.toolbar} disableGutters={true}>
+          <Box className={styles.logoWrapper}>
+            <img src="/logo.svg" alt="Logo" onClick={() => navigate('/')} />
+          </Box>
+
+          <Box className={styles.rightSideBox}>
+            {!isAuthenticated && (
               <Button
-                aria-label={`close banner`}
-                variant="text"
-                onClick={handleBannerHide}
+                startIcon={<ButtonIcon />}
+                onClick={() => {
+                  navigate(appPublicRoutes.nostr)
+                }}
+                variant="contained"
               >
-                <FontAwesomeIcon icon={faClose} />
+                LOGIN
               </Button>
-            </div>
-          </Container>
-        </div>
-      )}
-      <AppBarMui
-        position={matches ? 'sticky' : 'static'}
-        className={styles.AppBar}
-        sx={{
-          boxShadow: 'none'
-        }}
-      >
-        <Container>
-          <Toolbar className={styles.toolbar} disableGutters={true}>
-            <Box className={styles.logoWrapper}>
-              <img src="/logo.svg" alt="Logo" onClick={() => navigate('/')} />
-            </Box>
+            )}
 
-            <Box className={styles.rightSideBox}>
-              {!isAuthenticated && (
-                <Button
-                  startIcon={<ButtonIcon />}
-                  onClick={() => {
-                    launchNostrLoginDialog()
+            {isAuthenticated && (
+              <>
+                <Username
+                  username={username}
+                  avatarContent={userAvatar}
+                  handleClick={handleOpenUserMenu}
+                />
+                <Menu
+                  id="menu-appbar"
+                  anchorEl={anchorElUser}
+                  anchorOrigin={{
+                    vertical: 'bottom',
+                    horizontal: 'center'
                   }}
-                  variant="contained"
+                  keepMounted
+                  transformOrigin={{
+                    vertical: 'top',
+                    horizontal: 'center'
+                  }}
+                  open={!!anchorElUser}
+                  onClose={handleCloseUserMenu}
                 >
-                  LOGIN
-                </Button>
-              )}
+                  <MenuItem
+                    sx={{
+                      justifyContent: 'center',
+                      display: { md: 'none' },
+                      fontWeight: 500,
+                      fontSize: '14px',
+                      color: 'var(--text-color)'
+                    }}
+                  >
+                    <Typography variant="h6">{username}</Typography>
+                  </MenuItem>
+                  <MenuItem
+                    onClick={handleProfile}
+                    sx={{
+                      justifyContent: 'center'
+                    }}
+                  >
+                    Profile
+                  </MenuItem>
+                  <MenuItem
+                    onClick={() => {
+                      setAnchorElUser(null)
 
-              {isAuthenticated && (
-                <>
-                  <Username
-                    username={username}
-                    avatarContent={userAvatar}
-                    handleClick={handleOpenUserMenu}
-                  />
-                  <Menu
-                    id="menu-appbar"
-                    anchorEl={anchorElUser}
-                    anchorOrigin={{
-                      vertical: 'bottom',
-                      horizontal: 'center'
+                      navigate(appPrivateRoutes.settings)
                     }}
-                    keepMounted
-                    transformOrigin={{
-                      vertical: 'top',
-                      horizontal: 'center'
+                    sx={{
+                      justifyContent: 'center'
                     }}
-                    open={!!anchorElUser}
-                    onClose={handleCloseUserMenu}
+                  >
+                    Settings
+                  </MenuItem>
+                  <MenuItem
+                    onClick={() => {
+                      setAnchorElUser(null)
+
+                      navigate(appPublicRoutes.verify)
+                    }}
+                    sx={{
+                      justifyContent: 'center'
+                    }}
+                  >
+                    Verify
+                  </MenuItem>
+                  <Link
+                    to={appPublicRoutes.source}
+                    target="_blank"
+                    style={{ color: 'inherit', textDecoration: 'inherit' }}
                   >
                     <MenuItem
-                      sx={{
-                        justifyContent: 'center',
-                        display: { md: 'none' },
-                        fontWeight: 500,
-                        fontSize: '14px',
-                        color: 'var(--text-color)'
-                      }}
-                    >
-                      <Typography variant="h6">{username}</Typography>
-                    </MenuItem>
-                    <MenuItem
-                      onClick={handleProfile}
                       sx={{
                         justifyContent: 'center'
                       }}
                     >
-                      Profile
+                      Source
                     </MenuItem>
-                    <MenuItem
-                      onClick={() => {
-                        setAnchorElUser(null)
-
-                        navigate(appPrivateRoutes.settings)
-                      }}
-                      sx={{
-                        justifyContent: 'center'
-                      }}
-                    >
-                      Settings
-                    </MenuItem>
-                    <MenuItem
-                      onClick={() => {
-                        setAnchorElUser(null)
-
-                        navigate(appPublicRoutes.verify)
-                      }}
-                      sx={{
-                        justifyContent: 'center'
-                      }}
-                    >
-                      Verify
-                    </MenuItem>
-                    <Link
-                      to={appPublicRoutes.source}
-                      target="_blank"
-                      style={{ color: 'inherit', textDecoration: 'inherit' }}
-                    >
-                      <MenuItem
-                        sx={{
-                          justifyContent: 'center'
-                        }}
-                      >
-                        Source
-                      </MenuItem>
-                    </Link>
-                    <MenuItem
-                      onClick={handleLogout}
-                      sx={{
-                        justifyContent: 'center'
-                      }}
-                    >
-                      Logout
-                    </MenuItem>
-                  </Menu>
-                </>
-              )}
-            </Box>
-          </Toolbar>
-        </Container>
-      </AppBarMui>
-    </>
+                  </Link>
+                  <MenuItem
+                    onClick={handleLogout}
+                    sx={{
+                      justifyContent: 'center'
+                    }}
+                  >
+                    Logout
+                  </MenuItem>
+                </Menu>
+              </>
+            )}
+          </Box>
+        </Toolbar>
+      </Container>
+    </AppBarMui>
   )
 }

src/components/AppBar/style.module.scss

@@ -34,42 +34,3 @@
     justify-content: flex-end;
   }
 }
-
-.banner {
-  color: #ffffff;
-  background-color: $primary-main;
-}
-
-.bannerInner {
-  display: flex;
-  gap: 10px;
-  padding-block: 10px;
-  z-index: 1;
-
-  width: 100%;
-
-  justify-content: space-between;
-  flex-direction: row;
-
-  button {
-    min-width: 44px;
-    color: inherit;
-  }
-
-  &:hover,
-  &.active,
-  &:focus-within {
-    background: $primary-main;
-    color: inherit;
-
-    button {
-      color: inherit;
-    }
-  }
-}
-
-.bannerText {
-  margin-left: 54px;
-  flex-grow: 1;
-  text-align: center;
-}

src/components/Container/index.tsx

@@ -6,18 +6,6 @@ interface ContainerProps {
   className?: string
 }
 
-/**
- * Container component with pre-defined width, padding and margins for top level layout.
- *
- * **Important:** To avoid conflicts with `defaultStyle` (changing the `width`, `max-width`, `padding-inline`, and/or `margin-inline`) make sure to either:
- * - When using *className* override, that styles are imported after the actual `Container` component
- * ```
- * import { Container } from './components/Container'
- * import styles from './style.module.scss'
- * ```
- * - or add *!important* to imported styles
- * - or override styles with *CSSProperties* object
- */
 export const Container = ({
   style = {},
   className = '',

src/components/DisplaySigit/index.tsx

@@ -1,132 +0,0 @@
-import { Meta } from '../../types'
-import { SigitCardDisplayInfo, SigitStatus, SignStatus } from '../../utils'
-import { Link } from 'react-router-dom'
-import { formatTimestamp, npubToHex } from '../../utils'
-import { appPublicRoutes, appPrivateRoutes } from '../../routes'
-import { Button, Divider, Tooltip } from '@mui/material'
-import { DisplaySigner } from '../DisplaySigner'
-import {
-  faArchive,
-  faCalendar,
-  faCopy,
-  faEye,
-  faFile,
-  faFileCircleExclamation
-} from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { UserAvatarGroup } from '../UserAvatarGroup'
-
-import styles from './style.module.scss'
-import { getExtensionIconLabel } from '../getExtensionIconLabel'
-import { useSigitMeta } from '../../hooks/useSigitMeta'
-import { extractFileExtensions } from '../../utils/file'
-
-type SigitProps = {
-  sigitCreateId: string
-  meta: Meta
-  parsedMeta: SigitCardDisplayInfo
-}
-
-export const DisplaySigit = ({
-  meta,
-  parsedMeta,
-  sigitCreateId: sigitCreateId
-}: SigitProps) => {
-  const { title, createdAt, submittedBy, signers, signedStatus, isValid } =
-    parsedMeta
-
-  const { signersStatus, fileHashes } = useSigitMeta(meta)
-  const { extensions, isSame } = extractFileExtensions(Object.keys(fileHashes))
-
-  return (
-    <div className={styles.itemWrapper}>
-      {signedStatus === SigitStatus.Complete && (
-        <Link
-          to={appPublicRoutes.verify}
-          state={{ meta }}
-          className={styles.insetLink}
-        ></Link>
-      )}
-      {signedStatus !== SigitStatus.Complete && (
-        <Link
-          to={`${appPrivateRoutes.sign}/${sigitCreateId}`}
-          className={styles.insetLink}
-        ></Link>
-      )}
-      <p className={`line-clamp-2 ${styles.title}`}>{title}</p>
-      <div className={styles.users}>
-        {submittedBy && (
-          <DisplaySigner
-            status={isValid ? SignStatus.Signed : SignStatus.Invalid}
-            pubkey={submittedBy}
-          />
-        )}
-        {submittedBy && signers.length ? (
-          <Divider orientation="vertical" flexItem />
-        ) : null}
-        <UserAvatarGroup max={7}>
-          {signers.map((signer) => {
-            const pubkey = npubToHex(signer)!
-            return (
-              <DisplaySigner
-                key={pubkey}
-                status={signersStatus[signer]}
-                pubkey={pubkey}
-              />
-            )
-          })}
-        </UserAvatarGroup>
-      </div>
-      <div className={`${styles.details} ${styles.iconLabel}`}>
-        <FontAwesomeIcon icon={faCalendar} />
-        {createdAt ? formatTimestamp(createdAt) : null}
-      </div>
-      <div className={`${styles.details} ${styles.status}`}>
-        <span className={styles.iconLabel}>
-          <FontAwesomeIcon icon={faEye} /> {signedStatus}
-        </span>
-        {extensions.length > 0 ? (
-          <span className={styles.iconLabel}>
-            {!isSame ? (
-              <>
-                <FontAwesomeIcon icon={faFile} /> Multiple File Types
-              </>
-            ) : (
-              getExtensionIconLabel(extensions[0])
-            )}
-          </span>
-        ) : (
-          <>
-            <FontAwesomeIcon icon={faFileCircleExclamation} /> &mdash;
-          </>
-        )}
-      </div>
-      <div className={styles.itemActions}>
-        <Tooltip title="Duplicate" arrow placement="top" disableInteractive>
-          <Button
-            sx={{
-              color: 'var(--primary-main)',
-              minWidth: '34px',
-              padding: '10px'
-            }}
-            variant={'text'}
-          >
-            <FontAwesomeIcon icon={faCopy} />
-          </Button>
-        </Tooltip>
-        <Tooltip title="Archive" arrow placement="top" disableInteractive>
-          <Button
-            sx={{
-              color: 'var(--primary-main)',
-              minWidth: '34px',
-              padding: '10px'
-            }}
-            variant={'text'}
-          >
-            <FontAwesomeIcon icon={faArchive} />
-          </Button>
-        </Tooltip>
-      </div>
-    </div>
-  )
-}

src/components/DisplaySigit/style.module.scss

@@ -1,114 +0,0 @@
-@import '../../styles/colors.scss';
-
-.itemWrapper {
-  position: relative;
-  overflow: hidden;
-  background-color: $overlay-background-color;
-  border-radius: 4px;
-
-  display: flex;
-  padding: 15px;
-  gap: 15px;
-  flex-direction: column;
-
-  &:only-child {
-    max-width: 600px;
-  }
-
-  &::before {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    transition: opacity ease 0.2s;
-    opacity: 0;
-    width: 4px;
-    background-color: $primary-main;
-    pointer-events: none;
-  }
-
-  &:hover,
-  &:focus-within {
-    &::before {
-      opacity: 1;
-    }
-
-    .itemActions {
-      transform: translateX(0);
-    }
-  }
-}
-
-.insetLink {
-  position: absolute;
-  inset: 0;
-  outline: none;
-}
-
-.itemActions {
-  display: flex;
-  gap: 10px;
-  padding: 10px;
-
-  > * {
-    flex-grow: 1;
-  }
-
-  @media (hover: hover) {
-    transition: ease 0.2s;
-    transform: translateX(100%);
-    position: absolute;
-    right: 0;
-    top: 0;
-    bottom: 0;
-
-    flex-direction: column;
-    background: $overlay-background-color;
-    border-left: solid 1px rgba(0, 0, 0, 0.1);
-
-    &:hover,
-    &:focus-within {
-      transform: translateX(0);
-    }
-  }
-
-  @media (hover: none) {
-    border-top: solid 1px rgba(0, 0, 0, 0.1);
-    padding-top: 10px;
-    margin-inline: -15px;
-    margin-bottom: -15px;
-  }
-}
-
-.title {
-  font-size: 20px;
-  color: $text-color;
-}
-
-.users {
-  margin-top: auto;
-
-  display: flex;
-  grid-gap: 10px;
-}
-
-.details {
-  color: rgba(0, 0, 0, 0.3);
-  font-size: 14px;
-}
-
-.iconLabel {
-  display: flex;
-  grid-gap: 10px;
-  align-items: center;
-}
-
-.status {
-  display: flex;
-  grid-gap: 25px;
-}
-
-a.itemWrapper:hover {
-  text-decoration: none;
-}

src/components/DisplaySigner/index.tsx

@@ -1,56 +0,0 @@
-import { Badge } from '@mui/material'
-import styles from './style.module.scss'
-import { UserAvatar } from '../UserAvatar'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import {
-  faCheck,
-  faEllipsis,
-  faExclamation,
-  faEye,
-  faHourglass,
-  faQuestion
-} from '@fortawesome/free-solid-svg-icons'
-import { SignStatus } from '../../utils'
-import { Spinner } from '../Spinner'
-
-type DisplaySignerProps = {
-  pubkey: string
-  status: SignStatus
-}
-
-const getStatusIcon = (status: SignStatus) => {
-  switch (status) {
-    case SignStatus.Signed:
-      return <FontAwesomeIcon icon={faCheck} />
-    case SignStatus.Awaiting:
-      return (
-        <Spinner>
-          <FontAwesomeIcon icon={faHourglass} />
-        </Spinner>
-      )
-    case SignStatus.Pending:
-      return <FontAwesomeIcon icon={faEllipsis} />
-    case SignStatus.Invalid:
-      return <FontAwesomeIcon icon={faExclamation} />
-    case SignStatus.Viewer:
-      return <FontAwesomeIcon icon={faEye} />
-
-    default:
-      return <FontAwesomeIcon icon={faQuestion} />
-  }
-}
-
-export const DisplaySigner = ({ status, pubkey }: DisplaySignerProps) => {
-  return (
-    <Badge
-      className={styles.signer}
-      overlap="circular"
-      anchorOrigin={{ vertical: 'top', horizontal: 'right' }}
-      badgeContent={
-        <div className={styles.statusBadge}>{getStatusIcon(status)}</div>
-      }
-    >
-      <UserAvatar pubkey={pubkey} />
-    </Badge>
-  )
-}

src/components/DisplaySigner/style.module.scss

@@ -1,23 +0,0 @@
-@import '../../styles/colors.scss';
-
-.statusBadge {
-  width: 22px;
-  height: 22px;
-  border-radius: 50%;
-
-  color: white;
-
-  display: flex;
-  align-items: center;
-  justify-content: center;
-
-  font-size: 10px;
-
-  background-color: $primary-main;
-}
-
-.signer {
-  background-color: white;
-  border-radius: 50%;
-  z-index: 1;
-}

src/components/DrawPDFFields/index.tsx

@@ -1,141 +1,132 @@
-import { Close } from '@mui/icons-material'
-import {
-  FormControl,
-  InputLabel,
-  ListItemIcon,
-  ListItemText,
-  MenuItem,
-  Select
-} from '@mui/material'
+import { AccessTime, CalendarMonth, ExpandMore, Gesture, PictureAsPdf, Badge, Work, Close } from '@mui/icons-material'
+import { Box, Typography, Accordion, AccordionDetails, AccordionSummary, CircularProgress, FormControl, InputLabel, MenuItem, Select } from '@mui/material'
 import styles from './style.module.scss'
-import React, { useEffect, useState } from 'react'
-import { ProfileMetadata, User, UserRole, KeyboardCode } from '../../types'
-import { MouseState, PdfPage, DrawnField, DrawTool } from '../../types/drawing'
-import { hexToNpub, npubToHex, getProfileUsername } from '../../utils'
-import { SigitFile } from '../../utils/file'
-import { getToolboxLabelByMarkType } from '../../utils/mark'
-import { FileDivider } from '../FileDivider'
-import { ExtensionFileBox } from '../ExtensionFileBox'
-import { FONT_SIZE, FONT_TYPE, inPx } from '../../utils/pdf'
-import { useScale } from '../../hooks/useScale'
-import { AvatarIconButton } from '../UserAvatarIconButton'
-import { UserAvatar } from '../UserAvatar'
-import _ from 'lodash'
+import { useEffect, useState } from 'react'
 
-const DEFAULT_START_SIZE = {
-  width: 140,
-  height: 40
-} as const
-
-interface HideSignersForDrawnField {
-  [key: number]: boolean
-}
+import * as PDFJS from "pdfjs-dist";
+import { ProfileMetadata, User } from '../../types';
+import { PdfFile, DrawTool, MouseState, PdfPage, DrawnField, MarkType } from '../../types/drawing';
+import { truncate } from 'lodash';
+import { hexToNpub } from '../../utils';
+import { toPdfFiles } from '../../utils/pdf.ts'
+PDFJS.GlobalWorkerOptions.workerSrc = 'node_modules/pdfjs-dist/build/pdf.worker.mjs';
 
 interface Props {
+  selectedFiles: File[]
   users: User[]
   metadata: { [key: string]: ProfileMetadata }
-  sigitFiles: SigitFile[]
-  setSigitFiles: React.Dispatch<React.SetStateAction<SigitFile[]>>
-  selectedTool?: DrawTool
+  onDrawFieldsChange: (pdfFiles: PdfFile[]) => void
 }
 
 export const DrawPDFFields = (props: Props) => {
-  const { selectedTool, sigitFiles, setSigitFiles, users } = props
-
-  const signers = users.filter((u) => u.role === UserRole.signer)
-  const defaultSignerNpub = signers.length ? hexToNpub(signers[0].pubkey) : ''
-  const [lastSigner, setLastSigner] = useState(defaultSignerNpub)
-  const [hideSignersForDrawnField, setHideSignersForDrawnField] =
-    useState<HideSignersForDrawnField>({})
-
-  /**
-   * Return first pubkey that is present in the signers list
-   * @param pubkeys
-   * @returns available pubkey or empty string
-   */
-  const getAvailableSigner = (...pubkeys: string[]) => {
-    const availableSigner: string | undefined = pubkeys.find((pubkey) =>
-      signers.some((s) => s.pubkey === npubToHex(pubkey))
-    )
-    return availableSigner || ''
-  }
-
-  const { to, from } = useScale()
+  const { selectedFiles } = props
+  
+  const [pdfFiles, setPdfFiles] = useState<PdfFile[]>([])
+  const [parsingPdf, setParsingPdf] = useState<boolean>(false)
+  const [showDrawToolBox, setShowDrawToolBox] = useState<boolean>(false)
+  
+  const [selectedTool, setSelectedTool] = useState<DrawTool | null>()
+  const [toolbox] = useState<DrawTool[]>([
+    {
+      identifier: MarkType.SIGNATURE,
+      icon: <Gesture/>,
+      label: 'Signature',
+      active: false
+  
+    },
+    {
+      identifier: MarkType.FULLNAME,
+      icon: <Badge/>,
+      label: 'Full Name',
+      active: true
+    },
+    {
+      identifier: MarkType.JOBTITLE,
+      icon: <Work/>,
+      label: 'Job Title',
+      active: false
+    },
+    {
+      identifier: MarkType.DATE,
+      icon: <CalendarMonth/>,
+      label: 'Date',
+      active: false
+    },
+    {
+      identifier: MarkType.DATETIME,
+      icon: <AccessTime/>,
+      label: 'Datetime',
+      active: false
+    },
+  ])
 
   const [mouseState, setMouseState] = useState<MouseState>({
     clicked: false
   })
 
-  const [activeDrawnField, setActiveDrawnField] = useState<{
-    fileIndex: number
-    pageIndex: number
-    drawnFieldIndex: number
-  }>()
-  const isActiveDrawnField = (
-    fileIndex: number,
-    pageIndex: number,
-    drawnFieldIndex: number
-  ) =>
-    activeDrawnField?.fileIndex === fileIndex &&
-    activeDrawnField?.pageIndex === pageIndex &&
-    activeDrawnField?.drawnFieldIndex === drawnFieldIndex
+  useEffect(() => {
+    if (selectedFiles) {
+      setParsingPdf(true)
+      
+      parsePdfPages().finally(() => {
+        setParsingPdf(false)
+      })
+    }
+  }, [selectedFiles])
+
+  useEffect(() => {
+    if (pdfFiles) props.onDrawFieldsChange(pdfFiles)
+  }, [pdfFiles])
 
   /**
    * Drawing events
    */
-  useEffect(() => {
-    window.addEventListener('pointerup', handlePointerUp)
-    window.addEventListener('pointercancel', handlePointerUp)
-
+  useEffect(() => {  
+    // window.addEventListener('mousedown', onMouseDown);
+    window.addEventListener('mouseup', onMouseUp);
+    
     return () => {
-      window.removeEventListener('pointerup', handlePointerUp)
-      window.removeEventListener('pointercancel', handlePointerUp)
+      // window.removeEventListener('mousedown', onMouseDown);
+      window.removeEventListener('mouseup', onMouseUp);
     }
   }, [])
 
   const refreshPdfFiles = () => {
-    setSigitFiles([...sigitFiles])
+    setPdfFiles([...pdfFiles])
   }
 
   /**
-   * Fired only on when left (primary pointer interaction) clicking page image
+   * Fired only when left click and mouse over pdf page
    * Creates new drawnElement and pushes in the array
    * It is re rendered and visible right away
    *
-   * @param event Pointer event
+   * @param event Mouse event
    * @param page PdfPage where press happened
    */
-  const handlePointerDown = (
-    event: React.PointerEvent,
-    page: PdfPage,
-    fileIndex: number,
-    pageIndex: number
-  ) => {
+  const onMouseDown = (event: any, page: PdfPage) => {
     // Proceed only if left click
     if (event.button !== 0) return
+    
+    // Only allow drawing if mouse is not over other drawn element
+    const isOverPdfImageWrapper = event.target.tagName === 'IMG'
 
-    if (!selectedTool) {
+    if (!selectedTool || !isOverPdfImageWrapper) {
       return
     }
 
-    const { x, y } = getPointerCoordinates(event)
+    const { mouseX, mouseY } = getMouseCoordinates(event)
 
     const newField: DrawnField = {
-      left: to(page.width, x),
-      top: to(page.width, y),
-      width: event.pointerType === 'mouse' ? 0 : DEFAULT_START_SIZE.width,
-      height: event.pointerType === 'mouse' ? 0 : DEFAULT_START_SIZE.height,
-      counterpart: getAvailableSigner(lastSigner, defaultSignerNpub),
+      left: mouseX,
+      top: mouseY,
+      width: 0,
+      height: 0,
+      counterpart: '',
       type: selectedTool.identifier
     }
 
     page.drawnFields.push(newField)
 
-    setActiveDrawnField({
-      fileIndex,
-      pageIndex,
-      drawnFieldIndex: page.drawnFields.length - 1
-    })
     setMouseState((prev) => {
       return {
         ...prev,
@@ -146,9 +137,9 @@ export const DrawPDFFields = (props: Props) => {
 
   /**
    * Drawing is finished, resets all the variables used to draw
-   * @param event Pointer event
+   * @param event Mouse event
    */
-  const handlePointerUp = () => {
+  const onMouseUp = () => {
     setMouseState((prev) => {
       return {
         ...prev,
@@ -160,26 +151,20 @@ export const DrawPDFFields = (props: Props) => {
   }
 
   /**
-   * After {@link handlePointerDown} create an drawing element, this function gets called on every pixel moved
-   * which alters the newly created drawing element, resizing it while pointer moves
-   * @param event Pointer event
+   * After {@link onMouseDown} create an drawing element, this function gets called on every pixel moved
+   * which alters the newly created drawing element, resizing it while mouse move
+   * @param event Mouse event
    * @param page PdfPage where moving is happening
    */
-  const handlePointerMove = (event: React.PointerEvent, page: PdfPage) => {
-    if (mouseState.clicked && selectedTool && event.pointerType === 'mouse') {
-      const lastElementIndex = page.drawnFields.length - 1
-
+  const onMouseMove = (event: any, page: PdfPage) => {
+    if (mouseState.clicked && selectedTool) {
+      const lastElementIndex = page.drawnFields.length -1
       const lastDrawnField = page.drawnFields[lastElementIndex]
 
-      // Return early if we don't have lastDrawnField
-      // Issue noticed in the console when dragging out of bounds
-      // to the page below (without releaseing mouse click)
-      if (!lastDrawnField) return
-
-      const { x, y } = getPointerCoordinates(event)
-
-      const width = to(page.width, x) - lastDrawnField.left
-      const height = to(page.width, y) - lastDrawnField.top
+      const { mouseX, mouseY } = getMouseCoordinates(event)
+      
+      const width = mouseX - lastDrawnField.left
+      const height = mouseY - lastDrawnField.top
 
       lastDrawnField.width = width
       lastDrawnField.height = height
@@ -187,75 +172,55 @@ export const DrawPDFFields = (props: Props) => {
       const currentDrawnFields = page.drawnFields
 
       currentDrawnFields[lastElementIndex] = lastDrawnField
-
+      
       refreshPdfFiles()
     }
-  }
+  } 
 
   /**
    * Fired when event happens on the drawn element which will be moved
-   * pointer coordinates relative to drawn element will be stored
+   * mouse coordinates relative to drawn element will be stored
    * so when we start moving, offset can be calculated
-   * x - offsetX
-   * y - offsetY
+   * mouseX - offsetX
+   * mouseY - offsetY
    *
-   * @param event Pointer event
-   * @param drawnFieldIndex Which we are moving
+   * @param event Mouse event
+   * @param drawnField Which we are moving
    */
-  const handleDrawnFieldPointerDown = (
-    event: React.PointerEvent,
-    fileIndex: number,
-    pageIndex: number,
-    drawnFieldIndex: number
-  ) => {
+  const onDrawnFieldMouseDown = (event: any) => {
     event.stopPropagation()
-
+    
     // Proceed only if left click
     if (event.button !== 0) return
 
-    const drawingRectangleCoords = getPointerCoordinates(event)
+    const drawingRectangleCoords = getMouseCoordinates(event)
 
-    setActiveDrawnField({ fileIndex, pageIndex, drawnFieldIndex })
     setMouseState({
       dragging: true,
       clicked: false,
       coordsInWrapper: {
-        x: drawingRectangleCoords.x,
-        y: drawingRectangleCoords.y
+        mouseX: drawingRectangleCoords.mouseX,
+        mouseY: drawingRectangleCoords.mouseY
       }
     })
-
-    // make signers dropdown visible
-    setHideSignersForDrawnField((prev) => ({
-      ...prev,
-      [drawnFieldIndex]: false
-    }))
   }
 
   /**
-   * Moves the drawnElement by the pointer position (pointer can grab anywhere on the drawn element)
-   * @param event Pointer event
+   * Moves the drawnElement by the mouse position (mouse can grab anywhere on the drawn element)
+   * @param event Mouse event
    * @param drawnField which we are moving
-   * @param pageWidth pdf value which is used to calculate scaled offset
    */
-  const handleDrawnFieldPointerMove = (
-    event: React.PointerEvent,
-    drawnField: DrawnField,
-    pageWidth: number
-  ) => {
+  const onDranwFieldMouseMove = (event: any, drawnField: DrawnField) => {
     if (mouseState.dragging) {
-      const { x, y, rect } = getPointerCoordinates(
-        event,
-        event.currentTarget.parentElement
-      )
+      const { mouseX, mouseY, rect } = getMouseCoordinates(event, event.target.parentNode)
       const coordsOffset = mouseState.coordsInWrapper
 
       if (coordsOffset) {
-        let left = to(pageWidth, x - coordsOffset.x)
-        let top = to(pageWidth, y - coordsOffset.y)
+        let left = mouseX - coordsOffset.mouseX
+        let top = mouseY - coordsOffset.mouseY
 
-        const rightLimit = to(pageWidth, rect.width) - drawnField.width
-        const bottomLimit = to(pageWidth, rect.height) - drawnField.height
+        const rightLimit = rect.width - drawnField.width - 3
+        const bottomLimit = rect.height - drawnField.height - 3
 
         if (left < 0) left = 0
         if (top < 0) top = 0
@@ -272,20 +237,15 @@ export const DrawPDFFields = (props: Props) => {
 
   /**
    * Fired when clicked on the resize handle, sets the state for a resize action
-   * @param event Pointer event
-   * @param drawnFieldIndex which we are resizing
+   * @param event Mouse event
+   * @param drawnField which we are resizing
    */
-  const handleResizePointerDown = (
-    event: React.PointerEvent,
-    fileIndex: number,
-    pageIndex: number,
-    drawnFieldIndex: number
-  ) => {
+  const onResizeHandleMouseDown = (event: any) => {
     // Proceed only if left click
     if (event.button !== 0) return
+
     event.stopPropagation()
 
-    setActiveDrawnField({ fileIndex, pageIndex, drawnFieldIndex })
     setMouseState({
       resizing: true
     })
@@ -293,26 +253,15 @@ export const DrawPDFFields = (props: Props) => {
 
   /**
    * Resizes the drawn element by the mouse position
-   * @param event Pointer event
+   * @param event Mouse event
    * @param drawnField which we are resizing
-   * @param pageWidth pdf value which is used to calculate scaled offset
    */
-  const handleResizePointerMove = (
-    event: React.PointerEvent,
-    drawnField: DrawnField,
-    pageWidth: number
-  ) => {
+  const onResizeHandleMouseMove = (event: any, drawnField: DrawnField) => {
     if (mouseState.resizing) {
-      const { x, y } = getPointerCoordinates(
-        event,
-        // currentTarget = span handle
-        // 1st parent = drawnField
-        // 2nd parent = img
-        event.currentTarget.parentElement?.parentElement
-      )
-
-      const width = to(pageWidth, x) - drawnField.left
-      const height = to(pageWidth, y) - drawnField.top
+      const { mouseX, mouseY } = getMouseCoordinates(event, event.target.parentNode.parentNode)
+      
+      const width = mouseX - drawnField.left
+      const height = mouseY - drawnField.top
 
       drawnField.width = width
       drawnField.height = height
@@ -323,351 +272,224 @@ export const DrawPDFFields = (props: Props) => {
 
   /**
    * Removes the drawn element using the indexes in the params
-   * @param event Pointer event
+   * @param event Mouse event
    * @param pdfFileIndex pdf file index
    * @param pdfPageIndex pdf page index
    * @param drawnFileIndex drawn file index
    */
-  const handleRemovePointerDown = (
-    event: React.PointerEvent,
-    pdfFileIndex: number,
-    pdfPageIndex: number,
-    drawnFileIndex: number
-  ) => {
+  const onRemoveHandleMouseDown = (event: any, pdfFileIndex: number, pdfPageIndex: number, drawnFileIndex: number) => {
     event.stopPropagation()
-
-    const pages = sigitFiles[pdfFileIndex]?.pages
-    if (pages) {
-      pages[pdfPageIndex]?.drawnFields?.splice(drawnFileIndex, 1)
-    }
+    
+    pdfFiles[pdfFileIndex].pages[pdfPageIndex].drawnFields.splice(drawnFileIndex, 1)
   }
 
   /**
-   * Used to stop pointer click propagating to the parent elements
+   * Used to stop mouse click propagating to the parent elements
    * so select can work properly
-   * @param event Pointer event
+   * @param event Mouse event
    */
-  const handleUserSelectPointerDown = (event: React.PointerEvent) => {
+  const onUserSelectHandleMouseDown = (event: any) => {
     event.stopPropagation()
   }
 
   /**
-   * Handles Escape button-down event and hides all signers dropdowns
-   * @param event SyntheticEvent event
-   */
-  const handleEscapeButtonDown = (event: React.SyntheticEvent) => {
-    // get native event
-    const { nativeEvent } = event
-
-    //check if event is a keyboard event
-    if (nativeEvent instanceof KeyboardEvent) {
-      // check if event code is Escape
-      if (nativeEvent.code === KeyboardCode.Escape) {
-        // hide all signers dropdowns
-        const newHideSignersForDrawnField: HideSignersForDrawnField = {}
-
-        Object.keys(hideSignersForDrawnField).forEach((key) => {
-          // Object.keys always returns an array of strings,
-          // that is why unknown type is used below
-          newHideSignersForDrawnField[key as unknown as number] = true
-        })
-
-        setHideSignersForDrawnField(newHideSignersForDrawnField)
-      }
-    }
-  }
-
-  /**
-   * Gets the pointer coordinates relative to a element in the `event` param
-   * @param event PointerEvent
-   * @param customTarget coordinates relative to this element, if not provided
+   * Gets the mouse coordinates relative to a element in the `event` param
+   * @param event MouseEvent
+   * @param customTarget mouse coordinates relative to this element, if not provided
    * event.target will be used
    */
-  const getPointerCoordinates = (
-    event: React.PointerEvent,
-    customTarget?: HTMLElement | null
-  ) => {
-    const target = customTarget ? customTarget : event.currentTarget
-    const rect = target.getBoundingClientRect()
-
-    // Clamp X Y within the target
-    const x = Math.min(event.clientX, rect.right) - rect.left //x position within the element.
-    const y = Math.min(event.clientY, rect.bottom) - rect.top //y position within the element.
+  const getMouseCoordinates = (event: any, customTarget?: any) => {
+    const target = customTarget ? customTarget : event.target
+    const rect = target.getBoundingClientRect();
+    const mouseX = event.clientX - rect.left; //x position within the element.
+    const mouseY = event.clientY - rect.top;  //y position within the element.
 
     return {
-      x,
-      y,
+      mouseX,
+      mouseY,
       rect
     }
   }
 
+  /**
+   * Reads the pdf binary files and converts it's pages to images
+   * creates the pdfFiles object and sets to a state
+   */
+  const parsePdfPages = async () => {
+    const pdfFiles: PdfFile[] = await toPdfFiles(selectedFiles);
+    
+    setPdfFiles(pdfFiles)
+  }
+
+  /**
+   *
+   * @returns if expanded pdf accordion is present
+   */
+  const hasExpandedPdf = () => {
+    return !!pdfFiles.filter(pdfFile => !!pdfFile.expanded).length
+  }
+
+  const handleAccordionExpandChange = (expanded: boolean, pdfFile: PdfFile) => {
+    pdfFile.expanded = expanded
+
+    refreshPdfFiles()
+    setShowDrawToolBox(hasExpandedPdf())
+  }
+
+  /**
+   * Changes the drawing tool
+   * @param drawTool to draw with
+   */
+  const handleToolSelect = (drawTool: DrawTool) => {
+    // If clicked on the same tool, unselect
+    if (drawTool.identifier === selectedTool?.identifier) {
+      setSelectedTool(null)
+      return
+    }
+
+    setSelectedTool(drawTool)
+  }
+
   /**
    * Renders the pdf pages and drawing elements
    */
-  const getPdfPages = (file: SigitFile, fileIndex: number) => {
-    // Early return if this is not a pdf
-    if (!file.isPdf) return null
-
+  const getPdfPages = (pdfFile: PdfFile, pdfFileIndex: number) => {
     return (
-      <>
-        {file.pages?.map((page, pageIndex: number) => {
+      <Box sx={{
+        width: '100%'
+      }}>
+        {pdfFile.pages.map((page, pdfPageIndex: number) => {
           return (
             <div
-              key={pageIndex}
-              className={`image-wrapper ${styles.pdfImageWrapper} ${selectedTool ? styles.drawing : ''}`}
-              tabIndex={-1}
-              onKeyDown={(event) => handleEscapeButtonDown(event)}
+              key={pdfPageIndex}
+              style={{
+                border: '1px solid #c4c4c4',
+                marginBottom: '10px'
+              }}
+              className={`${styles.pdfImageWrapper} ${selectedTool ? styles.drawing : ''}`}
+              onMouseMove={(event) => {onMouseMove(event, page)}}
+              onMouseDown={(event) => {onMouseDown(event, page)}}
             >
-              <img
-                onPointerMove={(event) => {
-                  handlePointerMove(event, page)
-                }}
-                onPointerDown={(event) => {
-                  handlePointerDown(event, page, fileIndex, pageIndex)
-                }}
-                draggable="false"
-                src={page.image}
-                alt={`page ${pageIndex + 1} of ${file.name}`}
-              />
+              <img draggable="false" style={{ width: '100%' }} src={page.image}/>
 
               {page.drawnFields.map((drawnField, drawnFieldIndex: number) => {
                 return (
                   <div
                     key={drawnFieldIndex}
-                    onPointerDown={(event) =>
-                      handleDrawnFieldPointerDown(
-                        event,
-                        fileIndex,
-                        pageIndex,
-                        drawnFieldIndex
-                      )
-                    }
-                    onPointerMove={(event) => {
-                      handleDrawnFieldPointerMove(event, drawnField, page.width)
-                    }}
+                    onMouseDown={onDrawnFieldMouseDown}
+                    onMouseMove={(event) => { onDranwFieldMouseMove(event, drawnField)}}
                     className={styles.drawingRectangle}
                     style={{
-                      backgroundColor: drawnField.counterpart
-                        ? `#${npubToHex(drawnField.counterpart)?.substring(0, 6)}4b`
-                        : undefined,
-                      outlineColor: drawnField.counterpart
-                        ? `#${npubToHex(drawnField.counterpart)?.substring(0, 6)}`
-                        : undefined,
-                      left: inPx(from(page.width, drawnField.left)),
-                      top: inPx(from(page.width, drawnField.top)),
-                      width: inPx(from(page.width, drawnField.width)),
-                      height: inPx(from(page.width, drawnField.height)),
-                      pointerEvents: mouseState.clicked ? 'none' : 'all',
-                      touchAction: 'none',
-                      opacity:
-                        mouseState.dragging &&
-                        isActiveDrawnField(
-                          fileIndex,
-                          pageIndex,
-                          drawnFieldIndex
-                        )
-                          ? 0.8
-                          : undefined
+                      left: `${drawnField.left}px`,
+                      top: `${drawnField.top}px`,
+                      width: `${drawnField.width}px`,
+                      height: `${drawnField.height}px`,
+                      pointerEvents: mouseState.clicked ? 'none' : 'all'
                     }}
                   >
-                    <div
-                      className={`file-mark ${styles.placeholder}`}
-                      style={{
-                        fontFamily: FONT_TYPE,
-                        fontSize: inPx(from(page.width, FONT_SIZE))
-                      }}
-                    >
-                      {getToolboxLabelByMarkType(drawnField.type) ||
-                        'placeholder'}
-                    </div>
                     <span
-                      onPointerDown={(event) =>
-                        handleResizePointerDown(
-                          event,
-                          fileIndex,
-                          pageIndex,
-                          drawnFieldIndex
-                        )
-                      }
-                      onPointerMove={(event) => {
-                        handleResizePointerMove(event, drawnField, page.width)
-                      }}
+                      onMouseDown={onResizeHandleMouseDown}
+                      onMouseMove={(event) => {onResizeHandleMouseMove(event, drawnField)}}
                       className={styles.resizeHandle}
-                      style={{
-                        background:
-                          mouseState.resizing &&
-                          isActiveDrawnField(
-                            fileIndex,
-                            pageIndex,
-                            drawnFieldIndex
-                          )
-                            ? 'var(--primary-main)'
-                            : undefined
-                      }}
                     ></span>
                     <span
-                      onPointerDown={(event) => {
-                        handleRemovePointerDown(
-                          event,
-                          fileIndex,
-                          pageIndex,
-                          drawnFieldIndex
-                        )
-                      }}
+                      onMouseDown={(event) => {onRemoveHandleMouseDown(event, pdfFileIndex, pdfPageIndex, drawnFieldIndex)}}
                       className={styles.removeHandle}
                     >
-                      <Close fontSize="small" />
+                      <Close fontSize='small'/>
                     </span>
-                    {!isActiveDrawnField(
-                      fileIndex,
-                      pageIndex,
-                      drawnFieldIndex
-                    ) &&
-                      !!drawnField.counterpart && (
-                        <div className={styles.counterpartAvatar}>
-                          <UserAvatar
-                            pubkey={npubToHex(drawnField.counterpart)!}
-                          />
-                        </div>
-                      )}
-                    {isActiveDrawnField(
-                      fileIndex,
-                      pageIndex,
-                      drawnFieldIndex
-                    ) &&
-                      (!hideSignersForDrawnField ||
-                        !hideSignersForDrawnField[drawnFieldIndex]) && (
-                        <div
-                          onPointerDown={handleUserSelectPointerDown}
-                          className={styles.userSelect}
+                    <div 
+                      onMouseDown={onUserSelectHandleMouseDown}
+                      className={styles.userSelect}
+                    >
+                      <FormControl fullWidth size='small'>
+                        <InputLabel id="counterparts">Counterpart</InputLabel>
+                        <Select
+                          value={drawnField.counterpart}
+                          onChange={(event) => { drawnField.counterpart = event.target.value; refreshPdfFiles() }}
+                          labelId="counterparts"
+                          label="Counterparts"
                         >
-                          <FormControl fullWidth size="small">
-                            <InputLabel id="counterparts">
-                              Counterpart
-                            </InputLabel>
-                            <Select
-                              value={getAvailableSigner(drawnField.counterpart)}
-                              onChange={(event) => {
-                                drawnField.counterpart = event.target.value
-                                setLastSigner(event.target.value)
-                                refreshPdfFiles()
-                              }}
-                              labelId="counterparts"
-                              label="Counterparts"
-                              sx={{
-                                background: 'white'
-                              }}
-                              renderValue={(value) =>
-                                renderCounterpartValue(value)
-                              }
-                            >
-                              {signers.map((signer, index) => {
-                                const npub = hexToNpub(signer.pubkey)
-                                const metadata = props.metadata[signer.pubkey]
-                                const displayValue = getProfileUsername(
-                                  npub,
-                                  metadata
-                                )
-                                // make current signers dropdown visible
-                                if (
-                                  hideSignersForDrawnField[drawnFieldIndex] ===
-                                    undefined ||
-                                  hideSignersForDrawnField[drawnFieldIndex] ===
-                                    true
-                                ) {
-                                  setHideSignersForDrawnField((prev) => ({
-                                    ...prev,
-                                    [drawnFieldIndex]: false
-                                  }))
-                                }
+                          {props.users.map((user, index) => {
+                            let displayValue = truncate(hexToNpub(user.pubkey), {
+                              length: 16
+                            })
 
-                                return (
-                                  <MenuItem key={index} value={npub}>
-                                    <ListItemIcon>
-                                      <AvatarIconButton
-                                        src={metadata?.picture}
-                                        hexKey={signer.pubkey}
-                                        aria-label={`account of user ${displayValue}`}
-                                        color="inherit"
-                                        sx={{
-                                          padding: 0,
-                                          '> img': {
-                                            width: '30px',
-                                            height: '30px'
-                                          }
-                                        }}
-                                      />
-                                    </ListItemIcon>
-                                    <ListItemText>{displayValue}</ListItemText>
-                                  </MenuItem>
-                                )
-                              })}
-                            </Select>
-                          </FormControl>
-                        </div>
-                      )}
+                            const metadata = props.metadata[user.pubkey]
+
+                            if (metadata) {
+                              displayValue = truncate(metadata.name || metadata.display_name || metadata.username, {
+                                length: 16
+                              })
+                            }
+
+                            return <MenuItem key={index} value={hexToNpub(user.pubkey)}>{displayValue}</MenuItem>
+                          })}
+                        </Select>
+                      </FormControl>
+                    </div>
                   </div>
                 )
               })}
             </div>
           )
         })}
-      </>
+      </Box>
+    ) 
+  }
+
+  if (parsingPdf) {
+    return (
+      <Box sx={{ width: '100%', textAlign: 'center' }}>
+        <CircularProgress/>
+      </Box>
     )
   }
 
-  const renderCounterpartValue = (npub: string) => {
-    let displayValue = _.truncate(npub, { length: 16 })
-
-    const signer = signers.find((u) => u.pubkey === npubToHex(npub))
-    if (signer) {
-      const metadata = props.metadata[signer.pubkey]
-      displayValue = getProfileUsername(npub, metadata)
-
-      return (
-        <div className={styles.counterpartSelectValue}>
-          <AvatarIconButton
-            src={props.metadata[signer.pubkey]?.picture}
-            hexKey={signer.pubkey || undefined}
-            sx={{
-              padding: 0,
-              marginRight: '6px',
-              '> img': {
-                width: '21px',
-                height: '21px'
-              }
-            }}
-          />
-          {displayValue}
-        </div>
-      )
-    }
-
-    return displayValue
+  if (!pdfFiles.length) {
+    return ''
   }
 
   return (
-    <div className="files-wrapper">
-      {sigitFiles.map((file, i) => {
-        return (
-          <React.Fragment key={file.name}>
-            <div className="file-wrapper" id={`file-${file.name}`}>
-              {file.isPdf && getPdfPages(file, i)}
-              {file.isImage && (
-                <img
-                  className="file-image"
-                  src={file.objectUrl}
-                  alt={file.name}
-                />
-              )}
-              {!(file.isPdf || file.isImage) && (
-                <ExtensionFileBox extension={file.extension} />
-              )}
-            </div>
-            {i < sigitFiles.length - 1 && <FileDivider />}
-          </React.Fragment>
-        )
-      })}
-    </div>
+    <Box>
+      <Box sx={{ mt: 1 }}>
+        <Typography sx={{ mb: 1 }}>Draw fields on the PDFs:</Typography>
+        
+        {pdfFiles.map((pdfFile, pdfFileIndex: number) => {
+          return (
+            <Accordion key={pdfFileIndex} expanded={pdfFile.expanded} onChange={(_event, expanded) => {handleAccordionExpandChange(expanded, pdfFile)}}>
+              <AccordionSummary
+                expandIcon={<ExpandMore />}
+                aria-controls={`panel${pdfFileIndex}-content`}
+                id={`panel${pdfFileIndex}header`}
+              >
+                <PictureAsPdf sx={{ mr: 1 }}/>
+                {pdfFile.file.name}
+              </AccordionSummary>
+              <AccordionDetails>
+                {getPdfPages(pdfFile, pdfFileIndex)}
+              </AccordionDetails>
+          </Accordion>
+          )
+        })}
+      </Box>
+
+      {showDrawToolBox && (
+        <Box className={styles.drawToolBoxContainer}>
+          <Box className={styles.drawToolBox}>
+            {toolbox.filter(drawTool => drawTool.active).map((drawTool: DrawTool, index: number) => {
+              return (
+                <Box
+                  key={index} 
+                  onClick={() => {handleToolSelect(drawTool)}} className={`${styles.toolItem} ${selectedTool?.identifier === drawTool.identifier ? styles.selected : ''}`}>
+                  { drawTool.icon }
+                  { drawTool.label }
+                </Box>
+              )
+            })}
+          </Box>
+        </Box>
+      )}
+    </Box>
   )
 }

src/components/DrawPDFFields/style.module.scss

@@ -1,5 +1,3 @@
-@import '../../styles/sizes.scss';
-
 .pdfFieldItem {
   background: white;
   padding: 10px;
@@ -7,26 +5,61 @@
   cursor: pointer;
 }
 
+.drawToolBoxContainer {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  display: flex;
+  justify-content: center;
+  z-index: 50;
+
+  .drawToolBox {
+    display: flex;
+    gap: 10px;
+    min-width: 100px;
+    background-color: white;
+    padding: 15px;
+    box-shadow: 0 0 10px 1px #0000003b;
+    border-radius: 4px;
+
+    .toolItem {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      border: 1px solid rgba(0, 0, 0, 0.137);
+      padding: 5px;
+      cursor: pointer;
+      user-select: none;
+
+      &.selected {
+        border-color: #01aaad;
+        color: #01aaad;
+      }
+
+      &:not(.selected) {
+        &:hover {
+          border-color: #01aaad79;
+        }
+      }
+
+    }
+  }
+}
+
 .pdfImageWrapper {
+  position: relative;
+  user-select: none;
+  
   &.drawing {
     cursor: crosshair;
   }
 }
 
-.pdfImageWrapper:focus {
-  outline: none;
-}
-
-.placeholder {
-  position: absolute;
-  opacity: 0.5;
-  inset: 0;
-}
-
 .drawingRectangle {
   position: absolute;
-  outline: 1px solid #01aaad;
-  z-index: 40;
+  border: 1px solid #01aaad;
+  z-index: 50;
   background-color: #01aaad4b;
   cursor: pointer;
   display: flex;
@@ -38,10 +71,6 @@
     visibility: hidden;
   }
 
-  &.edited {
-    outline: 1px dotted #01aaad;
-  }
-
   .resizeHandle {
     position: absolute;
     right: -5px;
@@ -51,14 +80,7 @@
     background-color: #fff;
     border: 1px solid rgb(160, 160, 160);
     border-radius: 50%;
-    cursor: nwse-resize;
-
-    // Increase the area a bit so it's easier to click
-    &::after {
-      content: '';
-      position: absolute;
-      inset: -14px;
-    }
+    cursor: pointer;
   }
 
   .removeHandle {
@@ -72,7 +94,7 @@
     background-color: #fff;
     border: 1px solid rgb(160, 160, 160);
     border-radius: 50%;
-    color: #e74c3c;
+    color: #E74C3C;
     font-size: 10px;
     cursor: pointer;
   }
@@ -83,19 +105,9 @@
     justify-content: center;
     align-items: center;
     bottom: -60px;
-    min-width: 193px;
+    min-width: 170px;
     min-height: 30px;
+    background: #fff;
     padding: 5px 0;
   }
-}
-
-.counterpartSelectValue {
-  display: flex;
-}
-
-.counterpartAvatar {
-  img {
-    width: 21px;
-    height: 21px;
-  }
-}
+}

src/components/ExtensionFileBox.tsx

@@ -1,6 +0,0 @@
-interface ExtensionFileBoxProps {
-  extension: string
-}
-export const ExtensionFileBox = ({ extension }: ExtensionFileBoxProps) => (
-  <div className="extension-file-box">This is a {extension} file</div>
-)

src/components/FileDivider.tsx

@@ -1,12 +0,0 @@
-import Divider from '@mui/material/Divider/Divider'
-
-export const FileDivider = () => (
-  <Divider
-    sx={{
-      fontSize: '12px',
-      color: 'rgba(0,0,0,0.15)'
-    }}
-  >
-    File Separator
-  </Divider>
-)

src/components/FileList/index.tsx

@@ -1,52 +0,0 @@
-import { CurrentUserFile } from '../../types/file.ts'
-import styles from './style.module.scss'
-import { Button } from '@mui/material'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { faCheck } from '@fortawesome/free-solid-svg-icons'
-
-interface FileListProps {
-  files: CurrentUserFile[]
-  currentFile: CurrentUserFile
-  setCurrentFile: (file: CurrentUserFile) => void
-  handleDownload: () => void
-  downloadLabel?: string
-}
-
-const FileList = ({
-  files,
-  currentFile,
-  setCurrentFile,
-  handleDownload,
-  downloadLabel
-}: FileListProps) => {
-  const isActive = (file: CurrentUserFile) => file.id === currentFile.id
-  return (
-    <div className={styles.wrap}>
-      <ul className={styles.files}>
-        {files.map((currentUserFile: CurrentUserFile) => (
-          <li
-            key={currentUserFile.id}
-            className={`${styles.fileItem} ${isActive(currentUserFile) && styles.active}`}
-            onClick={() => setCurrentFile(currentUserFile)}
-          >
-            <div className={styles.fileNumber}>{currentUserFile.id}</div>
-            <div className={styles.fileInfo}>
-              <div className={styles.fileName}>{currentUserFile.file.name}</div>
-            </div>
-
-            <div className={styles.fileVisual}>
-              {currentUserFile.isHashValid && (
-                <FontAwesomeIcon icon={faCheck} />
-              )}
-            </div>
-          </li>
-        ))}
-      </ul>
-      <Button variant="contained" fullWidth onClick={handleDownload}>
-        {downloadLabel || 'Download Files'}
-      </Button>
-    </div>
-  )
-}
-
-export default FileList

src/components/FileList/style.module.scss

@@ -1,103 +0,0 @@
-.filesPageContainer {
-  width: 100%;
-  display: grid;
-  grid-template-columns: 0.75fr 1.5fr 0.75fr;
-  grid-gap: 30px;
-  flex-grow: 1;
-}
-
-.wrap {
-  display: flex;
-  flex-direction: column;
-  grid-gap: 15px;
-}
-
-.files {
-  border-radius: 4px;
-  background: white;
-  padding: 15px;
-
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  grid-gap: 15px;
-  overflow-y: auto;
-  overflow-x: none;
-}
-
-.files::-webkit-scrollbar {
-  width: 10px;
-}
-
-.files::-webkit-scrollbar-track {
-  background-color: rgba(0, 0, 0, 0.15);
-}
-
-.files::-webkit-scrollbar-thumb {
-  max-width: 10px;
-  border-radius: 2px;
-  background-color: #4c82a3;
-  cursor: grab;
-}
-
-.fileItem {
-  transition: ease 0.2s;
-  display: flex;
-  flex-direction: row;
-  grid-gap: 10px;
-  border-radius: 4px;
-  overflow: hidden;
-  background: #ffffff;
-  padding: 5px 10px;
-  align-items: center;
-  color: rgba(0, 0, 0, 0.5);
-  cursor: pointer;
-  flex-grow: 1;
-  font-size: 16px;
-  font-weight: 500;
-  min-height: 45px;
-
-  &.active {
-    background: #4c82a3;
-    color: white;
-  }
-}
-
-.fileItem:hover {
-  background: #4c82a3;
-  color: white;
-}
-
-.fileInfo {
-  flex-grow: 1;
-  font-size: 16px;
-  font-weight: 500;
-}
-
-.fileName {
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  overflow: hidden;
-  -webkit-line-clamp: 1;
-  line-clamp: 1;
-}
-
-.fileNumber {
-  font-size: 14px;
-  font-weight: 500;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  width: 10px;
-}
-
-.fileVisual {
-  display: flex;
-  flex-shrink: 0;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  height: 25px;
-  width: 25px;
-}

src/components/Footer/Footer.tsx

@@ -4,128 +4,125 @@ import styles from './style.module.scss'
 import { Container } from '../Container'
 import nostrImage from '../../assets/images/nostr.gif'
 import { appPublicRoutes } from '../../routes'
-import { createPortal } from 'react-dom'
 
-export const Footer = () =>
-  createPortal(
-    <footer className={`${styles.borderTop} ${styles.footer}`}>
-      <Container
-        style={{
-          paddingBlock: '50px'
+export const Footer = () => (
+  <footer className={`${styles.borderTop} ${styles.footer}`}>
+    <Container
+      style={{
+        paddingBlock: '50px'
+      }}
+    >
+      <Box
+        display={'grid'}
+        sx={{
+          gridTemplateColumns: {
+            xs: '1fr',
+            md: '0.5fr 2fr 0.5fr'
+          },
+          alignItems: {
+            xs: 'center',
+            md: 'start'
+          }
         }}
+        gap={'50px'}
       >
-        <Box
-          display={'grid'}
+        <LinkMui
           sx={{
-            gridTemplateColumns: {
-              xs: '1fr',
-              md: '0.5fr 2fr 0.5fr'
-            },
-            alignItems: {
+            justifySelf: {
               xs: 'center',
               md: 'start'
             }
           }}
-          gap={'50px'}
+          component={Link}
+          to={'/'}
+          className={styles.logo}
         >
-          <LinkMui
+          <img src="/logo.svg" alt="Logo" />
+        </LinkMui>
+        <Box
+          display={'grid'}
+          sx={{
+            gap: '15px',
+            gridTemplateColumns: {
+              xs: '1fr',
+              sm: 'repeat(2, 1fr)',
+              xl: 'repeat(3, 1fr)'
+            },
+            borderBlock: {
+              xs: 'solid 1px rgba(0, 0, 0, 0.1)',
+              md: 'unset'
+            },
+            paddingY: {
+              xs: '10px',
+              md: 'unset'
+            }
+          }}
+          component={'nav'}
+          className={styles.nav}
+        >
+          <Button
             sx={{
-              justifySelf: {
-                xs: 'center',
-                md: 'start'
-              }
+              justifyContent: 'center'
             }}
             component={Link}
             to={'/'}
-            className={styles.logo}
+            variant={'text'}
           >
-            <img src="/logo.svg" alt="Logo" />
-          </LinkMui>
-          <Box
-            display={'grid'}
+            Home
+          </Button>
+          <Button
             sx={{
-              gap: '15px',
-              gridTemplateColumns: {
-                xs: '1fr',
-                sm: 'repeat(2, 1fr)',
-                xl: 'repeat(3, 1fr)'
-              },
-              borderBlock: {
-                xs: 'solid 1px rgba(0, 0, 0, 0.1)',
-                md: 'unset'
-              },
-              paddingY: {
-                xs: '10px',
-                md: 'unset'
-              }
+              justifyContent: 'center'
             }}
-            component={'nav'}
-            className={styles.nav}
+            component={LinkMui}
+            href={appPublicRoutes.docs}
+            target="_blank"
+            variant={'text'}
           >
-            <Button
-              sx={{
-                justifyContent: 'center'
-              }}
-              component={Link}
-              to={'/'}
-              variant={'text'}
-            >
-              Home
-            </Button>
-            <Button
-              sx={{
-                justifyContent: 'center'
-              }}
-              component={LinkMui}
-              href={appPublicRoutes.docs}
-              target="_blank"
-              variant={'text'}
-            >
-              Documentation
-            </Button>
-            <Button
-              sx={{
-                justifyContent: 'center'
-              }}
-              component={LinkMui}
-              href={appPublicRoutes.source}
-              target="_blank"
-              variant={'text'}
-            >
-              Source
-            </Button>
-          </Box>
-          <Box
-            className={styles.links}
+            Documentation
+          </Button>
+          <Button
             sx={{
-              justifySelf: {
-                xs: 'center',
-                md: 'end'
-              }
+              justifyContent: 'center'
             }}
+            component={LinkMui}
+            href={appPublicRoutes.source}
+            target="_blank"
+            variant={'text'}
           >
-            <Button
-              component={LinkMui}
-              href="https://snort.social/npub1yay8e9sqk94jfgdlkpgeelj2t5ddsj2eu0xwt4kh4xw5ses2rauqnstrdv"
-              target="_blank"
-              sx={{
-                minWidth: '45px',
-                padding: '10px'
-              }}
-              variant={'contained'}
-            >
-              <img src={nostrImage} width="25" alt="nostr logo" height="25" />
-            </Button>
-          </Box>
+            Source
+          </Button>
         </Box>
-      </Container>
-      <div className={`${styles.borderTop} ${styles.credits}`}>
-        Built by&nbsp;
-        <a rel="noopener" href="https://nostrdev.com/" target="_blank">
-          Nostr Dev
-        </a>{' '}
-        2024.
-      </div>
-    </footer>,
-    document.getElementById('root')!
-  )
+        <Box
+          className={styles.links}
+          sx={{
+            justifySelf: {
+              xs: 'center',
+              md: 'end'
+            }
+          }}
+        >
+          <Button
+            component={LinkMui}
+            href="https://snort.social/npub1yay8e9sqk94jfgdlkpgeelj2t5ddsj2eu0xwt4kh4xw5ses2rauqnstrdv"
+            target="_blank"
+            sx={{
+              minWidth: '45px',
+              padding: '10px'
+            }}
+            variant={'contained'}
+          >
+            <img src={nostrImage} width="25" alt="nostr logo" height="25" />
+          </Button>
+        </Box>
+      </Box>
+    </Container>
+    <div className={`${styles.borderTop} ${styles.credits}`}>
+      Built by&nbsp;
+      <a href="https://nostrdev.com/" target="_blank">
+        Nostr Dev
+      </a>{' '}
+      2024.
+    </div>
+  </footer>
+)

src/components/LoadingSpinner/index.tsx

@@ -1,43 +1,18 @@
-import { createPortal } from 'react-dom'
 import styles from './style.module.scss'
-import { PropsWithChildren } from 'react'
 
 interface Props {
-  desc?: string
-  variant?: 'small' | 'default'
+  desc: string
 }
 
-export const LoadingSpinner = (props: PropsWithChildren<Props>) => {
-  const { desc, children, variant = 'default' } = props
+export const LoadingSpinner = (props: Props) => {
+  const { desc } = props
 
-  switch (variant) {
-    case 'small':
-      return (
-        <div
-          className={`${styles.loadingSpinnerContainer}`}
-          data-variant={variant}
-        >
-          <div className={styles.loadingSpinner}></div>
-        </div>
-      )
-
-    default:
-      return createPortal(
-        <div className={styles.loadingSpinnerOverlay}>
-          <div
-            className={styles.loadingSpinnerContainer}
-            data-variant={variant}
-          >
-            <div className={styles.loadingSpinner}></div>
-            {desc && (
-              <div className={styles.loadingSpinnerDesc}>
-                {desc}
-                {children}
-              </div>
-            )}
-          </div>
-        </div>,
-        document.getElementById('root')!
-      )
-  }
+  return (
+    <div className={styles.loadingSpinnerOverlay}>
+      <div className={styles.loadingSpinnerContainer}>
+        <div className={styles.loadingSpinner}></div>
+        {desc && <span className={styles.loadingSpinnerDesc}>{desc}</span>}
+      </div>
+    </div>
+  )
 }

src/components/LoadingSpinner/style.module.scss

@@ -2,56 +2,37 @@
 
 .loadingSpinnerOverlay {
   position: fixed;
-  inset: 0;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
   background-color: rgba(0, 0, 0, 0.5);
-  z-index: 50;
-  -webkit-backdrop-filter: blur(10px);
-  backdrop-filter: blur(10px);
-}
+  z-index: 9999;
 
-.loadingSpinnerContainer {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-
-  &[data-variant='default'] {
-    width: 100%;
-    max-width: 500px;
-    margin: 25px 20px;
-    background: $overlay-background-color;
-    border-radius: 4px;
-    box-shadow: 0 0 4px 0 rgb(0, 0, 0, 0.1);
+  .loadingSpinnerContainer {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
   }
-  &[data-variant='small'] {
-    min-height: 250px;
-  }
-}
 
-.loadingSpinner {
-  background: url('/favicon.png') no-repeat center / cover;
-  margin: 40px 25px;
-  width: 65px;
-  height: 65px;
-  animation: spin 1s linear infinite;
+  .loadingSpinner {
+    background: url('/favicon.png') no-repeat center / cover;
+    width: 40px;
+    height: 40px;
+    animation: spin 1s linear infinite;
+  }
 }
 
 .loadingSpinnerDesc {
-  width: 100%;
-  padding: 15px;
-  border-top: solid 1px rgba(0, 0, 0, 0.1);
-  color: rgba(0, 0, 0, 0.5);
+  color: white;
+  margin-top: 13px;
 
   font-size: 16px;
   font-weight: 400;
-
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 10px;
 }
 
 @keyframes spin {

src/components/MarkFormField/index.tsx

@@ -1,127 +0,0 @@
-import { CurrentUserMark } from '../../types/mark.ts'
-import styles from './style.module.scss'
-import {
-  findNextIncompleteCurrentUserMark,
-  getToolboxLabelByMarkType,
-  isCurrentUserMarksComplete,
-  isCurrentValueLast
-} from '../../utils'
-import React, { useState } from 'react'
-import { MARK_TYPE_CONFIG } from '../getMarkComponents.tsx'
-
-interface MarkFormFieldProps {
-  currentUserMarks: CurrentUserMark[]
-  handleCurrentUserMarkChange: (mark: CurrentUserMark) => void
-  handleSelectedMarkValueChange: (value: string) => void
-  handleSubmit: (event: React.FormEvent<HTMLFormElement>) => void
-  selectedMark: CurrentUserMark
-  selectedMarkValue: string
-}
-
-/**
- * Responsible for rendering a form field connected to a mark and keeping track of its value.
- */
-const MarkFormField = ({
-  handleSubmit,
-  handleSelectedMarkValueChange,
-  selectedMark,
-  selectedMarkValue,
-  currentUserMarks,
-  handleCurrentUserMarkChange
-}: MarkFormFieldProps) => {
-  const [displayActions, setDisplayActions] = useState(true)
-  const isReadyToSign = () =>
-    isCurrentUserMarksComplete(currentUserMarks) ||
-    isCurrentValueLast(currentUserMarks, selectedMark, selectedMarkValue)
-  const isCurrent = (currentMark: CurrentUserMark) =>
-    currentMark.id === selectedMark.id
-  const isDone = (currentMark: CurrentUserMark) =>
-    isCurrent(currentMark) ? !!selectedMarkValue : currentMark.isCompleted
-  const findNext = () => {
-    return (
-      currentUserMarks[selectedMark.id] ||
-      findNextIncompleteCurrentUserMark(currentUserMarks)
-    )
-  }
-  const handleFormSubmit = (event: React.FormEvent<HTMLFormElement>) => {
-    event.preventDefault()
-    console.log('handle form submit runs...')
-    return isReadyToSign()
-      ? handleSubmit(event)
-      : handleCurrentUserMarkChange(findNext()!)
-  }
-  const toggleActions = () => setDisplayActions(!displayActions)
-  const markLabel = getToolboxLabelByMarkType(selectedMark.mark.type)
-  const { input: MarkInputComponent } =
-    MARK_TYPE_CONFIG[selectedMark.mark.type] || {}
-  return (
-    <div className={styles.container}>
-      <div className={styles.trigger}>
-        <button
-          onClick={toggleActions}
-          className={styles.triggerBtn}
-          type="button"
-          title="Toggle"
-        >
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            viewBox="-64 0 512 512"
-            width="1em"
-            height="1em"
-            fill="currentColor"
-            transform={displayActions ? 'rotate(180)' : 'rotate(0)'}
-          >
-            <path d="M352 352c-8.188 0-16.38-3.125-22.62-9.375L192 205.3l-137.4 137.4c-12.5 12.5-32.75 12.5-45.25 0s-12.5-32.75 0-45.25l160-160c12.5-12.5 32.75-12.5 45.25 0l160 160c12.5 12.5 12.5 32.75 0 45.25C368.4 348.9 360.2 352 352 352z"></path>
-          </svg>
-        </button>
-      </div>
-      <div className={`${styles.actions} ${displayActions && styles.expanded}`}>
-        <div className={styles.actionsWrapper}>
-          <div className={styles.actionsTop}>
-            <div className={styles.actionsTopInfo}>
-              <p className={styles.actionsTopInfoText}>Add {markLabel}</p>
-            </div>
-          </div>
-          <div className={styles.inputWrapper}>
-            <form onSubmit={(e) => handleFormSubmit(e)}>
-              {typeof MarkInputComponent !== 'undefined' && (
-                <MarkInputComponent
-                  value={selectedMarkValue}
-                  placeholder={markLabel}
-                  handler={handleSelectedMarkValueChange}
-                  userMark={selectedMark}
-                />
-              )}
-              <div className={styles.actionsBottom}>
-                <button type="submit" className={styles.submitButton}>
-                  NEXT
-                </button>
-              </div>
-            </form>
-            <div className={styles.footerContainer}>
-              <div className={styles.footer}>
-                {currentUserMarks.map((mark, index) => {
-                  return (
-                    <div className={styles.pagination} key={index}>
-                      <button
-                        className={`${styles.paginationButton} ${isDone(mark) && styles.paginationButtonDone}`}
-                        onClick={() => handleCurrentUserMarkChange(mark)}
-                      >
-                        {mark.id}
-                      </button>
-                      {isCurrent(mark) && (
-                        <div className={styles.paginationButtonCurrent}></div>
-                      )}
-                    </div>
-                  )
-                })}
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  )
-}
-
-export default MarkFormField

src/components/MarkFormField/style.module.scss

@@ -1,218 +0,0 @@
-@import '../../styles/sizes.scss';
-
-.container {
-  display: flex;
-  flex-direction: column;
-  position: fixed;
-
-  @media only screen and (min-width: 768px) {
-    bottom: 0;
-    right: 0;
-    left: 0;
-  }
-  bottom: $tabs-height + 5px;
-  right: 5px;
-  left: 5px;
-
-  align-items: center;
-  z-index: 40;
-
-  button {
-    transition: ease 0.2s;
-    width: auto;
-    border-radius: 4px;
-    outline: unset;
-    border: unset;
-    background: unset;
-    color: #ffffff;
-    background: #4c82a3;
-    font-weight: 500;
-    font-size: 14px;
-    padding: 8px 15px;
-    white-space: nowrap;
-    display: flex;
-    flex-direction: row;
-    grid-gap: 12px;
-    justify-content: center;
-    align-items: center;
-    text-decoration: unset;
-    position: relative;
-    cursor: pointer;
-  }
-
-  button:hover {
-    background: #5e8eab;
-    color: white;
-  }
-
-  button:active {
-    background: #447592;
-    color: white;
-  }
-
-  .actionButtons {
-    display: flex;
-    flex-direction: row;
-    grid-gap: 5px;
-  }
-
-  .actionsBottom {
-    display: flex;
-    flex-direction: row;
-    grid-gap: 5px;
-    justify-content: center;
-    align-items: center;
-  }
-
-  .submitButton {
-    width: 100%;
-    max-width: 300px;
-    margin-top: 10px;
-  }
-
-  .paginationButton {
-    font-size: 12px;
-    padding: 5px 10px;
-    border-radius: 3px;
-    background: rgba(0, 0, 0, 0.1);
-    color: rgba(0, 0, 0, 0.5);
-  }
-
-  .paginationButton:hover {
-    background: #447592;
-    color: rgba(255, 255, 255, 0.5);
-  }
-
-  .paginationButtonDone {
-    background: #5e8eab;
-    color: rgb(255, 255, 255);
-  }
-
-  .paginationButtonCurrent {
-    height: 2px;
-    width: 100%;
-    background: #4c82a3;
-  }
-
-  .trigger {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    position: relative;
-  }
-
-  .triggerBtn {
-    background: white;
-    color: #434343;
-    padding: 5px 30px;
-    box-shadow: 0px -3px 4px 0 rgb(0, 0, 0, 0.1);
-    position: absolute;
-    top: -25px;
-  }
-}
-
-.actions {
-  background: white;
-  width: 100%;
-  border-radius: 5px;
-  padding: 10px 20px;
-  display: none;
-  flex-direction: column;
-  align-items: center;
-  grid-gap: 15px;
-  box-shadow: 0 -2px 4px 0 rgb(0, 0, 0, 0.1);
-  max-width: 750px;
-
-  &.expanded {
-    display: flex;
-  }
-}
-
-.actionsWrapper {
-  display: flex;
-  flex-direction: column;
-  grid-gap: 20px;
-  flex-grow: 1;
-  width: 100%;
-}
-
-.actionsTop {
-  display: flex;
-  flex-direction: row;
-  grid-gap: 10px;
-  align-items: center;
-}
-
-.actionsTopInfo {
-  flex-grow: 1;
-}
-
-.actionsTopInfoText {
-  font-size: 16px;
-  color: #434343;
-}
-
-.actionsTrigger {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  position: relative;
-}
-
-.inputWrapper {
-  display: flex;
-  flex-direction: column;
-  grid-gap: 10px;
-}
-
-.textInput {
-  height: 100px;
-  background: rgba(0, 0, 0, 0.1);
-  border-radius: 4px;
-  border: solid 2px #4c82a3;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-}
-
-.input {
-  border-radius: 4px;
-  border: solid 1px rgba(0, 0, 0, 0.15);
-  padding: 5px 10px;
-  font-size: 16px;
-  width: 100%;
-  background: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0) 100%),
-    linear-gradient(white, white);
-}
-
-.input:focus {
-  border: solid 1px rgba(0, 0, 0, 0.15);
-  outline: none;
-  background: linear-gradient(rgba(0, 0, 0, 0.05), rgba(0, 0, 0, 0.05) 100%),
-    linear-gradient(white, white);
-}
-
-.footerContainer {
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-}
-
-.footer {
-  display: flex;
-  flex-direction: row;
-  grid-gap: 5px;
-  align-items: start;
-  justify-content: center;
-  width: 100%;
-}
-
-.pagination {
-  display: flex;
-  flex-direction: column;
-  grid-gap: 5px;
-}

src/components/MarkInputs/Signature.module.scss

@@ -1,44 +0,0 @@
-@import '../../styles/colors.scss';
-
-$padding: 5px;
-
-.wrapper {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: $padding;
-}
-
-.relative {
-  position: relative;
-}
-
-.canvas {
-  outline: 1px solid black;
-  background-color: $body-background-color;
-  cursor: crosshair;
-
-  // Disable panning/zooming when touching canvas element
-  -ms-touch-action: none;
-  touch-action: none;
-  -webkit-user-select: none;
-  user-select: none;
-}
-
-.absolute {
-  position: absolute;
-  inset: 0;
-  pointer-events: none;
-}
-
-.reset {
-  cursor: pointer;
-  position: absolute;
-  top: 0;
-  right: $padding;
-  color: $primary-main;
-
-  &:hover {
-    color: $primary-dark;
-  }
-}

src/components/MarkInputs/Signature.tsx

@@ -1,101 +0,0 @@
-import { useRef, useState } from 'react'
-import { MarkInputProps } from '../../types/mark'
-import { getOptimizedPaths, optimizeSVG } from '../../utils'
-import { faEraser } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import styles from './Signature.module.scss'
-import { MarkRenderSignature } from '../MarkRender/Signature'
-
-export const MarkInputSignature = ({
-  value,
-  handler,
-  userMark
-}: MarkInputProps) => {
-  const location = userMark?.mark.location
-
-  const canvasRef = useRef<HTMLCanvasElement>(null)
-  const [drawing, setDrawing] = useState(false)
-  const [paths, setPaths] = useState<string[]>(value ? JSON.parse(value) : [])
-
-  function update() {
-    if (location && paths) {
-      if (paths.length) {
-        const optimizedSvg = optimizeSVG(location, paths)
-        const extractedPaths = getOptimizedPaths(optimizedSvg)
-        handler(JSON.stringify(extractedPaths))
-      } else {
-        handler('')
-      }
-    }
-  }
-
-  const handlePointerDown = (event: React.PointerEvent) => {
-    const rect = event.currentTarget.getBoundingClientRect()
-    const x = event.clientX - rect.left
-    const y = event.clientY - rect.top
-
-    const ctx = canvasRef.current?.getContext('2d')
-    ctx?.beginPath()
-    ctx?.moveTo(x, y)
-    setPaths([...paths, `M ${x} ${y}`])
-    setDrawing(true)
-  }
-  const handlePointerUp = () => {
-    setDrawing(false)
-    update()
-    const ctx = canvasRef.current?.getContext('2d')
-    ctx?.clearRect(0, 0, canvasRef.current!.width, canvasRef.current!.height)
-  }
-  const handlePointerMove = (event: React.PointerEvent) => {
-    if (!drawing) return
-    const ctx = canvasRef.current?.getContext('2d')
-    const rect = canvasRef.current?.getBoundingClientRect()
-    const x = event.clientX - rect!.left
-    const y = event.clientY - rect!.top
-
-    ctx?.lineTo(x, y)
-    ctx?.stroke()
-
-    // Collect the path data
-    setPaths((prevPaths) => {
-      const newPaths = [...prevPaths]
-      newPaths[newPaths.length - 1] += ` L ${x} ${y}`
-      return newPaths
-    })
-  }
-
-  const handleReset = () => {
-    setPaths([])
-    setDrawing(false)
-    update()
-    const ctx = canvasRef.current?.getContext('2d')
-    ctx?.clearRect(0, 0, canvasRef.current!.width, canvasRef.current!.height)
-  }
-
-  return (
-    <>
-      <div className={styles.wrapper}>
-        <div className={styles.relative}>
-          <canvas
-            height={location?.height}
-            width={location?.width}
-            ref={canvasRef}
-            className={styles.canvas}
-            onPointerDown={handlePointerDown}
-            onPointerUp={handlePointerUp}
-            onPointerMove={handlePointerMove}
-            onPointerOut={handlePointerUp}
-          ></canvas>
-          {typeof userMark?.mark !== 'undefined' && (
-            <div className={styles.absolute}>
-              <MarkRenderSignature value={value} mark={userMark.mark} />
-            </div>
-          )}
-          <div className={styles.reset}>
-            <FontAwesomeIcon size="sm" icon={faEraser} onClick={handleReset} />
-          </div>
-        </div>
-      </div>
-    </>
-  )
-}

src/components/MarkInputs/Text.tsx

@@ -1,19 +0,0 @@
-import { MarkInputProps } from '../../types/mark'
-import styles from '../MarkFormField/style.module.scss'
-
-export const MarkInputText = ({
-  value,
-  handler,
-  placeholder
-}: MarkInputProps) => {
-  return (
-    <input
-      className={styles.input}
-      placeholder={placeholder}
-      onChange={(e) => {
-        handler(e.currentTarget.value)
-      }}
-      value={value}
-    />
-  )
-}

src/components/MarkRender/Signature.tsx

@@ -1,13 +0,0 @@
-import { MarkRenderProps } from '../../types/mark'
-
-export const MarkRenderSignature = ({ value, mark }: MarkRenderProps) => {
-  const paths = value ? JSON.parse(value) : []
-
-  return (
-    <svg viewBox={`0 0 ${mark.location.width} ${mark.location.height}`}>
-      {paths.map((path: string) => (
-        <path d={path} stroke="black" fill="none" />
-      ))}
-    </svg>
-  )
-}

src/components/PDFView/PdfItem.tsx

@@ -1,58 +1,35 @@
-import { CurrentUserMark, Mark } from '../../types/mark.ts'
-import { SigitFile } from '../../utils/file.ts'
-import { ExtensionFileBox } from '../ExtensionFileBox.tsx'
-import PdfPageItem from './PdfPageItem.tsx'
+import { PdfFile } from '../../types/drawing.ts'
+import { CurrentUserMark } from '../../types/mark.ts'
+import PdfPageItem  from './PdfPageItem.tsx';
 
 interface PdfItemProps {
+  pdfFile: PdfFile
   currentUserMarks: CurrentUserMark[]
   handleMarkClick: (id: number) => void
-  otherUserMarks: Mark[]
-  file: SigitFile
-  selectedMark: CurrentUserMark | null
   selectedMarkValue: string
+  selectedMark: CurrentUserMark | null
 }
 
 /**
  * Responsible for displaying pages of a single Pdf File.
  */
-const PdfItem = ({
-  file,
-  currentUserMarks,
-  handleMarkClick,
-  selectedMarkValue,
-  selectedMark,
-  otherUserMarks
-}: PdfItemProps) => {
-  const filterByPage = (
-    marks: CurrentUserMark[],
-    page: number
-  ): CurrentUserMark[] => {
-    return marks.filter((m) => m.mark.location.page === page)
+const PdfItem = ({ pdfFile, currentUserMarks, handleMarkClick, selectedMarkValue, selectedMark }: PdfItemProps) => {
+  const filterByPage = (marks: CurrentUserMark[], page: number): CurrentUserMark[] => {
+    return marks.filter((m) => m.mark.location.page === page);
   }
-  const filterMarksByPage = (marks: Mark[], page: number): Mark[] => {
-    return marks.filter((mark) => mark.location.page === page)
-  }
-  if (file.isPdf) {
-    return file.pages?.map((page, i) => {
+  return (
+    pdfFile.pages.map((page, i) => {
       return (
         <PdfPageItem
-          fileName={file.name}
-          pageIndex={i}
           page={page}
           key={i}
           currentUserMarks={filterByPage(currentUserMarks, i)}
           handleMarkClick={handleMarkClick}
           selectedMarkValue={selectedMarkValue}
           selectedMark={selectedMark}
-          otherUserMarks={filterMarksByPage(otherUserMarks, i)}
         />
       )
-    })
-  } else if (file.isImage) {
-    return <img className="file-image" src={file.objectUrl} alt={file.name} />
-  } else {
-    return <ExtensionFileBox extension={file.extension} />
-  }
+  }))
 }
 
-export default PdfItem
+export default PdfItem

src/components/PDFView/PdfMarkItem.tsx

@@ -1,61 +1,37 @@
 import { CurrentUserMark } from '../../types/mark.ts'
 import styles from '../DrawPDFFields/style.module.scss'
-import { FONT_SIZE, FONT_TYPE, inPx } from '../../utils/pdf.ts'
-import { useScale } from '../../hooks/useScale.tsx'
-import { forwardRef } from 'react'
-import { npubToHex } from '../../utils/nostr.ts'
-import { MARK_TYPE_CONFIG } from '../getMarkComponents.tsx'
+import { inPx } from '../../utils/pdf.ts'
 
 interface PdfMarkItemProps {
   userMark: CurrentUserMark
   handleMarkClick: (id: number) => void
   selectedMarkValue: string
   selectedMark: CurrentUserMark | null
-  pageWidth: number
 }
 
 /**
  * Responsible for display an individual Pdf Mark.
  */
-const PdfMarkItem = forwardRef<HTMLDivElement, PdfMarkItemProps>(
-  (
-    { selectedMark, handleMarkClick, selectedMarkValue, userMark, pageWidth },
-    ref
-  ) => {
-    const { location } = userMark.mark
-    const handleClick = () => handleMarkClick(userMark.mark.id)
-    const isEdited = () => selectedMark?.mark.id === userMark.mark.id
-    const getMarkValue = () =>
-      isEdited() ? selectedMarkValue : userMark.currentValue
-    const { from } = useScale()
-    const { render: MarkRenderComponent } =
-      MARK_TYPE_CONFIG[userMark.mark.type] || {}
-    return (
-      <div
-        ref={ref}
-        onClick={handleClick}
-        className={`file-mark ${styles.drawingRectangle} ${isEdited() && styles.edited}`}
-        style={{
-          backgroundColor: selectedMark?.mark.npub
-            ? `#${npubToHex(selectedMark?.mark.npub)?.substring(0, 6)}4b`
-            : undefined,
-          outlineColor: selectedMark?.mark.npub
-            ? `#${npubToHex(selectedMark?.mark.npub)?.substring(0, 6)}`
-            : undefined,
-          left: inPx(from(pageWidth, location.left)),
-          top: inPx(from(pageWidth, location.top)),
-          width: inPx(from(pageWidth, location.width)),
-          height: inPx(from(pageWidth, location.height)),
-          fontFamily: FONT_TYPE,
-          fontSize: inPx(from(pageWidth, FONT_SIZE))
-        }}
-      >
-        {typeof MarkRenderComponent !== 'undefined' && (
-          <MarkRenderComponent value={getMarkValue()} mark={userMark.mark} />
-        )}
-      </div>
-    )
-  }
-)
+const PdfMarkItem = ({ selectedMark, handleMarkClick, selectedMarkValue, userMark }: PdfMarkItemProps) => {
+  const { location } = userMark.mark;
+  const handleClick = () => handleMarkClick(userMark.mark.id);
+  const getMarkValue = () => (
+    selectedMark?.mark.id === userMark.mark.id
+      ? selectedMarkValue
+      : userMark.mark.value
+  )
+  return (
+    <div
+      onClick={handleClick}
+      className={styles.drawingRectangle}
+      style={{
+        left: inPx(location.left),
+        top: inPx(location.top),
+        width: inPx(location.width),
+        height: inPx(location.height)
+      }}
+    >{getMarkValue()}</div>
+  )
+}
 
-export default PdfMarkItem
+export default PdfMarkItem

src/components/PDFView/PdfMarking.tsx

@@ -1,34 +1,22 @@
 import PdfView from './index.tsx'
-import MarkFormField from '../MarkFormField'
+import MarkFormField from '../../pages/sign/MarkFormField.tsx'
+import { PdfFile } from '../../types/drawing.ts'
 import { CurrentUserMark, Mark } from '../../types/mark.ts'
 import React, { useState, useEffect } from 'react'
 import {
-  findNextIncompleteCurrentUserMark,
-  getUpdatedMark,
-  updateCurrentUserMarks
+  findNextCurrentUserMark,
+  isCurrentUserMarksComplete,
+  updateCurrentUserMarks,
 } from '../../utils'
 import { EMPTY } from '../../utils/const.ts'
 import { Container } from '../Container'
-import signPageStyles from '../../pages/sign/style.module.scss'
-import { CurrentUserFile } from '../../types/file.ts'
-import FileList from '../FileList'
-import { StickySideColumns } from '../../layouts/StickySideColumns.tsx'
-import { UsersDetails } from '../UsersDetails.tsx'
-import { Meta } from '../../types'
-import {
-  faCircleInfo,
-  faFileDownload,
-  faPen
-} from '@fortawesome/free-solid-svg-icons'
+import styles from '../../pages/sign/style.module.scss'
 
 interface PdfMarkingProps {
-  currentUserMarks: CurrentUserMark[]
-  files: CurrentUserFile[]
-  handleDownload: () => void
-  meta: Meta | null
-  otherUserMarks: Mark[]
-  setCurrentUserMarks: (currentUserMarks: CurrentUserMark[]) => void
-  setIsMarksCompleted: (isMarksCompleted: boolean) => void
+  files: { pdfFile: PdfFile, filename: string, hash: string | null }[],
+  currentUserMarks: CurrentUserMark[],
+  setIsReadyToSign: (isReadyToSign: boolean) => void,
+  setCurrentUserMarks: (currentUserMarks: CurrentUserMark[]) => void,
   setUpdatedMarks: (markToUpdate: Mark) => void
 }
 
@@ -42,129 +30,71 @@ const PdfMarking = (props: PdfMarkingProps) => {
   const {
     files,
     currentUserMarks,
-    setIsMarksCompleted,
+    setIsReadyToSign,
     setCurrentUserMarks,
-    setUpdatedMarks,
-    handleDownload,
-    meta,
-    otherUserMarks
+    setUpdatedMarks
   } = props
   const [selectedMark, setSelectedMark] = useState<CurrentUserMark | null>(null)
-  const [selectedMarkValue, setSelectedMarkValue] = useState<string>('')
-  const [currentFile, setCurrentFile] = useState<CurrentUserFile | null>(null)
+  const [selectedMarkValue, setSelectedMarkValue] = useState<string>("")
 
   useEffect(() => {
-    if (selectedMark === null && currentUserMarks.length > 0) {
-      setSelectedMark(
-        findNextIncompleteCurrentUserMark(currentUserMarks) ||
-          currentUserMarks[0]
-      )
-    }
-  }, [currentUserMarks, selectedMark])
-
-  useEffect(() => {
-    if (currentFile === null && files.length > 0) {
-      setCurrentFile(files[0])
-    }
-  }, [files, currentFile])
+    setSelectedMark(findNextCurrentUserMark(currentUserMarks) || null)
+  }, [currentUserMarks])
 
   const handleMarkClick = (id: number) => {
-    const nextMark = currentUserMarks.find((mark) => mark.mark.id === id)
-    setSelectedMark(nextMark!)
-    setSelectedMarkValue(nextMark?.mark.value ?? EMPTY)
-  }
-
-  const handleCurrentUserMarkChange = (mark: CurrentUserMark) => {
-    if (!selectedMark) return
-    const updatedSelectedMark: CurrentUserMark = getUpdatedMark(
-      selectedMark,
-      selectedMarkValue
-    )
-
-    const updatedCurrentUserMarks = updateCurrentUserMarks(
-      currentUserMarks,
-      updatedSelectedMark
-    )
-    setCurrentUserMarks(updatedCurrentUserMarks)
-    setSelectedMarkValue(mark.currentValue ?? EMPTY)
-    setSelectedMark(mark)
+    const nextMark = currentUserMarks.find((mark) => mark.mark.id === id);
+    setSelectedMark(nextMark!);
+    setSelectedMarkValue(nextMark?.mark.value ?? EMPTY);
   }
 
   const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
-    event.preventDefault()
-    if (!selectedMarkValue || !selectedMark) return
+    event.preventDefault();
+    if (!selectedMarkValue || !selectedMark) return;
 
-    const updatedMark: CurrentUserMark = getUpdatedMark(
-      selectedMark,
-      selectedMarkValue
-    )
+    const updatedMark: CurrentUserMark = {
+      ...selectedMark,
+      mark: {
+        ...selectedMark.mark,
+        value: selectedMarkValue
+      },
+      isCompleted: true
+    }
 
     setSelectedMarkValue(EMPTY)
-    const updatedCurrentUserMarks = updateCurrentUserMarks(
-      currentUserMarks,
-      updatedMark
-    )
+    const updatedCurrentUserMarks = updateCurrentUserMarks(currentUserMarks, updatedMark);
     setCurrentUserMarks(updatedCurrentUserMarks)
-    setSelectedMark(null)
-    setIsMarksCompleted(true)
+    setSelectedMark(findNextCurrentUserMark(updatedCurrentUserMarks) || null)
+    console.log(isCurrentUserMarksComplete(updatedCurrentUserMarks))
+    setIsReadyToSign(isCurrentUserMarksComplete(updatedCurrentUserMarks))
     setUpdatedMarks(updatedMark.mark)
   }
 
-  // const updateCurrentUserMarkValues = () => {
-  //   const updatedMark: CurrentUserMark = getUpdatedMark(selectedMark!, selectedMarkValue)
-  //   const updatedCurrentUserMarks = updateCurrentUserMarks(currentUserMarks, updatedMark)
-  //   setSelectedMarkValue(EMPTY)
-  //   setCurrentUserMarks(updatedCurrentUserMarks)
-  // }
-
-  const handleChange = (value: string) => setSelectedMarkValue(value)
+  const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => setSelectedMarkValue(event.target.value)
 
   return (
     <>
-      <Container className={signPageStyles.container}>
-        <StickySideColumns
-          left={
-            <div>
-              {currentFile !== null && (
-                <FileList
-                  files={files}
-                  currentFile={currentFile}
-                  setCurrentFile={setCurrentFile}
-                  handleDownload={handleDownload}
-                />
-              )}
-            </div>
-          }
-          right={meta !== null && <UsersDetails meta={meta} />}
-          leftIcon={faFileDownload}
-          centerIcon={faPen}
-          rightIcon={faCircleInfo}
-        >
-          {currentUserMarks?.length > 0 && (
+      <Container className={styles.container}>
+        {
+          currentUserMarks?.length > 0 && (
             <PdfView
-              currentFile={currentFile}
               files={files}
               handleMarkClick={handleMarkClick}
               selectedMarkValue={selectedMarkValue}
               selectedMark={selectedMark}
               currentUserMarks={currentUserMarks}
-              otherUserMarks={otherUserMarks}
+            />)}
+        {
+          selectedMark !== null && (
+            <MarkFormField
+              handleSubmit={handleSubmit}
+              handleChange={handleChange}
+              selectedMark={selectedMark}
+              selectedMarkValue={selectedMarkValue}
             />
           )}
-        </StickySideColumns>
-        {selectedMark !== null && (
-          <MarkFormField
-            handleSubmit={handleSubmit}
-            handleSelectedMarkValueChange={handleChange}
-            selectedMark={selectedMark}
-            selectedMarkValue={selectedMarkValue}
-            currentUserMarks={currentUserMarks}
-            handleCurrentUserMarkChange={handleCurrentUserMarkChange}
-          />
-        )}
       </Container>
     </>
   )
 }
 
-export default PdfMarking
+export default PdfMarking

src/components/PDFView/PdfPageItem.tsx

@@ -1,84 +1,46 @@
 import styles from '../DrawPDFFields/style.module.scss'
 import { PdfPage } from '../../types/drawing.ts'
-import { CurrentUserMark, Mark } from '../../types/mark.ts'
+import { CurrentUserMark } from '../../types/mark.ts'
 import PdfMarkItem from './PdfMarkItem.tsx'
-import { useEffect, useRef } from 'react'
-import pdfViewStyles from './style.module.scss'
-import { FONT_SIZE, FONT_TYPE, inPx } from '../../utils/pdf.ts'
-import { useScale } from '../../hooks/useScale.tsx'
 interface PdfPageProps {
-  fileName: string
-  pageIndex: number
+  page: PdfPage
   currentUserMarks: CurrentUserMark[]
   handleMarkClick: (id: number) => void
-  otherUserMarks: Mark[]
-  page: PdfPage
-  selectedMark: CurrentUserMark | null
   selectedMarkValue: string
+  selectedMark: CurrentUserMark | null
 }
 
 /**
  * Responsible for rendering a single Pdf Page and its Marks
  */
-const PdfPageItem = ({
-  fileName,
-  pageIndex,
-  page,
-  currentUserMarks,
-  handleMarkClick,
-  selectedMarkValue,
-  selectedMark,
-  otherUserMarks
-}: PdfPageProps) => {
-  useEffect(() => {
-    if (selectedMark !== null && !!markRefs.current[selectedMark.id]) {
-      markRefs.current[selectedMark.id]?.scrollIntoView({
-        behavior: 'smooth',
-        block: 'center'
-      })
-    }
-  }, [selectedMark])
-  const markRefs = useRef<(HTMLDivElement | null)[]>([])
-  const { from } = useScale()
-
+const PdfPageItem = ({ page, currentUserMarks, handleMarkClick, selectedMarkValue, selectedMark }: PdfPageProps) => {
   return (
-    <div className={`image-wrapper ${styles.pdfImageWrapper}`}>
+    <div
+      className={styles.pdfImageWrapper}
+      style={{
+        border: '1px solid #c4c4c4',
+        marginBottom: '10px',
+        marginTop: '10px'
+      }}
+    >
       <img
         draggable="false"
         src={page.image}
-        alt={`page ${pageIndex + 1} of ${fileName}`}
+        style={{ width: '100%'}}
+
       />
-      {currentUserMarks.map((m, i) => (
-        <PdfMarkItem
-          key={i}
-          ref={(el) => (markRefs.current[m.id] = el)}
-          handleMarkClick={handleMarkClick}
-          selectedMarkValue={selectedMarkValue}
-          userMark={m}
-          selectedMark={selectedMark}
-          pageWidth={page.width}
+      {
+        currentUserMarks.map((m, i) => (
+          <PdfMarkItem
+            key={i}
+            handleMarkClick={handleMarkClick}
+            selectedMarkValue={selectedMarkValue}
+            userMark={m}
+            selectedMark={selectedMark}
         />
       ))}
-      {otherUserMarks.map((m, i) => {
-        return (
-          <div
-            key={i}
-            className={pdfViewStyles.otherUserMarksDisplay}
-            style={{
-              left: inPx(from(page.width, m.location.left)),
-              top: inPx(from(page.width, m.location.top)),
-              width: inPx(from(page.width, m.location.width)),
-              height: inPx(from(page.width, m.location.height)),
-              fontFamily: FONT_TYPE,
-              fontSize: inPx(from(page.width, FONT_SIZE))
-            }}
-          >
-            {m.value}
-          </div>
-        )
-      })}
     </div>
   )
 }
 
-export default PdfPageItem
+export default PdfPageItem

src/components/PDFView/index.tsx

@@ -1,84 +1,42 @@
+import { PdfFile } from '../../types/drawing.ts'
+import { Box } from '@mui/material'
 import PdfItem from './PdfItem.tsx'
-import { CurrentUserMark, Mark } from '../../types/mark.ts'
-import { CurrentUserFile } from '../../types/file.ts'
-import { useEffect, useRef } from 'react'
-import { FileDivider } from '../FileDivider.tsx'
-import React from 'react'
-import { LoadingSpinner } from '../LoadingSpinner/index.tsx'
+import { CurrentUserMark } from '../../types/mark.ts'
 
 interface PdfViewProps {
-  currentFile: CurrentUserFile | null
+  files: { pdfFile: PdfFile, filename: string, hash: string | null }[]
   currentUserMarks: CurrentUserMark[]
-  files: CurrentUserFile[]
   handleMarkClick: (id: number) => void
-  otherUserMarks: Mark[]
-  selectedMark: CurrentUserMark | null
   selectedMarkValue: string
+  selectedMark: CurrentUserMark | null
 }
 
 /**
  * Responsible for rendering Pdf files.
  */
-const PdfView = ({
-  files,
-  currentUserMarks,
-  handleMarkClick,
-  selectedMarkValue,
-  selectedMark,
-  currentFile,
-  otherUserMarks
-}: PdfViewProps) => {
-  const pdfRefs = useRef<(HTMLDivElement | null)[]>([])
-  useEffect(() => {
-    if (currentFile !== null && !!pdfRefs.current[currentFile.id]) {
-      pdfRefs.current[currentFile.id]?.scrollIntoView({ behavior: 'smooth' })
-    }
-  }, [currentFile])
-  const filterByFile = (
-    currentUserMarks: CurrentUserMark[],
-    hash: string
-  ): CurrentUserMark[] => {
-    return currentUserMarks.filter(
-      (currentUserMark) => currentUserMark.mark.pdfFileHash === hash
-    )
+const PdfView = ({ files, currentUserMarks, handleMarkClick, selectedMarkValue, selectedMark }: PdfViewProps) => {
+  const filterByFile = (currentUserMarks: CurrentUserMark[], hash: string): CurrentUserMark[] => {
+    return currentUserMarks.filter((currentUserMark) => currentUserMark.mark.pdfFileHash === hash)
   }
-  const filterMarksByFile = (marks: Mark[], hash: string): Mark[] => {
-    return marks.filter((mark) => mark.pdfFileHash === hash)
-  }
-  const isNotLastPdfFile = (index: number, files: CurrentUserFile[]): boolean =>
-    index !== files.length - 1
   return (
-    <div className="files-wrapper">
-      {files.length > 0 ? (
-        files.map((currentUserFile, index, arr) => {
-          const { hash, file, id } = currentUserFile
-
+    <Box sx={{ width: '100%' }}>
+      {
+        files.map(({ pdfFile, hash }, i) => {
           if (!hash) return
           return (
-            <React.Fragment key={index}>
-              <div
-                id={file.name}
-                className="file-wrapper"
-                ref={(el) => (pdfRefs.current[id] = el)}
-              >
-                <PdfItem
-                  file={file}
-                  currentUserMarks={filterByFile(currentUserMarks, hash)}
-                  selectedMark={selectedMark}
-                  handleMarkClick={handleMarkClick}
-                  selectedMarkValue={selectedMarkValue}
-                  otherUserMarks={filterMarksByFile(otherUserMarks, hash)}
-                />
-              </div>
-              {isNotLastPdfFile(index, arr) && <FileDivider />}
-            </React.Fragment>
+            <PdfItem
+              pdfFile={pdfFile}
+              key={i}
+              currentUserMarks={filterByFile(currentUserMarks, hash)}
+              selectedMark={selectedMark}
+              handleMarkClick={handleMarkClick}
+              selectedMarkValue={selectedMarkValue}
+          />
           )
         })
-      ) : (
-        <LoadingSpinner variant="small" />
-      )}
-    </div>
+      }
+    </Box>
   )
 }
 
-export default PdfView
+export default PdfView;

src/components/PDFView/style.module.scss

@@ -1,13 +1,16 @@
-.container {
-  display: flex;
-  width: 100%;
-  flex-direction: column;
-}
-
-.otherUserMarksDisplay {
-  position: absolute;
-  z-index: 40;
+.imageWrapper {
   display: flex;
   justify-content: center;
   align-items: center;
+  width: 100%; /* Adjust as needed */
+  height: 100%; /* Adjust as needed */
+  overflow: hidden; /* Ensure no overflow */
+  border: 1px solid #ccc; /* Optional: for visual debugging */
+  background-color: #e0f7fa; /* Optional: for visual debugging */
 }
+
+.image {
+  max-width: 100%;
+  max-height: 100%;
+  object-fit: contain; /* Ensure the image fits within the container */
+}

src/components/Select/index.tsx

@@ -1,113 +0,0 @@
-import {
-  FormControl,
-  MenuItem,
-  Select as SelectMui,
-  SelectChangeEvent,
-  styled,
-  SelectProps as SelectMuiProps,
-  MenuItemProps
-} from '@mui/material'
-
-const SelectCustomized = styled(SelectMui)<SelectMuiProps>(() => ({
-  backgroundColor: 'var(--primary-main)',
-  fontSize: '14px',
-  fontWeight: '500',
-  color: 'white',
-  ':hover': {
-    backgroundColor: 'var(--primary-light)'
-  },
-  '& .MuiSelect-select:focus': {
-    backgroundColor: 'var(--primary-light)'
-  },
-  '& .MuiSvgIcon-root': {
-    color: 'white'
-  },
-  '& .MuiOutlinedInput-notchedOutline': {
-    border: 'none'
-  }
-}))
-
-const MenuItemCustomized = styled(MenuItem)<MenuItemProps>(() => ({
-  marginInline: '5px',
-  borderRadius: '4px',
-  '&:hover': {
-    background: 'var(--primary-light)',
-    color: 'white'
-  },
-  '&.Mui-selected': {
-    background: 'var(--primary-dark)',
-    color: 'white'
-  },
-  '&.Mui-selected:hover': {
-    background: 'var(--primary-light)'
-  },
-  '&.Mui-selected.Mui-focusVisible': {
-    background: 'var(--primary-light)',
-    color: 'white'
-  },
-  '&.Mui-focusVisible': {
-    background: 'var(--primary-light)',
-    color: 'white'
-  },
-  '& + *': {
-    marginTop: '5px'
-  }
-}))
-
-interface SelectItemProps<T extends string> {
-  value: T
-  label: string
-}
-
-interface SelectProps<T extends string> {
-  value: T
-  setValue: React.Dispatch<React.SetStateAction<T>>
-  options: SelectItemProps<T>[]
-  name?: string
-  id?: string
-}
-
-export function Select<T extends string>({
-  value,
-  setValue,
-  options,
-  name,
-  id
-}: SelectProps<T>) {
-  const handleChange = (event: SelectChangeEvent<unknown>) => {
-    setValue(event.target.value as T)
-  }
-
-  return (
-    <FormControl>
-      <SelectCustomized
-        id={id}
-        name={name}
-        size="small"
-        variant="outlined"
-        value={value}
-        onChange={handleChange}
-        MenuProps={{
-          MenuListProps: {
-            sx: {
-              paddingBlock: '5px'
-            }
-          },
-          PaperProps: {
-            sx: {
-              boxShadow: '0 0 4px 0 rgb(0, 0, 0, 0.1)'
-            }
-          }
-        }}
-      >
-        {options.map((o) => {
-          return (
-            <MenuItemCustomized key={o.label} value={o.value as string}>
-              {o.label}
-            </MenuItemCustomized>
-          )
-        })}
-      </SelectCustomized>
-    </FormControl>
-  )
-}

src/components/Spinner/index.tsx

@@ -1,6 +0,0 @@
-import { PropsWithChildren } from 'react'
-import styles from './style.module.scss'
-
-export const Spinner = ({ children }: PropsWithChildren) => (
-  <div className={styles.spin}>{children}</div>
-)

src/components/Spinner/style.module.scss

@@ -1,12 +0,0 @@
-.spin {
-  animation: spin 5s linear infinite;
-}
-
-@keyframes spin {
-  0% {
-    transform: rotate(0deg);
-  }
-  100% {
-    transform: rotate(360deg);
-  }
-}

src/components/TooltipChild.tsx

@@ -1,16 +0,0 @@
-import { forwardRef, PropsWithChildren } from 'react'
-
-/**
- * Helper wrapper for custom child components when using `@mui/material/tooltips`.
- * Mui Tooltip works out-the-box with other `@mui` components but when using custom they require ref.
- * @source https://mui.com/material-ui/react-tooltip/#custom-child-element
- */
-export const TooltipChild = forwardRef<HTMLSpanElement, PropsWithChildren>(
-  ({ children, ...rest }, ref) => {
-    return (
-      <span ref={ref} {...rest}>
-        {children}
-      </span>
-    )
-  }
-)

src/components/UserAvatar/index.tsx

@@ -1,58 +1,42 @@
+import { useNavigate } from 'react-router-dom'
 import { getProfileRoute } from '../../routes'
 
 import styles from './styles.module.scss'
+import React from 'react'
 import { AvatarIconButton } from '../UserAvatarIconButton'
-import { Link } from 'react-router-dom'
-import { useProfileMetadata } from '../../hooks/useProfileMetadata'
-import { Tooltip } from '@mui/material'
-import { getProfileUsername } from '../../utils'
-import { TooltipChild } from '../TooltipChild'
 
 interface UserAvatarProps {
+  name: string
   pubkey: string
-  isNameVisible?: boolean
+  image?: string
 }
 
 /**
  *  This component will be used for the displaying username and profile picture.
  *  Clicking will navigate to the user's profile.
  */
-export const UserAvatar = ({
-  pubkey,
-  isNameVisible = false
-}: UserAvatarProps) => {
-  const profile = useProfileMetadata(pubkey)
-  const name = getProfileUsername(pubkey, profile)
-  const image = profile?.picture
+export const UserAvatar = ({ pubkey, name, image }: UserAvatarProps) => {
+  const navigate = useNavigate()
+
+  const handleClick = (e: React.MouseEvent<HTMLElement, MouseEvent>) => {
+    e.stopPropagation()
+    navigate(getProfileRoute(pubkey))
+  }
 
   return (
-    <Link
-      to={getProfileRoute(pubkey)}
-      className={styles.container}
-      tabIndex={-1}
-    >
-      <Tooltip
-        key={pubkey}
-        title={name}
-        placement="top"
-        arrow
-        disableInteractive
-      >
-        <TooltipChild>
-          <AvatarIconButton
-            src={image}
-            hexKey={pubkey}
-            aria-label={`account of user ${name}`}
-            color="inherit"
-            sx={{
-              padding: 0
-            }}
-          />
-        </TooltipChild>
-      </Tooltip>
-      {isNameVisible && name ? (
-        <span className={styles.username}>{name}</span>
+    <div className={styles.container}>
+      <AvatarIconButton
+        src={image}
+        hexKey={pubkey}
+        aria-label={`account of user ${name}`}
+        color="inherit"
+        onClick={handleClick}
+      />
+      {name ? (
+        <label onClick={handleClick} className={styles.username}>
+          {name}
+        </label>
       ) : null}
-    </Link>
+    </div>
   )
 }

src/components/UserAvatar/styles.module.scss

@@ -2,7 +2,7 @@
   display: flex;
   align-items: center;
   gap: 10px;
-  // flex-grow: 1;
+  flex-grow: 1;
 }
 
 .username {
@@ -10,8 +10,4 @@
   font-weight: 500;
   font-size: 14px;
   color: var(--text-color);
-
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
 }

src/components/UserAvatarGroup/index.tsx

@@ -1,38 +0,0 @@
-import { Children, PropsWithChildren } from 'react'
-
-import styles from './style.module.scss'
-
-interface UserAvatarGroupProps extends React.HTMLAttributes<HTMLDivElement> {
-  max: number
-  renderSurplus?: ((surplus: number) => React.ReactNode) | undefined
-}
-
-const defaultSurplus = (surplus: number) => {
-  return <span className={styles.icon}>+{surplus}</span>
-}
-
-/**
- * Renders children with the `max` limit (including surplus if available).
- * The children are wrapped with a `div` (accepts standard `HTMLDivElement` attributes)
- * @param max The maximum number of children rendered in a div.
- * @param renderSurplus Custom render for surplus children (accepts surplus number).
- */
-export const UserAvatarGroup = ({
-  max,
-  renderSurplus = defaultSurplus,
-  children,
-  ...rest
-}: PropsWithChildren<UserAvatarGroupProps>) => {
-  const total = Children.count(children)
-  const surplus = total - max + 1
-
-  const childrenArray = Children.toArray(children)
-  return (
-    <div className={styles.container} {...rest}>
-      {surplus > 1
-        ? childrenArray.slice(0, surplus * -1).map((c) => c)
-        : children}
-      {surplus > 1 && renderSurplus(surplus)}
-    </div>
-  )
-}

src/components/UserAvatarGroup/style.module.scss

@@ -1,39 +0,0 @@
-@import '../../styles/colors.scss';
-
-.container {
-  padding: 0 0 0 10px;
-
-  > * {
-    transition: margin ease 0.2s;
-    margin: 0 0 0 -10px;
-    position: relative;
-    z-index: 1;
-    &:first-child {
-      margin-left: -10px !important;
-    }
-  }
-
-  > *:hover,
-  > *:focus-within {
-    margin: 0 15px 0 5px;
-    z-index: 2;
-  }
-}
-
-.icon {
-  width: 40px;
-  height: 40px;
-  border-radius: 50%;
-  border-width: 2px;
-  overflow: hidden;
-
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-
-  background: white;
-  color: rgba(0, 0, 0, 0.5);
-  font-weight: bold;
-  font-size: 14px;
-  border: solid 2px $primary-main;
-}

src/components/UserAvatarIconButton/style.module.scss

@@ -2,6 +2,6 @@
   width: 40px;
   height: 40px;
   border-radius: 50%;
-  border-width: 2px;
+  border-width: 3px;
   overflow: hidden;
 }

src/components/UsersDetails.tsx/index.tsx

@@ -1,276 +0,0 @@
-import { Divider, Tooltip } from '@mui/material'
-import {
-  formatTimestamp,
-  fromUnixTimestamp,
-  hexToNpub,
-  npubToHex,
-  SigitStatus,
-  SignStatus
-} from '../../utils'
-import { useSigitMeta } from '../../hooks/useSigitMeta'
-import { UserAvatarGroup } from '../UserAvatarGroup'
-
-import styles from './style.module.scss'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import {
-  faCalendar,
-  faCalendarCheck,
-  faCalendarPlus,
-  faCheck,
-  faClock,
-  faEye,
-  faFile,
-  faFileCircleExclamation
-} from '@fortawesome/free-solid-svg-icons'
-import { getExtensionIconLabel } from '../getExtensionIconLabel'
-import { useAppSelector } from '../../hooks/store'
-import { DisplaySigner } from '../DisplaySigner'
-import { Meta, OpenTimestamp } from '../../types'
-import { extractFileExtensions } from '../../utils/file'
-import { UserAvatar } from '../UserAvatar'
-
-interface UsersDetailsProps {
-  meta: Meta
-}
-
-export const UsersDetails = ({ meta }: UsersDetailsProps) => {
-  const {
-    submittedBy,
-    exportedBy,
-    signers,
-    viewers,
-    fileHashes,
-    signersStatus,
-    createdAt,
-    completedAt,
-    parsedSignatureEvents,
-    signedStatus,
-    isValid,
-    id,
-    timestamps
-  } = useSigitMeta(meta)
-  const { usersPubkey } = useAppSelector((state) => state.auth)
-  const userCanSign =
-    typeof usersPubkey !== 'undefined' &&
-    signers.includes(hexToNpub(usersPubkey))
-
-  const { extensions, isSame } = extractFileExtensions(Object.keys(fileHashes))
-
-  const isTimestampVerified = (
-    timestamps: OpenTimestamp[],
-    nostrId: string
-  ): boolean => {
-    const matched = timestamps.find((t) => t.nostrId === nostrId)
-    return !!(matched && matched.verification)
-  }
-
-  const getOpenTimestampsInfo = (
-    timestamps: OpenTimestamp[],
-    nostrId: string
-  ) => {
-    if (isTimestampVerified(timestamps, nostrId)) {
-      return <FontAwesomeIcon className={styles.ticket} icon={faCheck} />
-    } else {
-      return <FontAwesomeIcon className={styles.ticket} icon={faClock} />
-    }
-  }
-
-  const getCompletedOpenTimestampsInfo = (timestamp: OpenTimestamp) => {
-    if (timestamp.verification) {
-      return <FontAwesomeIcon className={styles.ticket} icon={faCheck} />
-    } else {
-      return <FontAwesomeIcon className={styles.ticket} icon={faClock} />
-    }
-  }
-
-  const getTimestampTooltipTitle = (label: string, isVerified: boolean) => {
-    return `${label} / Open Timestamp ${isVerified ? 'Verified' : 'Pending'}`
-  }
-
-  const isUserSignatureTimestampVerified = () => {
-    if (
-      userCanSign &&
-      hexToNpub(usersPubkey) in parsedSignatureEvents &&
-      timestamps &&
-      timestamps.length > 0
-    ) {
-      const nostrId = parsedSignatureEvents[hexToNpub(usersPubkey)].id
-      return isTimestampVerified(timestamps, nostrId)
-    }
-    return false
-  }
-
-  return submittedBy ? (
-    <div className={styles.container}>
-      <div className={styles.section}>
-        <p>Signers</p>
-        <div className={styles.users}>
-          {submittedBy && (
-            <DisplaySigner
-              status={isValid ? SignStatus.Signed : SignStatus.Invalid}
-              pubkey={submittedBy}
-            />
-          )}
-
-          {submittedBy && signers.length ? (
-            <Divider orientation="vertical" flexItem />
-          ) : null}
-
-          <UserAvatarGroup max={20}>
-            {signers.map((signer) => {
-              const pubkey = npubToHex(signer)!
-              return (
-                <DisplaySigner
-                  key={pubkey}
-                  status={signersStatus[signer]}
-                  pubkey={pubkey}
-                />
-              )
-            })}
-          </UserAvatarGroup>
-        </div>
-
-        {viewers.length > 0 && (
-          <>
-            <p>Viewers</p>
-            <div className={styles.users}>
-              <UserAvatarGroup max={20}>
-                {viewers.map((signer) => {
-                  const pubkey = npubToHex(signer)!
-
-                  return (
-                    <DisplaySigner
-                      key={pubkey}
-                      status={SignStatus.Viewer}
-                      pubkey={pubkey}
-                    />
-                  )
-                })}
-              </UserAvatarGroup>
-            </div>
-          </>
-        )}
-
-        {exportedBy && (
-          <>
-            <p>Exported By</p>
-            <div className={styles.users}>
-              <UserAvatar pubkey={exportedBy} />
-            </div>
-          </>
-        )}
-      </div>
-      <div className={styles.section}>
-        <p>Details</p>
-
-        <Tooltip
-          title={getTimestampTooltipTitle(
-            'Publication date',
-            !!(timestamps && id && isTimestampVerified(timestamps, id))
-          )}
-          placement="top"
-          arrow
-          disableInteractive
-        >
-          <span className={styles.detailsItem}>
-            <FontAwesomeIcon icon={faCalendarPlus} />{' '}
-            {createdAt ? formatTimestamp(createdAt) : <>&mdash;</>}{' '}
-            {timestamps &&
-              timestamps.length > 0 &&
-              id &&
-              getOpenTimestampsInfo(timestamps, id)}
-          </span>
-        </Tooltip>
-
-        <Tooltip
-          title={getTimestampTooltipTitle(
-            'Completion date',
-            !!(
-              signedStatus === SigitStatus.Complete &&
-              completedAt &&
-              timestamps &&
-              timestamps.length > 0 &&
-              timestamps[timestamps.length - 1].verification
-            )
-          )}
-          placement="top"
-          arrow
-          disableInteractive
-        >
-          <span className={styles.detailsItem}>
-            <FontAwesomeIcon icon={faCalendarCheck} />{' '}
-            {completedAt ? formatTimestamp(completedAt) : <>&mdash;</>}
-            {signedStatus === SigitStatus.Complete &&
-              completedAt &&
-              timestamps &&
-              timestamps.length > 0 && (
-                <span className={styles.ticket}>
-                  {getCompletedOpenTimestampsInfo(
-                    timestamps[timestamps.length - 1]
-                  )}
-                </span>
-              )}
-          </span>
-        </Tooltip>
-
-        {/* User signed date */}
-        {userCanSign ? (
-          <Tooltip
-            title={getTimestampTooltipTitle(
-              'Your signature date',
-              isUserSignatureTimestampVerified()
-            )}
-            placement="top"
-            arrow
-            disableInteractive
-          >
-            <span className={styles.detailsItem}>
-              <FontAwesomeIcon icon={faCalendar} />{' '}
-              {hexToNpub(usersPubkey) in parsedSignatureEvents ? (
-                parsedSignatureEvents[hexToNpub(usersPubkey)].created_at ? (
-                  formatTimestamp(
-                    fromUnixTimestamp(
-                      parsedSignatureEvents[hexToNpub(usersPubkey)].created_at
-                    )
-                  )
-                ) : (
-                  <>&mdash;</>
-                )
-              ) : (
-                <>&mdash;</>
-              )}
-              {hexToNpub(usersPubkey) in parsedSignatureEvents &&
-                timestamps &&
-                timestamps.length > 0 && (
-                  <span className={styles.ticket}>
-                    {getOpenTimestampsInfo(
-                      timestamps,
-                      parsedSignatureEvents[hexToNpub(usersPubkey)].id
-                    )}
-                  </span>
-                )}
-            </span>
-          </Tooltip>
-        ) : null}
-        <span className={styles.detailsItem}>
-          <FontAwesomeIcon icon={faEye} /> {signedStatus}
-        </span>
-        {extensions.length > 0 ? (
-          <span className={styles.detailsItem}>
-            {!isSame ? (
-              <>
-                <FontAwesomeIcon icon={faFile} /> Multiple File Types
-              </>
-            ) : (
-              getExtensionIconLabel(extensions[0])
-            )}
-          </span>
-        ) : (
-          <>
-            <FontAwesomeIcon icon={faFileCircleExclamation} /> &mdash;
-          </>
-        )}
-      </div>
-    </div>
-  ) : undefined
-}

src/components/UsersDetails.tsx/style.module.scss

@@ -1,48 +0,0 @@
-@import '../../styles/colors.scss';
-
-.container {
-  border-radius: 4px;
-  background: $overlay-background-color;
-  padding: 15px;
-  display: flex;
-  flex-direction: column;
-  grid-gap: 25px;
-
-  font-size: 14px;
-}
-
-.section {
-  display: flex;
-  flex-direction: column;
-  grid-gap: 10px;
-}
-
-.users {
-  display: flex;
-  grid-gap: 10px;
-}
-
-.detailsItem {
-  transition: ease 0.2s;
-  color: rgba(0, 0, 0, 0.5);
-  font-size: 14px;
-  align-items: center;
-  border-radius: 4px;
-  padding: 5px;
-
-  display: flex;
-
-  > :first-child {
-    padding: 5px;
-    margin-right: 10px;
-  }
-
-  &:hover {
-    background: $primary-main;
-    color: white;
-  }
-}
-
-.ticket {
-  margin-left: auto;
-}

src/components/getExtensionIconLabel.tsx

@@ -1,78 +0,0 @@
-import {
-  faFilePdf,
-  faFileExcel,
-  faFileWord,
-  faFilePowerpoint,
-  faFileZipper,
-  faFileCsv,
-  faFileLines,
-  faFileImage,
-  faFile,
-  IconDefinition
-} from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-
-export const getExtensionIconLabel = (extension: string) => {
-  let icon: IconDefinition
-  switch (extension.toLowerCase()) {
-    case 'pdf':
-      icon = faFilePdf
-      break
-    case 'json':
-      icon = faFilePdf
-      break
-
-    case 'xlsx':
-    case 'xls':
-    case 'xlsb':
-    case 'xlsm':
-      icon = faFileExcel
-      break
-
-    case 'doc':
-    case 'docx':
-      icon = faFileWord
-      break
-
-    case 'ppt':
-    case 'pptx':
-      icon = faFilePowerpoint
-      break
-
-    case 'zip':
-    case '7z':
-    case 'rar':
-    case 'tar':
-    case 'gz':
-      icon = faFileZipper
-      break
-
-    case 'csv':
-      icon = faFileCsv
-      break
-
-    case 'txt':
-      icon = faFileLines
-      break
-
-    case 'png':
-    case 'jpg':
-    case 'jpeg':
-    case 'gif':
-    case 'svg':
-    case 'bmp':
-    case 'ico':
-      icon = faFileImage
-      break
-
-    default:
-      icon = faFile
-      return
-  }
-
-  return (
-    <>
-      <FontAwesomeIcon icon={icon} /> {extension.toUpperCase()}
-    </>
-  )
-}

src/components/getMarkComponents.tsx

@@ -1,16 +0,0 @@
-import { MarkType } from '../types/drawing'
-import { MarkConfigs } from '../types/mark'
-import { MarkInputSignature } from './MarkInputs/Signature'
-import { MarkInputText } from './MarkInputs/Text'
-import { MarkRenderSignature } from './MarkRender/Signature'
-
-export const MARK_TYPE_CONFIG: MarkConfigs = {
-  [MarkType.TEXT]: {
-    input: MarkInputText,
-    render: ({ value }) => <>{value}</>
-  },
-  [MarkType.SIGNATURE]: {
-    input: MarkInputSignature,
-    render: MarkRenderSignature
-  }
-}

src/components/username.tsx

@@ -1,5 +1,6 @@
 import { Typography } from '@mui/material'
-import { useAppSelector } from '../hooks/store'
+import { useSelector } from 'react-redux'
+import { State } from '../store/rootReducer'
 
 import styles from './username.module.scss'
 import { AvatarIconButton } from './UserAvatarIconButton'
@@ -15,7 +16,7 @@ type Props = {
  *  Clicking will open the menu.
  */
 const Username = ({ username, avatarContent, handleClick }: Props) => {
-  const hexKey = useAppSelector((state) => state.auth.usersPubkey)
+  const hexKey = useSelector((state: State) => state.auth.usersPubkey)
 
   return (
     <div className={styles.container}>

src/controllers/AuthController.ts

@@ -1,23 +1,21 @@
 import { EventTemplate } from 'nostr-tools'
 import { MetadataController, NostrController } from '.'
-import { appPrivateRoutes } from '../routes'
 import {
   setAuthState,
   setMetadataEvent,
   setRelayMapAction
 } from '../store/actions'
 import store from '../store/store'
-import { SignedEvent } from '../types'
 import {
   base64DecodeAuthToken,
   base64EncodeSignedEvent,
-  compareObjects,
   getAuthToken,
-  getRelayMap,
   getVisitedLink,
   saveAuthToken,
-  unixNow
+  compareObjects
 } from '../utils'
+import { appPrivateRoutes } from '../routes'
+import { SignedEvent } from '../types'
 
 export class AuthController {
   private nostrController: NostrController
@@ -25,13 +23,13 @@ export class AuthController {
 
   constructor() {
     this.nostrController = NostrController.getInstance()
-    this.metadataController = MetadataController.getInstance()
+    this.metadataController = new MetadataController()
   }
 
   /**
    * Function will authenticate user by signing an auth event
    * which is done by calling the sign() function, where appropriate
-   * method will be chosen (extension or keys)
+   * method will be chosen (extension, nsecbunker or keys)
    *
    * @param pubkey of the user trying to login
    * @returns url to redirect if authentication successfull
@@ -56,16 +54,13 @@ export class AuthController {
       })
 
     // Nostr uses unix timestamps
-    const timestamp = unixNow()
-    const { href } = window.location
+    const timestamp = Math.floor(Date.now() / 1000)
+    const { hostname } = window.location
 
     const authEvent: EventTemplate = {
       kind: 27235,
-      tags: [
-        ['u', href],
-        ['method', 'GET']
-      ],
-      content: '',
+      tags: [],
+      content: `${hostname}-${timestamp}`,
       created_at: timestamp
     }
 
@@ -79,14 +74,14 @@ export class AuthController {
       })
     )
 
-    const relayMap = await getRelayMap(pubkey)
+    const relayMap = await this.nostrController.getRelayMap(pubkey)
 
     if (Object.keys(relayMap).length < 1) {
       // Navigate user to relays page if relay map is empty
       return Promise.resolve(appPrivateRoutes.relays)
     }
 
-    if (store.getState().auth.loggedIn) {
+    if (store.getState().auth?.loggedIn) {
       if (!compareObjects(store.getState().relays?.map, relayMap.map))
         store.dispatch(setRelayMapAction(relayMap.map))
     }

src/controllers/MetadataController.ts

@@ -1,44 +1,31 @@
 import {
-  Event,
   Filter,
+  SimplePool,
   VerifiedEvent,
   kinds,
   validateEvent,
-  verifyEvent
+  verifyEvent,
+  Event,
+  EventTemplate,
+  nip19
 } from 'nostr-tools'
+import { NostrJoiningBlock, ProfileMetadata, RelaySet } from '../types'
+import { NostrController } from '.'
 import { toast } from 'react-toastify'
+import { queryNip05 } from '../utils'
+import NDK, { NDKEvent, NDKSubscription } from '@nostr-dev-kit/ndk'
 import { EventEmitter } from 'tseep'
-import { NostrController, relayController } from '.'
 import { localCache } from '../services'
-import { ProfileMetadata, RelaySet } from '../types'
-import {
-  findRelayListAndUpdateCache,
-  findRelayListInCache,
-  getDefaultRelaySet,
-  getUserRelaySet,
-  isOlderThanOneDay,
-  unixNow
-} from '../utils'
-import { DEFAULT_LOOK_UP_RELAY_LIST } from '../utils/const'
 
 export class MetadataController extends EventEmitter {
-  private static instance: MetadataController
   private nostrController: NostrController
   private specialMetadataRelay = 'wss://purplepag.es'
-  private pendingFetches = new Map<string, Promise<Event | null>>() // Track pending fetches
 
   constructor() {
     super()
     this.nostrController = NostrController.getInstance()
   }
 
-  public static getInstance(): MetadataController {
-    if (!MetadataController.instance) {
-      MetadataController.instance = new MetadataController()
-    }
-    return MetadataController.instance
-  }
-
   /**
    * Asynchronously checks for more recent metadata events authored by a specific key.
    * If a more recent metadata event is found, it is handled and returned.
@@ -51,55 +38,71 @@ export class MetadataController extends EventEmitter {
     hexKey: string,
     currentEvent: Event | null
   ): Promise<Event | null> {
-    // Return the ongoing fetch promise if one exists for the same hexKey
-    if (this.pendingFetches.has(hexKey)) {
-      return this.pendingFetches.get(hexKey)!
-    }
-
     // Define the event filter to only include metadata events authored by the given key
     const eventFilter: Filter = {
-      kinds: [kinds.Metadata],
-      authors: [hexKey]
+      kinds: [kinds.Metadata], // Only metadata events
+      authors: [hexKey] // Authored by the specified key
     }
 
-    const fetchPromise = relayController
-      .fetchEvent(eventFilter, DEFAULT_LOOK_UP_RELAY_LIST)
+    const pool = new SimplePool()
+
+    // Try to get the metadata event from a special relay (wss://purplepag.es)
+    const metadataEvent = await pool
+      .get([this.specialMetadataRelay], eventFilter)
       .catch((err) => {
-        console.error(err)
-        return null
-      })
-      .finally(() => {
-        this.pendingFetches.delete(hexKey)
+        console.error(err) // Log any errors
+        return null // Return null if an error occurs
       })
 
-    this.pendingFetches.set(hexKey, fetchPromise)
-
-    const metadataEvent = await fetchPromise
-
+    // If a valid metadata event is found from the special relay
     if (
       metadataEvent &&
-      validateEvent(metadataEvent) &&
-      verifyEvent(metadataEvent)
+      validateEvent(metadataEvent) && // Validate the event
+      verifyEvent(metadataEvent) // Verify the event's authenticity
     ) {
+      // If there's no current event or the new metadata event is more recent
       if (
         !currentEvent ||
         metadataEvent.created_at >= currentEvent.created_at
       ) {
+        // Handle the new metadata event
         this.handleNewMetadataEvent(metadataEvent)
       }
+
       return metadataEvent
     }
 
-    // todo/implement: if no valid metadata event is found in DEFAULT_LOOK_UP_RELAY_LIST
-    // try to query user relay list
+    // If no valid metadata event is found from the special relay, get the most popular relays
+    const mostPopularRelays = await this.nostrController.getMostPopularRelays()
 
-    // if current event is null we should cache empty metadata event for provided hexKey
-    if (!currentEvent) {
-      const emptyMetadata = this.getEmptyMetadataEvent(hexKey)
-      this.handleNewMetadataEvent(emptyMetadata as VerifiedEvent)
+    // Query the most popular relays for metadata events
+    const events = await pool
+      .querySync(mostPopularRelays, eventFilter)
+      .catch((err) => {
+        console.error(err) // Log any errors
+        return null // Return null if an error occurs
+      })
+
+    // If events are found from the popular relays
+    if (events && events.length) {
+      events.sort((a, b) => b.created_at - a.created_at) // Sort events by creation date (descending)
+
+      // Iterate through the events
+      for (const event of events) {
+        // If the event is valid, authentic, and more recent than the current event
+        if (
+          validateEvent(event) &&
+          verifyEvent(event) &&
+          (!currentEvent || event.created_at > currentEvent.created_at)
+        ) {
+          // Handle the new metadata event
+          this.handleNewMetadataEvent(event)
+          return event
+        }
+      }
     }
 
-    return currentEvent
+    return currentEvent // Return the current event if no newer event is found
   }
 
   /**
@@ -124,9 +127,12 @@ export class MetadataController extends EventEmitter {
 
     // If cached metadata is found, check its validity
     if (cachedMetadataEvent) {
-      // Check if the cached metadata is older than one day
-      if (isOlderThanOneDay(cachedMetadataEvent.cachedAt)) {
+      const oneWeekInMS = 7 * 24 * 60 * 60 * 1000 // Number of milliseconds in one week
+
+      // Check if the cached metadata is older than one week
+      if (Date.now() - cachedMetadataEvent.cachedAt > oneWeekInMS) {
         // If older than one week, find the metadata from relays in background
+
         this.checkForMoreRecentMetadata(hexKey, cachedMetadataEvent.event)
       }
 
@@ -138,25 +144,100 @@ export class MetadataController extends EventEmitter {
     return this.checkForMoreRecentMetadata(hexKey, null)
   }
 
-  /**
-   * Based on the hexKey of the current user, this method attempts to retrieve a relay set.
-   * @func findRelayListInCache first checks if there is already an up-to-date
-   * relay list available in cache; if not -
-   * @func findRelayListAndUpdateCache checks if the relevant relay event is available from
-   * the purple pages relay;
-   * @func findRelayListAndUpdateCache will run again if the previous two calls return null and
-   * check if the relevant relay event can be obtained from 'most popular relays'
-   * If relay event is found, it will be saved in cache for future use
-   * @param hexKey of the current user
-   * @return RelaySet which will contain either relays extracted from the user Relay Event
-   * or a fallback RelaySet with Sigit's Relay
-   */
-  public findRelayListMetadata = async (hexKey: string): Promise<RelaySet> => {
-    const relayEvent =
-      (await findRelayListInCache(hexKey)) ||
-      (await findRelayListAndUpdateCache(DEFAULT_LOOK_UP_RELAY_LIST, hexKey))
+  public findRelayListMetadata = async (hexKey: string) => {
+    let relayEvent: Event | null = null
 
-    return relayEvent ? getUserRelaySet(relayEvent.tags) : getDefaultRelaySet()
+    // Attempt to retrieve the metadata event from the local cache
+    const cachedRelayListMetadataEvent =
+      await localCache.getUserRelayListMetadata(hexKey)
+
+    if (cachedRelayListMetadataEvent) {
+      const oneWeekInMS = 7 * 24 * 60 * 60 * 1000 // Number of milliseconds in one week
+
+      // Check if the cached event is not older than one week
+      if (Date.now() - cachedRelayListMetadataEvent.cachedAt < oneWeekInMS) {
+        relayEvent = cachedRelayListMetadataEvent.event
+      }
+    }
+
+    // define filter for relay list
+    const eventFilter: Filter = {
+      kinds: [kinds.RelayList],
+      authors: [hexKey]
+    }
+
+    const pool = new SimplePool()
+
+    // Try to get the relayList event from a special relay (wss://purplepag.es)
+    if (!relayEvent) {
+      relayEvent = await pool
+        .get([this.specialMetadataRelay], eventFilter)
+        .then((event) => {
+          if (event) {
+            // update the event in local cache
+            localCache.addUserRelayListMetadata(event)
+          }
+          return event
+        })
+        .catch((err) => {
+          console.error(err)
+          return null
+        })
+    }
+
+    if (!relayEvent) {
+      // If no valid relayList event is found from the special relay, get the most popular relays
+      const mostPopularRelays =
+        await this.nostrController.getMostPopularRelays()
+
+      // Query the most popular relays for relayList event
+      relayEvent = await pool
+        .get(mostPopularRelays, eventFilter)
+        .then((event) => {
+          if (event) {
+            // update the event in local cache
+            localCache.addUserRelayListMetadata(event)
+          }
+          return event
+        })
+        .catch((err) => {
+          console.error(err)
+          return null
+        })
+    }
+
+    if (relayEvent) {
+      const relaySet: RelaySet = {
+        read: [],
+        write: []
+      }
+
+      // a list of r tags with relay URIs and a read or write marker.
+      const relayTags = relayEvent.tags.filter((tag) => tag[0] === 'r')
+
+      // Relays marked as read / write are called READ / WRITE relays, respectively
+      relayTags.forEach((tag) => {
+        if (tag.length >= 3) {
+          const marker = tag[2]
+
+          if (marker === 'read') {
+            relaySet.read.push(tag[1])
+          } else if (marker === 'write') {
+            relaySet.write.push(tag[1])
+          }
+        }
+
+        // If the marker is omitted, the relay is used for both purposes
+        if (tag.length === 2) {
+          relaySet.read.push(tag[1])
+          relaySet.write.push(tag[1])
+        }
+      })
+
+      return relaySet
+    }
+
+    throw new Error('No relay list metadata found.')
   }
 
   public extractProfileMetadataContent = (event: Event) => {
@@ -176,7 +257,7 @@ export class MetadataController extends EventEmitter {
     let signedMetadataEvent = event
 
     if (event.sig.length < 1) {
-      const timestamp = unixNow()
+      const timestamp = Math.floor(Date.now() / 1000)
 
       // Metadata event to publish to the wss://purplepag.es relay
       const newMetadataEvent: Event = {
@@ -188,30 +269,152 @@ export class MetadataController extends EventEmitter {
         await this.nostrController.signEvent(newMetadataEvent)
     }
 
-    await relayController
-      .publish(signedMetadataEvent, [this.specialMetadataRelay])
+    await this.nostrController
+      .publishEvent(signedMetadataEvent, [this.specialMetadataRelay])
       .then((relays) => {
-        if (relays.length) {
-          toast.success(`Metadata event published on: ${relays.join('\n')}`)
-          this.handleNewMetadataEvent(signedMetadataEvent as VerifiedEvent)
-        } else {
-          toast.error('Could not publish metadata event to any relay!')
-        }
+        toast.success(`Metadata event published on: ${relays.join('\n')}`)
+        this.handleNewMetadataEvent(signedMetadataEvent as VerifiedEvent)
       })
       .catch((err) => {
         toast.error(err.message)
       })
   }
 
+  public getNostrJoiningBlockNumber = async (
+    hexKey: string
+  ): Promise<NostrJoiningBlock | null> => {
+    const relaySet = await this.findRelayListMetadata(hexKey)
+
+    const userRelays: string[] = []
+
+    // find user's relays
+    if (relaySet.write.length > 0) {
+      userRelays.push(...relaySet.write)
+    } else {
+      const metadata = await this.findMetadata(hexKey)
+      if (!metadata) return null
+
+      const metadataContent = this.extractProfileMetadataContent(metadata)
+
+      if (metadataContent?.nip05) {
+        const nip05Profile = await queryNip05(metadataContent.nip05)
+
+        if (nip05Profile && nip05Profile.pubkey === hexKey) {
+          userRelays.push(...nip05Profile.relays)
+        }
+      }
+    }
+
+    if (userRelays.length === 0) return null
+
+    // filter for finding user's first kind 0 event
+    const eventFilter: Filter = {
+      kinds: [kinds.Metadata],
+      authors: [hexKey]
+    }
+
+    const pool = new SimplePool()
+
+    // find user's kind 0 events published on user's relays
+    const events = await pool.querySync(userRelays, eventFilter)
+    if (events && events.length) {
+      // sort events by created_at time in ascending order
+      events.sort((a, b) => a.created_at - b.created_at)
+
+      // get first ever event published on user's relays
+      const event = events[0]
+      const { created_at } = event
+
+      // initialize job request
+      const jobEventTemplate: EventTemplate = {
+        content: '',
+        created_at: Math.round(Date.now() / 1000),
+        kind: 68001,
+        tags: [
+          ['i', `${created_at * 1000}`],
+          ['j', 'blockChain-block-number']
+        ]
+      }
+
+      // sign job request event
+      const jobSignedEvent =
+        await this.nostrController.signEvent(jobEventTemplate)
+
+      const relays = [
+        'wss://relay.damus.io',
+        'wss://relay.primal.net',
+        'wss://relayable.org'
+      ]
+
+      // publish job request
+      await this.nostrController.publishEvent(jobSignedEvent, relays)
+
+      console.log('jobSignedEvent :>> ', jobSignedEvent)
+
+      const subscribeWithTimeout = (
+        subscription: NDKSubscription,
+        timeoutMs: number
+      ): Promise<string> => {
+        return new Promise((resolve, reject) => {
+          const eventHandler = (event: NDKEvent) => {
+            subscription.stop()
+            resolve(event.content)
+          }
+
+          subscription.on('event', eventHandler)
+
+          // Set up a timeout to stop the subscription after a specified time
+          const timeout = setTimeout(() => {
+            subscription.stop() // Stop the subscription
+            reject(new Error('Subscription timed out')) // Reject the promise with a timeout error
+          }, timeoutMs)
+
+          // Handle subscription close event
+          subscription.on('close', () => clearTimeout(timeout))
+        })
+      }
+
+      const dvmNDK = new NDK({
+        explicitRelayUrls: relays
+      })
+
+      await dvmNDK.connect(2000)
+
+      // filter for getting DVM job's result
+      const sub = dvmNDK.subscribe({
+        kinds: [68002 as number],
+        '#e': [jobSignedEvent.id],
+        '#p': [jobSignedEvent.pubkey]
+      })
+
+      // asynchronously get block number from dvm job with 20 seconds timeout
+      const dvmJobResult = await subscribeWithTimeout(sub, 20000)
+
+      const encodedEventPointer = nip19.neventEncode({
+        id: event.id,
+        relays: userRelays,
+        author: event.pubkey,
+        kind: event.kind
+      })
+
+      return {
+        block: parseInt(dvmJobResult),
+        encodedEventPointer
+      }
+    }
+
+    return null
+  }
+
   public validate = (event: Event) => validateEvent(event) && verifyEvent(event)
 
-  public getEmptyMetadataEvent = (pubkey?: string): Event => {
+  public getEmptyMetadataEvent = (): Event => {
     return {
       content: '',
       created_at: new Date().valueOf(),
       id: '',
       kind: 0,
-      pubkey: pubkey || '',
+      pubkey: '',
       sig: '',
       tags: []
     }

src/controllers/RelayController.ts

@@ -1,306 +0,0 @@
-import { Event, Filter, Relay } from 'nostr-tools'
-import {
-  settleAllFullfilfedPromises,
-  normalizeWebSocketURL,
-  timeout
-} from '../utils'
-import { SIGIT_RELAY } from '../utils/const'
-
-/**
- * Singleton class to manage relay operations.
- */
-export class RelayController {
-  private static instance: RelayController
-  private pendingConnections = new Map<string, Promise<Relay | null>>() // Track pending connections
-  public connectedRelays = new Map<string, Relay>()
-
-  private constructor() {}
-
-  /**
-   * Provides the singleton instance of RelayController.
-   *
-   * @returns The singleton instance of RelayController.
-   */
-  public static getInstance(): RelayController {
-    if (!RelayController.instance) {
-      RelayController.instance = new RelayController()
-    }
-    return RelayController.instance
-  }
-
-  /**
-   * Connects to a relay server if not already connected.
-   *
-   * This method checks if a relay with the given URL is already in the list of connected relays.
-   * If it is not connected, it attempts to establish a new connection.
-   * On successful connection, the relay is added to the list of connected relays and returned.
-   * If the connection fails, an error is logged and `null` is returned.
-   *
-   * @param  relayUrl - The URL of the relay server to connect to.
-   * @returns  A promise that resolves to the connected relay object if successful, or `null` if the connection fails.
-   */
-  public connectRelay = async (relayUrl: string): Promise<Relay | null> => {
-    const normalizedWebSocketURL = normalizeWebSocketURL(relayUrl)
-    const relay = this.connectedRelays.get(normalizedWebSocketURL)
-
-    if (relay) {
-      if (relay.connected) return relay
-
-      // If relay is found in connectedRelay map but not connected,
-      // remove it from map and call connectRelay method again
-      this.connectedRelays.delete(relayUrl)
-      return this.connectRelay(relayUrl)
-    }
-
-    // Check if there's already a pending connection for this relay URL
-    if (this.pendingConnections.has(relayUrl)) {
-      // Return the existing promise to avoid making another connection
-      return this.pendingConnections.get(relayUrl)!
-    }
-
-    // Create a new connection promise and store it in pendingConnections
-    const connectionPromise = Relay.connect(relayUrl)
-      .then((relay) => {
-        if (relay.connected) {
-          // Add the newly connected relay to the connected relays map
-          this.connectedRelays.set(relayUrl, relay)
-
-          // Return the newly connected relay
-          return relay
-        }
-
-        return null
-      })
-      .catch((err) => {
-        // Log an error message if the connection fails
-        console.error(`Relay connection failed: ${relayUrl}`, err)
-
-        // Return null to indicate connection failure
-        return null
-      })
-      .finally(() => {
-        // Remove the connection from pendingConnections once it settles
-        this.pendingConnections.delete(relayUrl)
-      })
-
-    this.pendingConnections.set(relayUrl, connectionPromise)
-    return connectionPromise
-  }
-
-  /**
-   * Asynchronously retrieves multiple event from a set of relays based on a provided filter.
-   * If no relays are specified, it defaults to using connected relays.
-   *
-   * @param filter - The filter criteria to find the event.
-   * @param relays - An optional array of relay URLs to search for the event.
-   * @returns  Returns a promise that resolves with an array of events.
-   */
-  fetchEvents = async (
-    filter: Filter,
-    relayUrls: string[] = []
-  ): Promise<Event[]> => {
-    if (!relayUrls.includes(SIGIT_RELAY)) {
-      /**
-       * NOTE: To avoid side-effects on external relayUrls array passed as argument
-       * re-assigned relayUrls with added sigit relay instead of just appending to same array
-       */
-
-      relayUrls = [...relayUrls, SIGIT_RELAY] // Add app relay to relays array if not exists already
-    }
-
-    // connect to all specified relays
-    const relays = await settleAllFullfilfedPromises(
-      relayUrls,
-      this.connectRelay
-    )
-
-    // Check if any relays are connected
-    if (relays.length === 0) {
-      throw new Error('No relay is connected to fetch events!')
-    }
-
-    const events: Event[] = []
-    const eventIds = new Set<string>() // To keep track of event IDs and avoid duplicates
-
-    // Create a promise for each relay subscription
-    const subPromises = relays.map((relay) => {
-      return new Promise<void>((resolve) => {
-        if (!relay.connected) {
-          console.log(`${relay.url} : Not connected!`, 'Skipping subscription')
-          return resolve()
-        }
-
-        // Subscribe to the relay with the specified filter
-        const sub = relay.subscribe([filter], {
-          // Handle incoming events
-          onevent: (e) => {
-            // Add the event to the array if it's not a duplicate
-            if (!eventIds.has(e.id)) {
-              eventIds.add(e.id) // Record the event ID
-              events.push(e) // Add the event to the array
-            }
-          },
-          // Handle the End-Of-Stream (EOSE) message
-          oneose: () => {
-            sub.close() // Close the subscription
-            resolve() // Resolve the promise when EOSE is received
-          }
-        })
-
-        // add a 30 sec of timeout to subscription
-        setTimeout(() => {
-          if (!sub.closed) {
-            sub.close()
-            resolve()
-          }
-        }, 30 * 1000)
-      })
-    })
-
-    // Wait for all subscriptions to complete
-    await Promise.allSettled(subPromises)
-
-    // It is possible that different relays will send different events and events array may contain more events then specified limit in filter
-    // To fix this issue we'll first sort these events and then return only limited events
-    if (filter.limit) {
-      // Sort events by creation date in descending order
-      events.sort((a, b) => b.created_at - a.created_at)
-
-      return events.slice(0, filter.limit)
-    }
-
-    return events
-  }
-
-  /**
-   * Asynchronously retrieves an event from a set of relays based on a provided filter.
-   * If no relays are specified, it defaults to using connected relays.
-   *
-   * @param filter - The filter criteria to find the event.
-   * @param relays - An optional array of relay URLs to search for the event.
-   * @returns Returns a promise that resolves to the found event or null if not found.
-   */
-  fetchEvent = async (
-    filter: Filter,
-    relays: string[] = []
-  ): Promise<Event | null> => {
-    const events = await this.fetchEvents(filter, relays)
-
-    // Sort events by creation date in descending order
-    events.sort((a, b) => b.created_at - a.created_at)
-
-    // Return the most recent event, or null if no events were received
-    return events[0] || null
-  }
-
-  /**
-   * Subscribes to events from multiple relays.
-   *
-   * This method connects to the specified relay URLs and subscribes to events
-   * using the provided filter. It handles incoming events through the given
-   * `eventHandler` callback and manages the subscription lifecycle.
-   *
-   * @param filter - The filter criteria to apply when subscribing to events.
-   * @param relayUrls - An optional array of relay URLs to connect to. The default relay URL (`SIGIT_RELAY`) is added automatically.
-   * @param eventHandler - A callback function to handle incoming events. It receives an `Event` object.
-   *
-   */
-  subscribeForEvents = async (
-    filter: Filter,
-    relayUrls: string[] = [],
-    eventHandler: (event: Event) => void
-  ) => {
-    if (!relayUrls.includes(SIGIT_RELAY)) {
-      /**
-       * NOTE: To avoid side-effects on external relayUrls array passed as argument
-       * re-assigned relayUrls with added sigit relay instead of just appending to same array
-       */
-      relayUrls = [...relayUrls, SIGIT_RELAY] // Add app relay to relays array if not exists already
-    }
-
-    // connect to all specified relays
-    const relays = await settleAllFullfilfedPromises(
-      relayUrls,
-      this.connectRelay
-    )
-
-    // Check if any relays are connected
-    if (relays.length === 0) {
-      throw new Error('No relay is connected to fetch events!')
-    }
-
-    const processedEvents: string[] = [] // To keep track of processed events
-
-    // Create a promise for each relay subscription
-    const subPromises = relays.map((relay) => {
-      return new Promise<void>((resolve) => {
-        // Subscribe to the relay with the specified filter
-        const sub = relay.subscribe([filter], {
-          // Handle incoming events
-          onevent: (e) => {
-            // Process event only if it hasn't been processed before
-            if (!processedEvents.includes(e.id)) {
-              processedEvents.push(e.id)
-              eventHandler(e) // Call the event handler with the event
-            }
-          },
-          // Handle the End-Of-Stream (EOSE) message
-          oneose: () => {
-            sub.close() // Close the subscription
-            resolve() // Resolve the promise when EOSE is received
-          }
-        })
-      })
-    })
-
-    // Wait for all subscriptions to complete
-    await Promise.allSettled(subPromises)
-  }
-
-  publish = async (
-    event: Event,
-    relayUrls: string[] = []
-  ): Promise<string[]> => {
-    if (!relayUrls.includes(SIGIT_RELAY)) {
-      /**
-       * NOTE: To avoid side-effects on external relayUrls array passed as argument
-       * re-assigned relayUrls with added sigit relay instead of just appending to same array
-       */
-      relayUrls = [...relayUrls, SIGIT_RELAY] // Add app relay to relays array if not exists already
-    }
-
-    // connect to all specified relays
-    const relays = await settleAllFullfilfedPromises(
-      relayUrls,
-      this.connectRelay
-    )
-
-    // Check if any relays are connected
-    if (relays.length === 0) {
-      throw new Error('No relay is connected to publish event!')
-    }
-
-    const publishedOnRelays: string[] = [] // List to track which relays successfully published the event
-
-    // Create a promise for publishing the event to each connected relay
-    const publishPromises = relays.map(async (relay) => {
-      try {
-        await Promise.race([
-          relay.publish(event), // Publish the event to the relay
-          timeout(20 * 1000) // Set a timeout to handle cases where publishing takes too long
-        ])
-        publishedOnRelays.push(relay.url) // Add the relay URL to the list of successfully published relays
-      } catch (err) {
-        console.error(`Failed to publish event on relay: ${relay.url}`, err)
-      }
-    })
-
-    // Wait for all publish operations to complete (either fulfilled or rejected)
-    await Promise.allSettled(publishPromises)
-
-    // Return the list of relay URLs where the event was published
-    return publishedOnRelays
-  }
-}
-
-export const relayController = RelayController.getInstance()

src/controllers/index.ts

@@ -1,4 +1,3 @@
 export * from './AuthController'
 export * from './MetadataController'
 export * from './NostrController'
-export * from './RelayController'

src/data/metaSamples.json

@@ -1,76 +0,0 @@
-{
-  "creatorMetaExample": {
-    "fileHashes": {
-      "firstPdfFile.pdf": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05",
-      "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05/1.png": "hash123png1",
-      "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05/2.png": "hash321png2"
-    },
-    "markConfig": {
-      "npub1x77qywdllzetv9ncnhlfpv62kshlgtt0uqlsq3v22uzzkk2xvvrsn6uyfy": {
-        "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05/1.png": [
-          {
-            "id": 1,
-            "type": "FULLNAME",
-            "markLocation": {
-              "top": 56,
-              "left": 306,
-              "height": 200,
-              "width": 100,
-              "page": 1
-            },
-            "npub": "npub1x77qywdllzetv9ncnhlfpv62kshlgtt0uqlsq3v22uzzkk2xvvrsn6uyfy",
-            "pdfFileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05"
-          }
-        ],
-        "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05/2.png": [
-          {
-            "id": 2,
-            "markType": "FULLNAME",
-            "location": {
-              "top": 76,
-              "left": 283,
-              "height": 150,
-              "width": 123,
-              "page": 2
-            },
-            "npub": "npub1x77qywdllzetv9ncnhlfpv62kshlgtt0uqlsq3v22uzzkk2xvvrsn6uyfy",
-            "pdfFileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05"
-          }
-        ]
-      }
-    }
-  },
-  "docSignatureExample": {
-    "prevSig": "10de030dd2bfafbbd34969645bd0b3f5e8ab71b3b32091fb29bbea5e272f8a3b7284ef667b6a02e9becc1036450d9fbe5c1c6d146fa91d70e0d8f3cd54d64f17",
-    "marks": [
-        {
-          "id": 1,
-          "type": "FULLNAME",
-          "markLocation": {
-            "top": 56,
-            "left": 306,
-            "height": 200,
-            "width": 100,
-            "page": 1
-          },
-          "npub": "npub1x77qywdllzetv9ncnhlfpv62kshlgtt0uqlsq3v22uzzkk2xvvrsn6uyfy",
-          "pdfFileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05",
-          "value": "Pera Peric"
-        },
-        {
-          "id": 2,
-          "markType": "FULLNAME",
-          "location": {
-            "top": 76,
-            "left": 283,
-            "height": 150,
-            "width": 123,
-            "page": 2
-          },
-          "npub": "npub1x77qywdllzetv9ncnhlfpv62kshlgtt0uqlsq3v22uzzkk2xvvrsn6uyfy",
-          "pdfFileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05",
-          "value": "Pera Peric"
-        }
-      ]
-    }
-  }

src/hooks/index.ts

@@ -1,2 +1 @@
 export * from './store'
-export * from './useDidMount'

src/hooks/useDidMount.ts

@@ -1,12 +0,0 @@
-import { useRef, useEffect } from 'react'
-
-export const useDidMount = (callback: () => void) => {
-  const didMount = useRef<boolean>(false)
-
-  useEffect(() => {
-    if (callback && !didMount.current) {
-      didMount.current = true
-      callback()
-    }
-  })
-}

src/hooks/useLogout.tsx

@@ -1,26 +0,0 @@
-import { logout as nostrLogout } from 'nostr-login'
-import { clear } from '../utils/localStorage'
-import { userLogOutAction } from '../store/actions'
-import { LoginMethod } from '../store/auth/types'
-import { useAppDispatch, useAppSelector } from './store'
-import { useCallback } from 'react'
-
-export const useLogout = () => {
-  const loginMethod = useAppSelector((state) => state.auth?.loginMethod)
-  const dispatch = useAppDispatch()
-
-  const logout = useCallback(() => {
-    // Log out of the nostr-login
-    if (loginMethod === LoginMethod.nostrLogin) {
-      nostrLogout()
-    }
-
-    // Reset redux state with the logout
-    dispatch(userLogOutAction())
-
-    // Clear the local storage states
-    clear()
-  }, [dispatch, loginMethod])
-
-  return logout
-}

src/hooks/useProfileMetadata.tsx

@@ -1,46 +0,0 @@
-import { useEffect, useState } from 'react'
-import { ProfileMetadata } from '../types/profile'
-import { MetadataController } from '../controllers/MetadataController'
-import { Event, kinds } from 'nostr-tools'
-
-export const useProfileMetadata = (pubkey: string) => {
-  const [profileMetadata, setProfileMetadata] = useState<ProfileMetadata>()
-
-  useEffect(() => {
-    const metadataController = MetadataController.getInstance()
-    const handleMetadataEvent = (event: Event) => {
-      const metadataContent =
-        metadataController.extractProfileMetadataContent(event)
-
-      if (metadataContent) {
-        setProfileMetadata(metadataContent)
-      }
-    }
-
-    if (pubkey) {
-      metadataController.on(pubkey, (kind: number, event: Event) => {
-        if (kind === kinds.Metadata) {
-          handleMetadataEvent(event)
-        }
-      })
-
-      metadataController
-        .findMetadata(pubkey)
-        .then((metadataEvent) => {
-          if (metadataEvent) handleMetadataEvent(metadataEvent)
-        })
-        .catch((err) => {
-          console.error(
-            `error occurred in finding metadata for: ${pubkey}`,
-            err
-          )
-        })
-    }
-
-    return () => {
-      metadataController.off(pubkey, handleMetadataEvent)
-    }
-  }, [pubkey])
-
-  return profileMetadata
-}

src/hooks/useScale.tsx

@@ -1,46 +0,0 @@
-import { useEffect, useState } from 'react'
-import { singletonHook } from 'react-singleton-hook'
-import { getInnerContentWidth } from '../utils/pdf'
-
-const noScaleInit = {
-  to: (_: number, v: number) => v,
-  from: (_: number, v: number) => v
-}
-
-const useScaleImpl = () => {
-  const [width, setWidth] = useState(getInnerContentWidth())
-
-  // Get the scale based on the original width
-  const scale = (originalWidth: number) => {
-    return width / originalWidth
-  }
-
-  // Get the original pixel value
-  const to = (originalWidth: number, value: number) => {
-    return value / scale(originalWidth)
-  }
-
-  // Get the scaled pixel value
-  const from = (originalWidth: number, value: number) => {
-    return value * scale(originalWidth)
-  }
-
-  const resize = () => {
-    setWidth(getInnerContentWidth())
-  }
-
-  useEffect(() => {
-    resize()
-
-    window.addEventListener('resize', resize)
-    return () => {
-      window.removeEventListener('resize', resize)
-    }
-  }, [])
-
-  return { to, from }
-}
-
-export const useScale = singletonHook(noScaleInit, useScaleImpl, {
-  unmountIfNoConsumers: true
-})

src/hooks/useSigitMeta.tsx

@@ -1,302 +0,0 @@
-import { useEffect, useState } from 'react'
-import {
-  CreateSignatureEventContent,
-  DocSignatureEvent,
-  Meta,
-  SignedEventContent,
-  OpenTimestamp
-} from '../types'
-import { Mark } from '../types/mark'
-import {
-  fromUnixTimestamp,
-  hexToNpub,
-  parseNostrEvent,
-  parseCreateSignatureEventContent,
-  SigitStatus,
-  SignStatus
-} from '../utils'
-import { toast } from 'react-toastify'
-import { verifyEvent } from 'nostr-tools'
-import { Event } from 'nostr-tools'
-import store from '../store/store'
-import { NostrController } from '../controllers'
-import { MetaParseError } from '../types/errors/MetaParseError'
-
-/**
- * Flattened interface that combines properties `Meta`, `CreateSignatureEventContent`,
- * and `Event` (event's fields are made optional and pubkey and created_at replaced with our versions)
- */
-export interface FlatMeta
-  extends Meta,
-    CreateSignatureEventContent,
-    Partial<Omit<Event, 'pubkey' | 'created_at'>> {
-  // Remove pubkey and use submittedBy as `npub1${string}`
-  submittedBy?: `npub1${string}`
-
-  // Optional field only present on exported sigits
-  // Exporting adds user's pubkey
-  exportedBy?: `npub1${string}`
-
-  // Remove created_at and replace with createdAt
-  createdAt?: number
-
-  // Validated create signature event
-  isValid: boolean
-
-  // Decryption
-  encryptionKey: string | null
-
-  // Parsed Document Signatures
-  parsedSignatureEvents: {
-    [signer: `npub1${string}`]: DocSignatureEvent
-  }
-
-  // Calculated completion time
-  completedAt?: number
-
-  // Calculated status fields
-  signedStatus: SigitStatus
-  signersStatus: {
-    [signer: `npub1${string}`]: SignStatus
-  }
-
-  timestamps?: OpenTimestamp[]
-}
-
-/**
- * Custom use hook for parsing the Sigit Meta
- * @param meta Sigit Meta
- * @returns flattened Meta object with calculated signed status
- */
-export const useSigitMeta = (meta: Meta): FlatMeta => {
-  const [isValid, setIsValid] = useState(false)
-  const [kind, setKind] = useState<number>()
-  const [tags, setTags] = useState<string[][]>()
-  const [createdAt, setCreatedAt] = useState<number>()
-  const [submittedBy, setSubmittedBy] = useState<`npub1${string}`>() // submittedBy, pubkey from nostr event
-  const [exportedBy, setExportedBy] = useState<`npub1${string}`>() // pubkey from export signature nostr event
-  const [id, setId] = useState<string>()
-  const [sig, setSig] = useState<string>()
-
-  const [signers, setSigners] = useState<`npub1${string}`[]>([])
-  const [viewers, setViewers] = useState<`npub1${string}`[]>([])
-  const [fileHashes, setFileHashes] = useState<{
-    [user: `npub1${string}`]: string
-  }>({})
-  const [markConfig, setMarkConfig] = useState<Mark[]>([])
-  const [title, setTitle] = useState<string>('')
-  const [zipUrl, setZipUrl] = useState<string>('')
-
-  const [parsedSignatureEvents, setParsedSignatureEvents] = useState<{
-    [signer: `npub1${string}`]: DocSignatureEvent
-  }>({})
-
-  const [completedAt, setCompletedAt] = useState<number>()
-
-  const [signedStatus, setSignedStatus] = useState<SigitStatus>(
-    SigitStatus.Partial
-  )
-  const [signersStatus, setSignersStatus] = useState<{
-    [signer: `npub1${string}`]: SignStatus
-  }>({})
-
-  const [encryptionKey, setEncryptionKey] = useState<string | null>(null)
-
-  useEffect(() => {
-    if (!meta) return
-    ;(async function () {
-      try {
-        if (meta.exportSignature) {
-          const exportSignatureEvent = await parseNostrEvent(
-            meta.exportSignature
-          )
-          if (
-            verifyEvent(exportSignatureEvent) &&
-            exportSignatureEvent.pubkey
-          ) {
-            setExportedBy(exportSignatureEvent.pubkey as `npub1${string}`)
-          }
-        }
-
-        const createSignatureEvent = await parseNostrEvent(meta.createSignature)
-
-        const { kind, tags, created_at, pubkey, id, sig, content } =
-          createSignatureEvent
-
-        setIsValid(verifyEvent(createSignatureEvent))
-        setKind(kind)
-        setTags(tags)
-        // created_at in nostr events are stored in seconds
-        setCreatedAt(fromUnixTimestamp(created_at))
-        setSubmittedBy(pubkey as `npub1${string}`)
-        setId(id)
-        setSig(sig)
-
-        const { title, signers, viewers, fileHashes, markConfig, zipUrl } =
-          await parseCreateSignatureEventContent(content)
-
-        setTitle(title)
-        setSigners(signers)
-        setViewers(viewers)
-        setFileHashes(fileHashes)
-        setMarkConfig(markConfig)
-        setZipUrl(zipUrl)
-
-        if (meta.keys) {
-          const { sender, keys } = meta.keys
-          // Retrieve the user's public key from the state
-          const usersPubkey = store.getState().auth.usersPubkey!
-          const usersNpub = hexToNpub(usersPubkey)
-
-          // Check if the user's public key is in the keys object
-          if (usersNpub in keys) {
-            // Instantiate the NostrController to decrypt the encryption key
-            const nostrController = NostrController.getInstance()
-            const decrypted = await nostrController
-              .nip04Decrypt(sender, keys[usersNpub])
-              .catch((err) => {
-                console.log(
-                  'An error occurred in decrypting encryption key',
-                  err
-                )
-                return null
-              })
-
-            setEncryptionKey(decrypted)
-          }
-        }
-        // Temp. map to hold events and signers
-        const parsedSignatureEventsMap = new Map<
-          `npub1${string}`,
-          DocSignatureEvent
-        >()
-        const signerStatusMap = new Map<`npub1${string}`, SignStatus>()
-
-        const getPrevSignerSig = (npub: `npub1${string}`) => {
-          if (signers[0] === npub) {
-            return sig
-          }
-
-          // find the index of signer
-          const currentSignerIndex = signers.findIndex(
-            (signer) => signer === npub
-          )
-          // return if could not found user in signer's list
-          if (currentSignerIndex === -1) return
-          // find prev signer
-          const prevSigner = signers[currentSignerIndex - 1]
-
-          // get the signature of prev signer
-          return parsedSignatureEventsMap.get(prevSigner)?.sig
-        }
-
-        for (const npub in meta.docSignatures) {
-          try {
-            // Parse each signature event
-            const event = await parseNostrEvent(
-              meta.docSignatures[npub as `npub1${string}`]
-            )
-
-            // Save events to a map, to save all at once outside loop
-            // We need the object to find completedAt
-            // Avoided using parsedSignatureEvents due to useEffect deps
-            parsedSignatureEventsMap.set(npub as `npub1${string}`, event)
-          } catch (error) {
-            signerStatusMap.set(npub as `npub1${string}`, SignStatus.Invalid)
-          }
-        }
-
-        parsedSignatureEventsMap.forEach((event, npub) => {
-          const isValidSignature = verifyEvent(event)
-          if (isValidSignature) {
-            // get the signature of prev signer from the content of current signers signedEvent
-            const prevSignersSig = getPrevSignerSig(npub)
-            try {
-              const obj: SignedEventContent = JSON.parse(event.content)
-              parsedSignatureEventsMap.set(npub, {
-                ...event,
-                parsedContent: obj
-              })
-              if (
-                obj.prevSig &&
-                prevSignersSig &&
-                obj.prevSig === prevSignersSig
-              ) {
-                signerStatusMap.set(npub as `npub1${string}`, SignStatus.Signed)
-              }
-            } catch (error) {
-              signerStatusMap.set(npub as `npub1${string}`, SignStatus.Invalid)
-            }
-          }
-        })
-
-        signers
-          .filter((s) => !parsedSignatureEventsMap.has(s))
-          .forEach((s) => signerStatusMap.set(s, SignStatus.Pending))
-
-        // Get the first signer that hasn't signed
-        const nextSigner = signers.find((s) => !parsedSignatureEventsMap.has(s))
-        if (nextSigner) {
-          signerStatusMap.set(nextSigner, SignStatus.Awaiting)
-        }
-
-        setSignersStatus(Object.fromEntries(signerStatusMap))
-        setParsedSignatureEvents(Object.fromEntries(parsedSignatureEventsMap))
-
-        const signedBy = Object.keys(meta.docSignatures) as `npub1${string}`[]
-        const isCompletelySigned = signers.every((signer) =>
-          signedBy.includes(signer)
-        )
-        setSignedStatus(
-          isCompletelySigned ? SigitStatus.Complete : SigitStatus.Partial
-        )
-
-        // Check if all signers signed
-        if (isCompletelySigned) {
-          setCompletedAt(
-            fromUnixTimestamp(
-              signedBy.reduce((p, c) => {
-                return Math.max(
-                  p,
-                  parsedSignatureEventsMap.get(c)?.created_at || 0
-                )
-              }, 0)
-            )
-          )
-        }
-      } catch (error) {
-        if (error instanceof MetaParseError) {
-          toast.error(error.message)
-        }
-        console.error(error)
-      }
-    })()
-  }, [meta])
-
-  return {
-    modifiedAt: meta?.modifiedAt,
-    createSignature: meta?.createSignature,
-    docSignatures: meta?.docSignatures,
-    keys: meta?.keys,
-    timestamps: meta?.timestamps,
-    isValid,
-    kind,
-    tags,
-    createdAt,
-    submittedBy,
-    exportedBy,
-    id,
-    sig,
-    signers,
-    viewers,
-    fileHashes,
-    markConfig,
-    title,
-    zipUrl,
-    parsedSignatureEvents,
-    completedAt,
-    signedStatus,
-    signersStatus,
-    encryptionKey
-  }
-}

src/index.css

@@ -27,7 +27,7 @@ body {
   position: fixed;
   top: 80px;
   right: 20px;
-  z-index: 40;
+  z-index: 100;
 }
 
 #root {
@@ -101,15 +101,6 @@ button:disabled {
   color: inherit !important;
 }
 
-.line-clamp-2 {
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  -webkit-line-clamp: 2;
-  line-clamp: 2;
-}
-
 .profile-image {
   width: 40px;
   height: 40px;
@@ -120,9 +111,7 @@ button:disabled {
 /* Fonts */
 @font-face {
   font-family: 'Roboto';
-  src:
-    local('Roboto Medium'),
-    local('Roboto-Medium'),
+  src: local('Roboto Medium'), local('Roboto-Medium'),
     url('assets/fonts/roboto-medium.woff2') format('woff2'),
     url('assets/fonts/roboto-medium.woff') format('woff');
   font-weight: 500;
@@ -132,9 +121,7 @@ button:disabled {
 
 @font-face {
   font-family: 'Roboto';
-  src:
-    local('Roboto Light'),
-    local('Roboto-Light'),
+  src: local('Roboto Light'), local('Roboto-Light'),
     url('assets/fonts/roboto-light.woff2') format('woff2'),
     url('assets/fonts/roboto-light.woff') format('woff');
   font-weight: 300;
@@ -144,9 +131,7 @@ button:disabled {
 
 @font-face {
   font-family: 'Roboto';
-  src:
-    local('Roboto Bold'),
-    local('Roboto-Bold'),
+  src: local('Roboto Bold'), local('Roboto-Bold'),
     url('assets/fonts/roboto-bold.woff2') format('woff2'),
     url('assets/fonts/roboto-bold.woff') format('woff');
   font-weight: bold;
@@ -156,12 +141,10 @@ button:disabled {
 
 @font-face {
   font-family: 'Roboto';
-  src:
-    local('Roboto'),
-    local('Roboto-Regular'),
+  src: local('Roboto'), local('Roboto-Regular'),
     url('assets/fonts/roboto-regular.woff2') format('woff2'),
     url('assets/fonts/roboto-regular.woff') format('woff');
   font-weight: normal;
   font-style: normal;
   font-display: swap;
-}
+}

src/layouts/Main.tsx

@@ -1,160 +1,86 @@
-import { Event, getPublicKey, kinds, nip19 } from 'nostr-tools'
-import { useCallback, useEffect, useRef, useState } from 'react'
-import { Outlet, useNavigate, useSearchParams } from 'react-router-dom'
+import { Event, kinds } from 'nostr-tools'
+import { useEffect, useState } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
+import { Outlet } from 'react-router-dom'
 import { AppBar } from '../components/AppBar/AppBar'
 import { LoadingSpinner } from '../components/LoadingSpinner'
-import {
-  AuthController,
-  MetadataController,
-  NostrController
-} from '../controllers'
+import { MetadataController, NostrController } from '../controllers'
 import {
   restoreState,
+  setAuthState,
   setMetadataEvent,
-  updateKeyPair,
-  updateLoginMethod,
-  updateNostrLoginAuthMethod,
   updateUserAppData
 } from '../store/actions'
+import { LoginMethods } from '../store/auth/types'
+import { State } from '../store/rootReducer'
+import { Dispatch } from '../store/store'
 import { setUserRobotImage } from '../store/userRobotImage/action'
 import {
+  clearAuthToken,
+  clearState,
   getRoboHashPicture,
   getUsersAppData,
   loadState,
+  saveNsecBunkerDelegatedKey,
   subscribeForSigits
 } from '../utils'
-import { useAppDispatch, useAppSelector } from '../hooks'
+import { useAppSelector } from '../hooks'
+import { SubCloser } from 'nostr-tools/abstract-pool'
 import styles from './style.module.scss'
-import { useLogout } from '../hooks/useLogout'
-import { LoginMethod } from '../store/auth/types'
-import { NostrLoginAuthOptions } from 'nostr-login/dist/types'
-import { init as initNostrLogin } from 'nostr-login'
+import { Footer } from '../components/Footer/Footer'
 
 export const MainLayout = () => {
-  const [searchParams, setSearchParams] = useSearchParams()
-  const navigate = useNavigate()
-  const dispatch = useAppDispatch()
-  const logout = useLogout()
+  const dispatch: Dispatch = useDispatch()
   const [isLoading, setIsLoading] = useState(true)
   const [loadingSpinnerDesc, setLoadingSpinnerDesc] = useState(`Loading App`)
-  const isLoggedIn = useAppSelector((state) => state.auth?.loggedIn)
-  const authState = useAppSelector((state) => state.auth)
+  const authState = useSelector((state: State) => state.auth)
   const usersAppData = useAppSelector((state) => state.userAppData)
 
-  // Ref to track if `subscribeForSigits` has been called
-  const hasSubscribed = useRef(false)
-
-  const navigateAfterLogin = (path: string) => {
-    const callbackPath = searchParams.get('callbackPath')
-
-    if (callbackPath) {
-      // base64 decoded path
-      const path = atob(callbackPath)
-      navigate(path)
-      return
-    }
-
-    navigate(path)
-  }
-
-  const login = useCallback(async () => {
-    const nostrController = NostrController.getInstance()
-    const authController = new AuthController()
-    const pubkey = await nostrController.capturePublicKey()
-
-    dispatch(updateLoginMethod(LoginMethod.nostrLogin))
-
-    const redirectPath =
-      await authController.authAndGetMetadataAndRelaysMap(pubkey)
-
-    if (redirectPath) {
-      navigateAfterLogin(redirectPath)
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [dispatch])
-
   useEffect(() => {
-    // Developer login with ?nsec= (not recommended)
-    const nsec = searchParams.get('nsec')
-    if (!nsec) return
+    const metadataController = new MetadataController()
 
-    // Clear nsec from the url immediately
-    searchParams.delete('nsec')
-    setSearchParams(searchParams)
+    const logout = () => {
+      dispatch(
+        setAuthState({
+          keyPair: undefined,
+          loggedIn: false,
+          usersPubkey: undefined,
+          loginMethod: undefined,
+          nsecBunkerPubkey: undefined
+        })
+      )
 
-    if (!authState?.loggedIn) {
-      if (!nsec.startsWith('nsec')) {
-        console.error('Invalid format, use private key (nsec)')
-        return
-      }
+      dispatch(setMetadataEvent(metadataController.getEmptyMetadataEvent()))
 
-      try {
-        const privateKey = nip19.decode(nsec).data as Uint8Array
-        if (!privateKey) {
-          console.error('Failed to convert the private key.')
-          return
-        }
+      // clear authToken saved in local storage
+      clearAuthToken()
+      clearState()
 
-        const publickey = getPublicKey(privateKey)
-
-        dispatch(
-          updateKeyPair({
-            private: nsec,
-            public: publickey
-          })
-        )
-        dispatch(updateLoginMethod(LoginMethod.privateKey))
-
-        const authController = new AuthController()
-        authController
-          .authAndGetMetadataAndRelaysMap(publickey)
-          .catch((err) => {
-            console.error('Error occurred in authentication: ' + err)
-            return null
-          })
-      } catch (err) {
-        console.error(`Error decoding the nsec. ${err}`)
-      }
+      // update nsecBunker delegated key
+      const newDelegatedKey =
+        NostrController.getInstance().generateDelegatedKey()
+      saveNsecBunkerDelegatedKey(newDelegatedKey)
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [dispatch, searchParams])
-
-  useEffect(() => {
-    const handleNostrAuth = (_: string, opts: NostrLoginAuthOptions) => {
-      if (opts.type === 'login' || opts.type === 'signup') {
-        dispatch(updateNostrLoginAuthMethod(opts.method))
-        login()
-      } else if (opts.type === 'logout') {
-        // Clear `subscribeForSigits` as called after the logout
-        hasSubscribed.current = false
-      }
-    }
-
-    // Initialize the nostr-login
-    initNostrLogin({
-      methods: ['connect', 'extension', 'local'],
-      noBanner: true,
-      onAuth: handleNostrAuth
-    }).catch((error) => {
-      console.error('Failed to initialize Nostr-Login', error)
-    })
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [dispatch])
-
-  useEffect(() => {
-    const metadataController = MetadataController.getInstance()
 
     const restoredState = loadState()
     if (restoredState) {
       dispatch(restoreState(restoredState))
 
-      const { loggedIn, loginMethod, usersPubkey } = restoredState.auth
+      const { loggedIn, loginMethod, usersPubkey, nsecBunkerRelays } =
+        restoredState.auth
 
       if (loggedIn) {
         if (!loginMethod || !usersPubkey) return logout()
 
-        // Update user profile metadata, old state might be outdated
+        if (loginMethod === LoginMethods.nsecBunker) {
+          if (!nsecBunkerRelays) return logout()
+
+          const nostrController = NostrController.getInstance()
+          nostrController.nsecBunkerInit(nsecBunkerRelays).then(() => {
+            nostrController.createNsecBunkerSigner(usersPubkey)
+          })
+        }
+
         const handleMetadataEvent = (event: Event) => {
           dispatch(setMetadataEvent(event))
         }
@@ -174,26 +100,27 @@ export const MainLayout = () => {
     } else {
       setIsLoading(false)
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [dispatch])
 
-  /**
-   * Subscribe for the sigits
-   */
   useEffect(() => {
-    if (authState && isLoggedIn && usersAppData) {
+    let subCloser: SubCloser | null = null
+
+    if (authState.loggedIn && usersAppData) {
       const pubkey = authState.usersPubkey || authState.keyPair?.public
 
-      if (pubkey && !hasSubscribed.current) {
-        // Call `subscribeForSigits` only if it hasn't been called before
-        // #193 disabled websocket subscribtion, until #194 is done
-        subscribeForSigits(pubkey)
-
-        // Mark `subscribeForSigits` as called
-        hasSubscribed.current = true
+      if (pubkey) {
+        subscribeForSigits(pubkey).then((res) => {
+          subCloser = res || null
+        })
       }
     }
-  }, [authState, isLoggedIn, usersAppData])
+
+    return () => {
+      if (subCloser) {
+        subCloser.close()
+      }
+    }
+  }, [authState, usersAppData])
 
   /**
    * When authState change user logged in / or app reloaded
@@ -201,7 +128,7 @@ export const MainLayout = () => {
    * so that avatar will be consistent across the app when kind 0 is empty
    */
   useEffect(() => {
-    if (authState && isLoggedIn) {
+    if (authState && authState.loggedIn) {
       const pubkey = authState.usersPubkey || authState.keyPair?.public
 
       if (pubkey) {
@@ -209,7 +136,7 @@ export const MainLayout = () => {
       }
 
       setIsLoading(true)
-      setLoadingSpinnerDesc(`Loading SIGit history...`)
+      setLoadingSpinnerDesc(`Loading SIGit History`)
       getUsersAppData()
         .then((appData) => {
           if (appData) {
@@ -218,26 +145,17 @@ export const MainLayout = () => {
         })
         .finally(() => setIsLoading(false))
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [dispatch, isLoggedIn])
+  }, [authState])
 
   if (isLoading) return <LoadingSpinner desc={loadingSpinnerDesc} />
 
-  const isDev = import.meta.env.MODE === 'development'
-
   return (
     <>
       <AppBar />
-      <main
-        className={styles.main}
-        // Add dev debug flag to show special dev css
-        // (visible marks border on verify)
-        {...(isDev && {
-          'data-dev': true
-        })}
-      >
+      <main className={styles.main}>
         <Outlet />
       </main>
+      <Footer />
     </>
   )
 }

src/layouts/StickySideColumns.module.scss

@@ -1,104 +0,0 @@
-@import '../styles/colors.scss';
-@import '../styles/sizes.scss';
-
-.container {
-  display: grid;
-
-  @media only screen and (max-width: 767px) {
-    gap: 20px;
-    grid-auto-flow: column;
-    grid-auto-columns: 100%;
-
-    // Hide Scrollbar and let's use tabs to navigate
-    -ms-overflow-style: none; /* Internet Explorer 10+ */
-    scrollbar-width: none; /* Firefox */
-    &::-webkit-scrollbar {
-      display: none; /* Safari and Chrome */
-    }
-    overflow-x: auto;
-    overscroll-behavior-inline: contain;
-    scroll-snap-type: inline mandatory;
-
-    > * {
-      scroll-margin-top: $header-height + $body-vertical-padding;
-      scroll-snap-align: start;
-      scroll-snap-stop: always; // Touch devices will always stop on each element
-    }
-  }
-
-  @media only screen and (min-width: 768px) {
-    grid-template-columns: 0.75fr 1.5fr 0.75fr;
-    gap: 30px;
-  }
-}
-
-.sidesWrap {
-  position: relative;
-
-  // HACK: Stop grid column from growing
-  min-width: 0;
-}
-
-.sides {
-  @media only screen and (min-width: 768px) {
-    position: sticky;
-    top: $body-vertical-padding;
-  }
-  > :first-child {
-    // We want to keep header on smaller devices at all times
-    max-height: calc(
-      100dvh - $header-height - $body-vertical-padding * 2 - $tabs-height
-    );
-
-    @media only screen and (min-width: 768px) {
-      max-height: calc(100dvh - $body-vertical-padding * 2);
-    }
-  }
-}
-
-// Adjust the content scroll on smaller screens
-// Make sure only the inner tab is scrolling
-.scrollAdjust {
-  @media only screen and (max-width: 767px) {
-    max-height: calc(
-      100svh - $header-height - $body-vertical-padding * 2 - $tabs-height
-    );
-    overflow-y: auto;
-  }
-}
-
-.content {
-  @media only screen and (min-width: 768px) {
-    padding: 10px;
-    border: 10px solid $overlay-background-color;
-    border-radius: 4px;
-  }
-}
-
-.navTabs {
-  display: none;
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  right: 0;
-  height: $tabs-height;
-  z-index: 2;
-  background: $overlay-background-color;
-  box-shadow: 0 0 4px 0 rgb(0, 0, 0, 0.1);
-
-  padding: 5px;
-  gap: 5px;
-
-  @media only screen and (max-width: 767px) {
-    display: flex;
-  }
-
-  > li {
-    flex-grow: 1;
-  }
-}
-
-.active {
-  background-color: $primary-main !important;
-  color: white !important;
-}

src/layouts/StickySideColumns.tsx

@@ -1,147 +0,0 @@
-import {
-  PropsWithChildren,
-  ReactNode,
-  useEffect,
-  useRef,
-  useState
-} from 'react'
-
-import styles from './StickySideColumns.module.scss'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { IconDefinition } from '@fortawesome/free-solid-svg-icons'
-import { Button } from '@mui/material'
-
-interface StickySideColumnsProps {
-  left: ReactNode
-  right: ReactNode
-  leftIcon: IconDefinition
-  centerIcon: IconDefinition
-  rightIcon: IconDefinition
-}
-
-const DEFAULT_TAB = 'nav-content'
-export const StickySideColumns = ({
-  left,
-  right,
-  leftIcon,
-  centerIcon,
-  rightIcon,
-  children
-}: PropsWithChildren<StickySideColumnsProps>) => {
-  const [tab, setTab] = useState(DEFAULT_TAB)
-  const ref = useRef<HTMLDivElement>(null)
-  const tabsRefs = useRef<{ [id: string]: HTMLDivElement | null }>({})
-  const handleNavClick = (id: string) => {
-    if (ref.current && tabsRefs.current) {
-      const x = tabsRefs.current[id]?.offsetLeft
-      ref.current.scrollTo({
-        left: x,
-        behavior: 'smooth'
-      })
-    }
-  }
-  const isActive = (id: string) => id === tab
-
-  useEffect(() => {
-    setTab(DEFAULT_TAB)
-    handleNavClick(DEFAULT_TAB)
-  }, [])
-
-  useEffect(() => {
-    const tabs = tabsRefs.current
-    // Set up the observer
-    const observer = new IntersectionObserver(
-      (entries) => {
-        entries.forEach((entry) => {
-          if (entry.isIntersecting) {
-            setTab(entry.target.id)
-          }
-        })
-      },
-      {
-        root: ref.current,
-        threshold: 0.5,
-        rootMargin: '-20px'
-      }
-    )
-
-    if (tabs) {
-      Object.values(tabs).forEach((tab) => {
-        if (tab) observer.observe(tab)
-      })
-    }
-
-    return () => {
-      if (tabs) {
-        Object.values(tabs).forEach((tab) => {
-          if (tab) observer.unobserve(tab)
-        })
-      }
-    }
-  }, [])
-
-  return (
-    <>
-      <div className={styles.container} ref={ref}>
-        <div
-          id="nav-left"
-          className={styles.sidesWrap}
-          ref={(tab) => (tabsRefs.current['nav-left'] = tab)}
-        >
-          <div className={styles.sides}>{left}</div>
-        </div>
-        <div
-          id="nav-content"
-          className={styles.scrollAdjust}
-          ref={(tab) => (tabsRefs.current['nav-content'] = tab)}
-        >
-          <div id="content-preview" className={styles.content}>
-            {children}
-          </div>
-        </div>
-        <div
-          id="nav-right"
-          className={styles.sidesWrap}
-          ref={(tab) => (tabsRefs.current['nav-right'] = tab)}
-        >
-          <div className={styles.sides}>{right}</div>
-        </div>
-      </div>
-      <ul className={styles.navTabs}>
-        <li>
-          <Button
-            fullWidth
-            variant="text"
-            onClick={() => handleNavClick('nav-left')}
-            className={`${isActive('nav-left') && styles.active}`}
-            aria-label="nav left"
-          >
-            <FontAwesomeIcon icon={leftIcon} />
-          </Button>
-        </li>
-        <li>
-          <Button
-            fullWidth
-            variant="text"
-            onClick={() => handleNavClick('nav-content')}
-            className={`${isActive('nav-content') && styles.active}`}
-            aria-label="nav middle"
-          >
-            <FontAwesomeIcon icon={centerIcon} />
-          </Button>
-        </li>
-        <li>
-          <Button
-            fullWidth
-            variant="text"
-            onClick={() => handleNavClick('nav-right')}
-            className={`${isActive('nav-right') && styles.active}`}
-            aria-label="nav right"
-          >
-            <FontAwesomeIcon icon={rightIcon} />
-          </Button>
-        </li>
-      </ul>
-    </>
-  )
-}

src/layouts/modal/index.tsx

@@ -33,7 +33,7 @@ export const Modal = () => {
     { to: appPublicRoutes.register, title: 'Register', label: 'Register' },
     {
       to: appPublicRoutes.nostr,
-      title: 'Nostr Login',
+      title: 'Login',
       sx: { padding: '10px' },
       label: <img src={nostrImage} width="25" alt="nostr logo" height="25" />
     }

src/layouts/modal/style.module.scss

@@ -5,7 +5,7 @@ $default-modal-padding: 15px 25px;
 .modal {
   position: absolute;
   top: 0;
-  left: calc(50% - 10px);
+  left: 50%;
   transform: translate(-50%, 0);
 
   background-color: $overlay-background-color;
@@ -16,8 +16,6 @@ $default-modal-padding: 15px 25px;
   flex-direction: column;
 
   border-radius: 4px;
-
-  margin: 25px 10px;
 }
 
 .header {

src/layouts/style.module.scss

@@ -3,5 +3,6 @@
 
 .main {
   flex-grow: 1;
-  padding: $body-vertical-padding 0 $body-vertical-padding 0;
+  padding: $header-height + $body-vertical-padding 0 $body-vertical-padding 0;
+  background-color: $body-background-color;
 }

src/pages/create/style.module.scss

@@ -1,242 +1,41 @@
 @import '../../styles/colors.scss';
 
-.flexWrap {
+.container {
   display: flex;
   flex-direction: column;
-  gap: 15px;
+  color: $text-color;
+  margin-top: 10px;
+  gap: 10px;
+  width: 550px;
+  max-width: 550px;
 
-  container-type: inline-size;
+  .inputBlock {
+    display: flex;
+    flex-direction: column;
+    gap: 25px;
+  }
 }
 
-.orderedFilesList {
-  counter-reset: item;
-  list-style-type: none;
-  margin: 0;
+.subHeader {
+  border-bottom: 0.5px solid;
+}
 
-  li {
+.tableHeaderCell {
+  border-right: 1px solid rgba(224, 224, 224, 1);
+}
+
+.tableCell {
+  border-right: 1px solid rgba(224, 224, 224, 1);
+  height: 56px;
+
+  .user {
     display: flex;
     align-items: center;
-
-    transition: ease 0.4s;
-    border-radius: 4px;
-    background: #ffffff;
-    padding: 7px 10px;
-    color: rgba(0, 0, 0, 0.5);
-    min-height: 45px;
-    cursor: pointer;
     gap: 10px;
 
-    &::before {
-      content: counter(item) ' ';
-      counter-increment: item;
-      font-size: 14px;
-    }
-    :nth-child(1) {
-      flex-grow: 1;
-
-      font-size: 16px;
-
-      white-space: nowrap;
-      text-overflow: ellipsis;
-      overflow: hidden;
-    }
-
-    button {
-      min-width: 44px;
-      color: $primary-main;
-    }
-
-    &:hover,
-    &.active,
-    &:focus-within {
-      background: $primary-main;
-      color: white;
-
-      button {
-        color: white;
-      }
+    .name {
+      text-align: center;
+      cursor: pointer;
     }
   }
-}
-
-.uploadFileText {
-  margin-left: 12px;
-}
-
-.paperGroup {
-  border-radius: 4px;
-  background: white;
-  padding: 15px;
-  display: flex;
-  flex-direction: column;
-  gap: 15px;
-  overflow-x: hidden;
-  overflow-y: auto;
-}
-
-.inputWrapper {
-  display: flex;
-  align-items: center;
-  flex-shrink: 0;
-
-  height: 36px;
-  overflow: hidden;
-  border-radius: 4px;
-  outline: solid 1px #dddddd;
-  background: white;
-
-  width: 100%;
-
-  &:focus-within {
-    outline-color: $primary-main;
-  }
-
-  // Override default MUI input styles only inside inputWrapepr
-  :global {
-    .MuiInputBase-input {
-      padding: 7px 14px;
-    }
-    .MuiOutlinedInput-notchedOutline {
-      display: none;
-    }
-  }
-}
-
-.addCounterpart {
-  flex-shrink: 0;
-  display: flex;
-  align-items: center;
-  justify-content: start;
-  gap: 10px;
-
-  > .inputWrapper {
-    flex-shrink: 1;
-  }
-
-  button {
-    min-width: 44px;
-    padding: 11px 12px;
-  }
-}
-
-.users {
-  flex-shrink: 0;
-  max-height: 33vh;
-
-  .counterpartToggleButton {
-    min-width: 44px;
-    padding: 11px 12px;
-  }
-}
-
-.user {
-  display: flex;
-  gap: 10px;
-
-  font-size: 14px;
-  text-align: start;
-  justify-content: center;
-  align-items: center;
-
-  a:hover {
-    text-decoration: none;
-  }
-
-  // Higher specificify to override default button styles
-  .counterpartRowToggleButton {
-    min-width: 34px;
-    height: 34px;
-    padding: 0;
-  }
-}
-
-.counterpartRowToggleButton {
-  &[data-variant='primary'] {
-    color: $primary-main;
-  }
-  &[data-variant='secondary'] {
-    color: rgba(0, 0, 0, 0.35);
-  }
-}
-
-.avatar {
-  flex-grow: 1;
-  min-width: 0;
-
-  &:first-child {
-    margin-left: 24px;
-  }
-
-  img {
-    // Override the default avatar size
-    width: 30px;
-    height: 30px;
-  }
-}
-
-.fileName {
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-  flex-grow: 1;
-}
-
-.toolbox {
-  display: grid;
-  grid-template-columns: 1fr;
-
-  @container (min-width: 204px) {
-    grid-template-columns: repeat(2, 1fr);
-  }
-
-  @container (min-width: 309px) {
-    grid-template-columns: repeat(3, 1fr);
-  }
-
-  gap: 15px;
-
-  overflow-x: hidden;
-  overflow-y: auto;
-
-  container-type: inline-size;
-}
-
-.toolItem {
-  transition: ease 0.2s;
-  display: flex;
-  flex-direction: column;
-  gap: 5px;
-  border-radius: 4px;
-  padding: 10px 5px 5px 5px;
-  background: rgba(0, 0, 0, 0.05);
-  color: rgba(0, 0, 0, 0.5);
-
-  text-align: center;
-  align-items: center;
-  justify-content: center;
-  font-size: 14px;
-  cursor: pointer;
-  -webkit-user-select: none;
-  user-select: none;
-
-  &.selected {
-    background: $primary-main;
-    color: white;
-  }
-
-  &:not(.selected, .comingSoon) {
-    &:hover {
-      background: $primary-light;
-      color: white;
-    }
-  }
-
-  &.comingSoon {
-    opacity: 0.5;
-    cursor: not-allowed;
-  }
-}
-
-.comingSoonPlaceholder {
-  font-size: 10px;
-}
+}

src/pages/home/index.tsx

@@ -1,270 +1,384 @@
-import { Button, TextField } from '@mui/material'
+import { CalendarMonth, Description, Upload } from '@mui/icons-material'
+import { Box, Button, Tooltip, Typography } from '@mui/material'
 import JSZip from 'jszip'
-import { useCallback, useEffect, useState } from 'react'
-import { useNavigate, useSearchParams } from 'react-router-dom'
+import { Event, kinds, verifyEvent } from 'nostr-tools'
+import { Dispatch, SetStateAction, useEffect, useRef, useState } from 'react'
+import { useNavigate } from 'react-router-dom'
 import { toast } from 'react-toastify'
+import { UserAvatar } from '../../components/UserAvatar'
+import { MetadataController } from '../../controllers'
 import { useAppSelector } from '../../hooks'
 import { appPrivateRoutes, appPublicRoutes } from '../../routes'
-import { Meta } from '../../types'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { faSearch } from '@fortawesome/free-solid-svg-icons'
-import { Select } from '../../components/Select'
-import { DisplaySigit } from '../../components/DisplaySigit'
-import { useDropzone } from 'react-dropzone'
-import { Container } from '../../components/Container'
-import styles from './style.module.scss'
+import { CreateSignatureEventContent, Meta, ProfileMetadata } from '../../types'
 import {
-  extractSigitCardDisplayInfo,
-  SigitCardDisplayInfo,
-  SigitStatus
+  formatTimestamp,
+  hexToNpub,
+  npubToHex,
+  parseJson,
+  shorten
 } from '../../utils'
-import { Footer } from '../../components/Footer/Footer'
-
-// Unsupported Filter options are commented
-const FILTERS = [
-  'Show all',
-  // 'Drafts',
-  'In-progress',
-  'Completed'
-  // 'Archived'
-] as const
-type Filter = (typeof FILTERS)[number]
-
-const SORT_BY = [
-  {
-    label: 'Newest',
-    value: 'desc'
-  },
-  { label: 'Oldest', value: 'asc' }
-] as const
-type Sort = (typeof SORT_BY)[number]['value']
+import styles from './style.module.scss'
+import { Container } from '../../components/Container'
 
 export const HomePage = () => {
   const navigate = useNavigate()
-  const [searchParams, setSearchParams] = useSearchParams()
-  const q = searchParams.get('q') ?? ''
-
-  useEffect(() => {
-    const searchInput = document.getElementById('q') as HTMLInputElement | null
-    if (searchInput) {
-      searchInput.value = q
-    }
-  }, [q])
-
-  const [sigits, setSigits] = useState<{ [key: string]: Meta }>({})
-  const [parsedSigits, setParsedSigits] = useState<{
-    [key: string]: SigitCardDisplayInfo
-  }>({})
+  const fileInputRef = useRef<HTMLInputElement>(null)
+  const [sigits, setSigits] = useState<Meta[]>([])
+  const [profiles, setProfiles] = useState<{ [key: string]: ProfileMetadata }>(
+    {}
+  )
   const usersAppData = useAppSelector((state) => state.userAppData)
 
   useEffect(() => {
     if (usersAppData) {
-      const getSigitInfo = async () => {
-        const parsedSigits: { [key: string]: SigitCardDisplayInfo } = {}
-        for (const key in usersAppData.sigits) {
-          if (Object.prototype.hasOwnProperty.call(usersAppData.sigits, key)) {
-            const sigitInfo = await extractSigitCardDisplayInfo(
-              usersAppData.sigits[key]
-            )
-            if (sigitInfo) {
-              parsedSigits[key] = sigitInfo
-            }
-          }
-        }
-
-        setParsedSigits({
-          ...parsedSigits
-        })
-      }
-
-      setSigits(usersAppData.sigits)
-      getSigitInfo()
+      setSigits(Object.values(usersAppData.sigits))
     }
   }, [usersAppData])
 
-  const onDrop = useCallback(
-    async (acceptedFiles: File[]) => {
-      // When uploading single file check if it's .sigit.zip
-      if (acceptedFiles.length === 1) {
-        const file = acceptedFiles[0]
+  const handleUploadClick = () => {
+    if (fileInputRef.current) {
+      fileInputRef.current.click()
+    }
+  }
 
-        // Check if the file extension is .sigit.zip
-        const fileName = file.name
-        const fileExtension = fileName.slice(-10) // ".sigit.zip" has 10 characters
-        if (fileExtension === '.sigit.zip') {
-          const zip = await JSZip.loadAsync(file).catch((err) => {
-            console.log('err in loading zip file :>> ', err)
-            toast.error(err.message || 'An error occurred in loading zip file.')
-            return null
+  const handleFileChange = async (
+    event: React.ChangeEvent<HTMLInputElement>
+  ) => {
+    const file = event.target.files?.[0]
+    if (file) {
+      // Check if the file extension is .sigit.zip
+      const fileName = file.name
+      const fileExtension = fileName.slice(-10) // ".sigit.zip" has 10 characters
+      if (fileExtension === '.sigit.zip') {
+        const zip = await JSZip.loadAsync(file).catch((err) => {
+          console.log('err in loading zip file :>> ', err)
+          toast.error(err.message || 'An error occurred in loading zip file.')
+          return null
+        })
+
+        if (!zip) return
+
+        // navigate to sign page if zip contains keys.json
+        if ('keys.json' in zip.files) {
+          return navigate(appPrivateRoutes.sign, {
+            state: { uploadedZip: file }
           })
-
-          if (!zip) return
-
-          // navigate to sign page if zip contains keys.json
-          if ('keys.json' in zip.files) {
-            return navigate(appPrivateRoutes.sign, {
-              state: { uploadedZip: file }
-            })
-          }
-
-          // navigate to verify page if zip contains meta.json
-          if ('meta.json' in zip.files) {
-            return navigate(appPublicRoutes.verify, {
-              state: { uploadedZip: file }
-            })
-          }
-
-          toast.error('Invalid SiGit zip file')
-          return
         }
+
+        // navigate to verify page if zip contains meta.json
+        if ('meta.json' in zip.files) {
+          return navigate(appPublicRoutes.verify, {
+            state: { uploadedZip: file }
+          })
+        }
+
+        toast.error('Invalid zip file')
+        return
       }
 
       // navigate to create page
-      navigate(appPrivateRoutes.create, {
-        state: { uploadedFiles: acceptedFiles }
-      })
-    },
-    [navigate]
-  )
-
-  const { getRootProps, getInputProps, isDragActive, open } = useDropzone({
-    onDrop,
-    noClick: true
-  })
-
-  const [filter, setFilter] = useState<Filter>('Show all')
-  const [sort, setSort] = useState<Sort>('desc')
+      navigate(appPrivateRoutes.create, { state: { uploadedFile: file } })
+    }
+  }
 
   return (
-    <div {...getRootProps()} tabIndex={-1}>
-      <Container className={styles.container}>
-        <div className={styles.header}>
-          <div className={styles.filters}>
-            <Select
-              name={'filter-select'}
-              value={filter}
-              setValue={setFilter}
-              options={FILTERS.map((f) => {
-                return {
-                  label: f,
-                  value: f
-                }
-              })}
-            />
-            <Select
-              name={'sort-select'}
-              value={sort}
-              setValue={setSort}
-              options={SORT_BY.map((s) => {
-                return { ...s }
-              })}
-            />
-          </div>
-          <div className={styles.actionButtons}>
-            <form
-              className={styles.search}
-              onSubmit={(e) => {
-                e.preventDefault()
-                const searchInput = e.currentTarget.elements.namedItem(
-                  'q'
-                ) as HTMLInputElement
-                searchParams.set('q', searchInput.value)
-                setSearchParams(searchParams)
-              }}
-            >
-              <TextField
-                id="q"
-                name="q"
-                placeholder="Search"
-                size="small"
-                type="search"
-                defaultValue={q}
-                onChange={(e) => {
-                  // Handle the case when users click native search input's clear or x
-                  if (e.currentTarget.value === '') {
-                    searchParams.delete('q')
-                    setSearchParams(searchParams)
-                  }
-                }}
-                sx={{
-                  width: '100%',
-                  fontSize: '16px',
-                  borderTopLeftRadius: 'var(----mui-shape-borderRadius)',
-                  borderBottomLeftRadius: 'var(----mui-shape-borderRadius)',
-                  '& .MuiInputBase-root': {
-                    borderTopRightRadius: 0,
-                    borderBottomRightRadius: 0
-                  },
-                  '& .MuiInputBase-input': {
-                    padding: '7px 14px'
-                  },
-                  '& .MuiOutlinedInput-notchedOutline': {
-                    display: 'none'
-                  }
-                }}
-              />
-              <Button
-                type="submit"
-                sx={{
-                  minWidth: '44px',
-                  padding: '11.5px 12px',
-                  borderTopLeftRadius: 0,
-                  borderBottomLeftRadius: 0
-                }}
-                variant={'contained'}
-                aria-label="submit search"
-              >
-                <FontAwesomeIcon icon={faSearch} />
-              </Button>
-            </form>
-          </div>
-        </div>
-        <button
-          className={`${styles.dropzone} ${isDragActive ? styles.isDragActive : ''}`}
-          tabIndex={0}
-          onClick={open}
-          type="button"
-          aria-label="upload files"
+    <Container className={styles.container}>
+      <Box className={styles.header}>
+        <Typography variant="h3" className={styles.title}>
+          Sigits
+        </Typography>
+        {/* This is for desktop view */}
+        <Box
+          className={styles.actionButtons}
+          sx={{
+            display: {
+              xs: 'none',
+              md: 'flex'
+            }
+          }}
         >
-          <input id="file-upload" {...getInputProps()} />
-          {isDragActive ? (
-            <label htmlFor="file-upload">Drop the files here ...</label>
-          ) : (
-            <label htmlFor="file-upload">Click or drag files to upload!</label>
-          )}
-        </button>
-        <div className={styles.submissions}>
-          {Object.keys(parsedSigits)
-            .filter((s) => {
-              const { title, signedStatus } = parsedSigits[s]
-              const isMatch = title?.toLowerCase().includes(q.toLowerCase())
-              switch (filter) {
-                case 'Completed':
-                  return signedStatus === SigitStatus.Complete && isMatch
-                case 'In-progress':
-                  return signedStatus === SigitStatus.Partial && isMatch
-                case 'Show all':
-                  return isMatch
-                default:
-                  console.error('Filter case not handled.')
-              }
-            })
-            .sort((a, b) => {
-              const x = parsedSigits[a].createdAt ?? 0
-              const y = parsedSigits[b].createdAt ?? 0
-              return sort === 'desc' ? y - x : x - y
-            })
-            .map((key) => (
-              <DisplaySigit
-                key={`sigit-${key}`}
-                sigitCreateId={key}
-                parsedMeta={parsedSigits[key]}
-                meta={sigits[key]}
-              />
-            ))}
-        </div>
-      </Container>
-      <Footer />
-    </div>
+          <input
+            type="file"
+            ref={fileInputRef}
+            style={{ display: 'none' }}
+            onChange={handleFileChange}
+          />
+          <Button
+            variant="outlined"
+            startIcon={<Upload />}
+            onClick={handleUploadClick}
+          >
+            Upload
+          </Button>
+        </Box>
+        {/* This is for mobile view */}
+        <Box
+          className={styles.actionButtons}
+          sx={{
+            display: {
+              xs: 'flex',
+              md: 'none'
+            }
+          }}
+        >
+          <Tooltip title="Upload" arrow>
+            <Button variant="outlined" onClick={handleUploadClick}>
+              <Upload />
+            </Button>
+          </Tooltip>
+        </Box>
+      </Box>
+      <Box className={styles.submissions}>
+        {sigits.map((sigit, index) => (
+          <DisplaySigit
+            key={`sigit-${index}`}
+            meta={sigit}
+            profiles={profiles}
+            setProfiles={setProfiles}
+          />
+        ))}
+      </Box>
+    </Container>
+  )
+}
+
+type SigitProps = {
+  meta: Meta
+  profiles: { [key: string]: ProfileMetadata }
+  setProfiles: Dispatch<SetStateAction<{ [key: string]: ProfileMetadata }>>
+}
+
+enum SignedStatus {
+  Partial = 'Partially Signed',
+  Complete = 'Completely Signed'
+}
+
+const DisplaySigit = ({ meta, profiles, setProfiles }: SigitProps) => {
+  const navigate = useNavigate()
+
+  const [title, setTitle] = useState<string>()
+  const [createdAt, setCreatedAt] = useState('')
+  const [submittedBy, setSubmittedBy] = useState<string>()
+  const [signers, setSigners] = useState<`npub1${string}`[]>([])
+  const [signedStatus, setSignedStatus] = useState<SignedStatus>(
+    SignedStatus.Partial
+  )
+
+  useEffect(() => {
+    const extractInfo = async () => {
+      const createSignatureEvent = await parseJson<Event>(
+        meta.createSignature
+      ).catch((err) => {
+        console.log('err in parsing the createSignature event:>> ', err)
+        toast.error(
+          err.message || 'error occurred in parsing the create signature event'
+        )
+        return null
+      })
+
+      if (!createSignatureEvent) return
+
+      // created_at in nostr events are stored in seconds
+      // convert it to ms before formatting
+      setCreatedAt(formatTimestamp(createSignatureEvent.created_at * 1000))
+
+      const createSignatureContent =
+        await parseJson<CreateSignatureEventContent>(
+          createSignatureEvent.content
+        ).catch((err) => {
+          console.log(
+            `err in parsing the createSignature event's content :>> `,
+            err
+          )
+          return null
+        })
+
+      if (!createSignatureContent) return
+
+      setTitle(createSignatureContent.title)
+      setSubmittedBy(createSignatureEvent.pubkey)
+      setSigners(createSignatureContent.signers)
+
+      const signedBy = Object.keys(meta.docSignatures) as `npub1${string}`[]
+      const isCompletelySigned = createSignatureContent.signers.every(
+        (signer) => signedBy.includes(signer)
+      )
+      if (isCompletelySigned) {
+        setSignedStatus(SignedStatus.Complete)
+      }
+    }
+    extractInfo()
+  }, [meta])
+
+  useEffect(() => {
+    const hexKeys: string[] = []
+
+    if (submittedBy) {
+      hexKeys.push(npubToHex(submittedBy)!)
+    }
+    hexKeys.push(...signers.map((signer) => npubToHex(signer)!))
+
+    const metadataController = new MetadataController()
+    hexKeys.forEach((key) => {
+      if (!(key in profiles)) {
+        const handleMetadataEvent = (event: Event) => {
+          const metadataContent =
+            metadataController.extractProfileMetadataContent(event)
+
+          if (metadataContent)
+            setProfiles((prev) => ({
+              ...prev,
+              [key]: metadataContent
+            }))
+        }
+
+        metadataController.on(key, (kind: number, event: Event) => {
+          if (kind === kinds.Metadata) {
+            handleMetadataEvent(event)
+          }
+        })
+
+        metadataController
+          .findMetadata(key)
+          .then((metadataEvent) => {
+            if (metadataEvent) handleMetadataEvent(metadataEvent)
+          })
+          .catch((err) => {
+            console.error(`error occurred in finding metadata for: ${key}`, err)
+          })
+      }
+    })
+  }, [submittedBy, signers])
+
+  const handleNavigation = () => {
+    if (signedStatus === SignedStatus.Complete) {
+      navigate(appPublicRoutes.verify, { state: { meta } })
+    } else {
+      navigate(appPrivateRoutes.sign, { state: { meta } })
+    }
+  }
+
+  return (
+    <Box
+      className={styles.item}
+      sx={{
+        flexDirection: {
+          xs: 'column',
+          md: 'row'
+        }
+      }}
+      onClick={handleNavigation}
+    >
+      <Box
+        className={styles.titleBox}
+        sx={{
+          borderBottomLeftRadius: {
+            xs: 'initial',
+            md: 'inherit'
+          },
+          borderTopRightRadius: {
+            xs: 'inherit',
+            md: 'initial'
+          }
+        }}
+      >
+        <Typography variant="body1" className={styles.title}>
+          <Description />
+          {title}
+        </Typography>
+        {submittedBy &&
+          (function () {
+            const profile = profiles[submittedBy]
+            return (
+              <UserAvatar
+                pubkey={submittedBy}
+                name={
+                  profile?.display_name ||
+                  profile?.name ||
+                  shorten(hexToNpub(submittedBy))
+                }
+                image={profile?.picture}
+              />
+            )
+          })()}
+        <Typography variant="body2" className={styles.date}>
+          <CalendarMonth />
+          {createdAt}
+        </Typography>
+      </Box>
+      <Box className={styles.signers}>
+        {signers.map((signer) => {
+          const pubkey = npubToHex(signer)!
+          const profile = profiles[pubkey]
+
+          return (
+            <DisplaySigner
+              key={signer}
+              meta={meta}
+              profile={profile}
+              pubkey={pubkey}
+            />
+          )
+        })}
+      </Box>
+    </Box>
+  )
+}
+
+enum SignStatus {
+  Signed = 'Signed',
+  Pending = 'Pending',
+  Invalid = 'Invalid Sign'
+}
+
+type DisplaySignerProps = {
+  meta: Meta
+  profile: ProfileMetadata
+  pubkey: string
+}
+
+const DisplaySigner = ({ meta, profile, pubkey }: DisplaySignerProps) => {
+  const [signStatus, setSignedStatus] = useState<SignStatus>()
+
+  useEffect(() => {
+    const updateSignStatus = async () => {
+      const npub = hexToNpub(pubkey)
+      if (npub in meta.docSignatures) {
+        parseJson<Event>(meta.docSignatures[npub])
+          .then((event) => {
+            const isValidSignature = verifyEvent(event)
+            if (isValidSignature) {
+              setSignedStatus(SignStatus.Signed)
+            } else {
+              setSignedStatus(SignStatus.Invalid)
+            }
+          })
+          .catch((err) => {
+            console.log(`err in parsing the docSignatures for ${npub}:>> `, err)
+            setSignedStatus(SignStatus.Invalid)
+          })
+      } else {
+        setSignedStatus(SignStatus.Pending)
+      }
+    }
+
+    updateSignStatus()
+  }, [meta, pubkey])
+
+  return (
+    <Box className={styles.signerItem}>
+      <Typography variant="button" className={styles.status}>
+        {signStatus}
+      </Typography>
+      <UserAvatar
+        pubkey={pubkey}
+        name={
+          profile?.display_name ||
+          profile?.name ||
+          shorten(hexToNpub(pubkey), 5)
+        }
+        image={profile?.picture}
+      />
+    </Box>
   )
 }

src/pages/home/style.module.scss

@@ -1,101 +1,94 @@
-@import '../../styles/colors.scss';
-
 .container {
   display: flex;
   flex-direction: column;
   gap: 25px;
-  container-type: inline-size;
 }
 
 .header {
   display: flex;
-  gap: 10px;
 
-  @container (width < 610px) {
-    flex-direction: column-reverse;
-  }
-}
-
-.filters {
-  display: flex;
-  gap: 10px;
-}
-
-.actionButtons {
-  display: flex;
-  justify-content: end;
-  align-items: center;
-  gap: 10px;
-  padding: 1.5px 0;
-  flex-grow: 1;
-}
-
-.search {
-  display: flex;
-  align-items: center;
-  justify-content: end;
-
-  height: 34px;
-  overflow: hidden;
-  border-radius: 4px;
-  outline: solid 1px #dddddd;
-  background: white;
-
-  width: 100%;
-
-  @container (width >= 610px) {
-    max-width: 246px;
+  .title {
+    color: var(--mui-palette-primary-light);
+    flex: 1;
   }
 
-  &:focus-within {
-    outline-color: $primary-main;
+  .actionButtons {
+    justify-content: center;
+    align-items: center;
+    gap: 10px;
   }
 }
 
-.dropzone {
-  position: relative;
-
-  font-size: 16px;
-  background-color: $overlay-background-color;
-  height: 250px;
-  color: rgba(0, 0, 0, 0.25);
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-
-  &::before {
-    content: '';
-    position: absolute;
-    transition:
-      background-color ease 0.2s,
-      inset ease 0.2s;
-    background: rgba(0, 0, 0, 0.1);
-    border-radius: 2px;
-    border: dashed 3px rgba(0, 0, 0, 0.1);
-    inset: 15px;
-  }
-
-  &:focus,
-  &.isDragActive,
-  &:hover {
-    &::before {
-      inset: 10px;
-      background: rgba(0, 0, 0, 0.15);
-    }
-  }
-
-  // Override button styles
-  padding: 0;
-  border: none;
-  outline: none;
-  letter-spacing: 1px;
-  font-weight: 500;
-  font-family: inherit;
-}
-
 .submissions {
-  display: grid;
-  gap: 25px;
-  grid-template-columns: repeat(auto-fit, minmax(365px, 1fr));
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+
+  .item {
+    display: flex;
+    gap: 10px;
+    background-color: #efeae6;
+    border-radius: 1rem;
+    cursor: pointer;
+
+    .titleBox {
+      display: flex;
+      flex: 4;
+      flex-direction: column;
+      align-items: center;
+      overflow-wrap: anywhere;
+      gap: 10px;
+      padding: 10px;
+      background-color: #cdc8c499;
+      border-top-left-radius: inherit;
+
+      .title {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        color: var(--mui-palette-primary-light);
+        font-size: 1.5rem;
+
+        svg {
+          font-size: 1.5rem;
+        }
+      }
+
+      .date {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        color: var(--mui-palette-primary-light);
+        font-size: 1rem;
+
+        svg {
+          font-size: 1rem;
+        }
+      }
+    }
+
+    .signers {
+      display: flex;
+      flex-direction: column;
+      flex: 6;
+      justify-content: center;
+      gap: 10px;
+      padding: 10px;
+      color: var(--mui-palette-primary-light);
+
+      .signerItem {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        gap: 10px;
+
+        .status {
+          border-radius: 2rem;
+          width: 100px;
+          text-align: center;
+          background-color: var(--mui-palette-info-light);
+        }
+      }
+    }
+  }
 }

src/pages/landing/index.tsx

@@ -1,6 +1,7 @@
 import { Box, Button } from '@mui/material'
 import { useEffect } from 'react'
-import { Outlet, useLocation } from 'react-router-dom'
+import { Outlet, useLocation, useNavigate } from 'react-router-dom'
+import { appPublicRoutes } from '../../routes'
 import { saveVisitedLink } from '../../utils'
 import { CardComponent } from '../../components/Landing/CardComponent/CardComponent'
 import { Container } from '../../components/Container'
@@ -18,14 +19,13 @@ import {
   faWifi
 } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIconStack } from '../../components/FontAwesomeIconStack'
-import { Footer } from '../../components/Footer/Footer'
-import { launch as launchNostrLoginDialog } from 'nostr-login'
 
 export const LandingPage = () => {
+  const navigate = useNavigate()
   const location = useLocation()
 
   const onSignInClick = async () => {
-    launchNostrLoginDialog()
+    navigate(appPublicRoutes.nostr)
   }
 
   const cards = [
@@ -34,7 +34,7 @@ export const LandingPage = () => {
       title: <>Open Source</>,
       description: (
         <>
-          Code is AGPL licenced and available at{' '}
+          Code is MIT licenced and available at{' '}
           <a href="https://git.nostrdev.com/sigit/sigit.io">
             https://git.nostrdev.com/sigit/sigit.io
           </a>
@@ -69,8 +69,8 @@ export const LandingPage = () => {
       title: <>Verifiable</>,
       description: (
         <>
-          SIGit Agreements can be directly verified - unlike traditional,
-          server-based offerings.
+          Thanks to Schnorr Signatures and Web of Trust, SIGit is far more
+          auditable than traditional server-based offerings.
         </>
       )
     },
@@ -84,8 +84,8 @@ export const LandingPage = () => {
       title: <>Works Offline</>,
       description: (
         <>
-          It is possible to complete a SIGit round without an internet
-          connection.
+          Presuming you have a hardware signing device, it is possible to
+          complete a SIGit round without an internet connection.
         </>
       )
     },
@@ -94,8 +94,8 @@ export const LandingPage = () => {
       title: <>Multi-Party Signing</>,
       description: (
         <>
-          Choose any number of Signers and Viewers, track status, get
-          notifications on completion.
+          Choose any number of Signers and Viewers, track the signature status,
+          send reminders, get notifications on completion.
         </>
       )
     }
@@ -119,7 +119,9 @@ export const LandingPage = () => {
       <Container className={styles.container}>
         <img className={styles.logo} src="/logo.svg" alt="Logo" width={300} />
         <div className={styles.titleSection}>
-          <h1 className={styles.title}>Secure &amp; Private Agreements</h1>
+          <h1 className={styles.title}>
+            Secure &amp; Private Document Signing
+          </h1>
           <p className={styles.subTitle}>
             An open-source and self-hostable solution for secure document
             signing and verification.
@@ -160,7 +162,6 @@ export const LandingPage = () => {
 
         <Outlet />
       </Container>
-      <Footer />
     </div>
   )
 }

src/pages/login/index.tsx

@@ -12,11 +12,6 @@ export const Login = () => {
         margin="dense"
         autoComplete="username"
         disabled
-        sx={{
-          input: {
-            cursor: 'not-allowed'
-          }
-        }}
       />
       <TextField
         label="Password"
@@ -25,11 +20,6 @@ export const Login = () => {
         margin="dense"
         autoComplete="current-password"
         disabled
-        sx={{
-          input: {
-            cursor: 'not-allowed'
-          }
-        }}
       />
 
       <Button variant="contained" fullWidth disabled>

src/pages/nostr/index.tsx

@@ -1,31 +1,62 @@
-import { launch as launchNostrLoginDialog } from 'nostr-login'
-
 import { Button, Divider, TextField } from '@mui/material'
 import { getPublicKey, nip19 } from 'nostr-tools'
 import { useEffect, useState } from 'react'
-import { useAppDispatch } from '../../hooks/store'
+import { useDispatch } from 'react-redux'
 import { useNavigate, useSearchParams } from 'react-router-dom'
 import { toast } from 'react-toastify'
 import { LoadingSpinner } from '../../components/LoadingSpinner'
-import { AuthController } from '../../controllers'
-import { updateKeyPair, updateLoginMethod } from '../../store/actions'
-import { KeyboardCode } from '../../types'
-import { LoginMethod } from '../../store/auth/types'
+import {
+  AuthController,
+  MetadataController,
+  NostrController
+} from '../../controllers'
+import {
+  updateKeyPair,
+  updateLoginMethod,
+  updateNsecbunkerPubkey,
+  updateNsecbunkerRelays
+} from '../../store/actions'
+import { LoginMethods } from '../../store/auth/types'
+import { Dispatch } from '../../store/store'
+import { npubToHex, queryNip05 } from '../../utils'
 import { hexToBytes } from '@noble/hashes/utils'
+import { NIP05_REGEX } from '../../constants'
 
 import styles from './styles.module.scss'
 
 export const Nostr = () => {
   const [searchParams] = useSearchParams()
 
-  const dispatch = useAppDispatch()
+  const dispatch: Dispatch = useDispatch()
   const navigate = useNavigate()
 
   const authController = new AuthController()
+  const metadataController = new MetadataController()
+  const nostrController = NostrController.getInstance()
 
   const [isLoading, setIsLoading] = useState(false)
   const [loadingSpinnerDesc, setLoadingSpinnerDesc] = useState('')
   const [inputValue, setInputValue] = useState('')
+  const [authUrl, setAuthUrl] = useState<string>()
+
+  const [isNostrExtensionAvailable, setIsNostrExtensionAvailable] =
+    useState(false)
+
+  useEffect(() => {
+    setTimeout(() => {
+      setIsNostrExtensionAvailable(!!window.nostr)
+    }, 500)
+  }, [])
+
+  /**
+   * Call login function when enter is pressed
+   */
+  const handleInputKeyDown = (event: any) => {
+    if (event.code === 'Enter' || event.code === 'NumpadEnter') {
+      event.preventDefault()
+      login()
+    }
+  }
 
   const navigateAfterLogin = (path: string) => {
     const callbackPath = searchParams.get('callbackPath')
@@ -40,26 +71,28 @@ export const Nostr = () => {
     navigate(path)
   }
 
-  const [isNostrExtensionAvailable, setIsNostrExtensionAvailable] =
-    useState(false)
+  const loginWithExtension = async () => {
+    setIsLoading(true)
+    setLoadingSpinnerDesc('Capturing pubkey from nostr extension')
 
-  useEffect(() => {
-    setTimeout(() => {
-      setIsNostrExtensionAvailable(!!window.nostr)
-    }, 500)
-  }, [])
+    nostrController
+      .capturePublicKey()
+      .then(async (pubkey) => {
+        dispatch(updateLoginMethod(LoginMethods.extension))
 
-  /**
-   * Call login function when enter is pressed
-   */
-  const handleInputKeyDown = (event: React.KeyboardEvent<HTMLDivElement>) => {
-    if (
-      event.code === KeyboardCode.Enter ||
-      event.code === KeyboardCode.NumpadEnter
-    ) {
-      event.preventDefault()
-      login()
-    }
+        setLoadingSpinnerDesc('Authenticating and finding metadata')
+        const redirectPath =
+          await authController.authAndGetMetadataAndRelaysMap(pubkey)
+
+        if (redirectPath) navigateAfterLogin(redirectPath)
+      })
+      .catch((err) => {
+        toast.error('Error capturing public key from nostr extension: ' + err)
+      })
+      .finally(() => {
+        setIsLoading(false)
+        setLoadingSpinnerDesc('')
+      })
   }
 
   /**
@@ -97,7 +130,7 @@ export const Nostr = () => {
         public: publickey
       })
     )
-    dispatch(updateLoginMethod(LoginMethod.privateKey))
+    dispatch(updateLoginMethod(LoginMethods.privateKey))
 
     setIsLoading(true)
     setLoadingSpinnerDesc('Authenticating and finding metadata')
@@ -115,10 +148,182 @@ export const Nostr = () => {
     setLoadingSpinnerDesc('')
   }
 
+  const loginWithNsecBunker = async () => {
+    let relays: string[] | undefined
+    let pubkey: string | undefined
+
+    setIsLoading(true)
+
+    const displayError = (message: string) => {
+      toast.error(message)
+      setIsLoading(false)
+      setLoadingSpinnerDesc('')
+    }
+
+    if (inputValue.match(NIP05_REGEX)) {
+      const nip05Profile = await queryNip05(inputValue).catch((err) => {
+        toast.error('An error occurred while querying nip05 profile: ' + err)
+        return null
+      })
+
+      if (nip05Profile) {
+        pubkey = nip05Profile.pubkey
+        relays = nip05Profile.relays
+      }
+    } else if (inputValue.startsWith('npub')) {
+      pubkey = nip19.decode(inputValue).data as string
+      const metadataEvent = await metadataController
+        .findMetadata(pubkey)
+        .catch(() => {
+          return null
+        })
+
+      if (!metadataEvent) {
+        return displayError('metadata not found!')
+      }
+
+      const metadataContent =
+        metadataController.extractProfileMetadataContent(metadataEvent)
+
+      if (!metadataContent?.nip05) {
+        return displayError('nip05 not present in metadata')
+      }
+
+      const nip05Profile = await queryNip05(inputValue).catch((err) => {
+        toast.error('An error occurred while querying nip05 profile: ' + err)
+        return null
+      })
+
+      if (nip05Profile) {
+        if (nip05Profile.pubkey !== pubkey) {
+          return displayError(
+            'pubkey in nip05 does not match with provided npub'
+          )
+        }
+
+        relays = nip05Profile.relays
+      }
+    }
+
+    if (!relays || relays.length === 0) {
+      return displayError('No relay found for nsecbunker')
+    }
+
+    if (!pubkey) {
+      return displayError('pubkey not found')
+    }
+
+    setLoadingSpinnerDesc('Initializing nsecBunker')
+    await nostrController.nsecBunkerInit(relays)
+
+    setLoadingSpinnerDesc('Creating nsecbunker singer')
+    await nostrController
+      .createNsecBunkerSigner(pubkey)
+      .then(async (signer) => {
+        signer.on('authUrl', (url: string) => {
+          setAuthUrl(url)
+        })
+
+        dispatch(updateLoginMethod(LoginMethods.nsecBunker))
+        dispatch(updateNsecbunkerPubkey(pubkey))
+        dispatch(updateNsecbunkerRelays(relays))
+
+        setLoadingSpinnerDesc('Authenticating and finding metadata')
+
+        const redirectPath = await authController
+          .authAndGetMetadataAndRelaysMap(pubkey!)
+          .catch((err) => {
+            toast.error('Error occurred in authentication: ' + err)
+            return null
+          })
+
+        if (redirectPath) navigateAfterLogin(redirectPath)
+      })
+      .catch((err) => {
+        toast.error(
+          'An error occurred while creating nsecbunker signer: ' + err
+        )
+      })
+      .finally(() => {
+        setIsLoading(false)
+        setLoadingSpinnerDesc('')
+      })
+  }
+
+  const loginWithBunkerConnectionString = async () => {
+    // Extract the key
+    const keyStartIndex = inputValue.indexOf('bunker://') + 'bunker://'.length
+    const keyEndIndex = inputValue.indexOf('?relay=')
+    const key = inputValue.substring(keyStartIndex, keyEndIndex)
+
+    const pubkey = npubToHex(key)
+
+    if (!pubkey) {
+      toast.error('Invalid pubkey in bunker connection string.')
+      setIsLoading(false)
+      return
+    }
+
+    // Extract the relay value
+    const relayIndex = inputValue.indexOf('relay=')
+    const relay = inputValue.substring(
+      relayIndex + 'relay='.length,
+      inputValue.length
+    )
+
+    setIsLoading(true)
+    setLoadingSpinnerDesc('Initializing bunker NDK')
+
+    await nostrController.nsecBunkerInit([relay])
+
+    setLoadingSpinnerDesc('Creating remote signer')
+    await nostrController
+      .createNsecBunkerSigner(pubkey)
+      .then(async (signer) => {
+        signer.on('authUrl', (url: string) => {
+          setAuthUrl(url)
+        })
+
+        dispatch(updateLoginMethod(LoginMethods.nsecBunker))
+        dispatch(updateNsecbunkerPubkey(pubkey))
+        dispatch(updateNsecbunkerRelays([relay]))
+
+        setLoadingSpinnerDesc('Authenticating and finding metadata')
+
+        const redirectPath = await authController
+          .authAndGetMetadataAndRelaysMap(pubkey!)
+          .catch((err) => {
+            toast.error('Error occurred in authentication: ' + err)
+            return null
+          })
+
+        if (redirectPath) navigateAfterLogin(redirectPath)
+      })
+      .catch((err) => {
+        toast.error(
+          'An error occurred while creating nsecbunker signer: ' + err
+        )
+      })
+      .finally(() => {
+        setIsLoading(false)
+        setLoadingSpinnerDesc('')
+      })
+  }
+
   const login = () => {
+    if (inputValue.startsWith('bunker://')) {
+      return loginWithBunkerConnectionString()
+    }
+
     if (inputValue.startsWith('nsec')) {
       return loginWithNsec()
     }
+    if (inputValue.startsWith('npub')) {
+      return loginWithNsecBunker()
+    }
+    if (inputValue.match(NIP05_REGEX)) {
+      return loginWithNsecBunker()
+    }
 
     // Check if maybe hex nsec
     try {
@@ -130,33 +335,38 @@ export const Nostr = () => {
       console.warn('err', err)
     }
 
-    toast.error('Invalid format, please use: private key (hex or nsec)')
+    toast.error(
+      'Invalid format, please use: private key (hex), nsec..., bunker:// or nip05 format.'
+    )
     return
   }
 
+  if (authUrl) {
+    return (
+      <iframe
+        title="Nsecbunker auth"
+        src={authUrl}
+        width="100%"
+        height="500px"
+      />
+    )
+  }
+
   return (
     <>
       {isLoading && <LoadingSpinner desc={loadingSpinnerDesc} />}
+
       {isNostrExtensionAvailable && (
         <>
           <label className={styles.label} htmlFor="extension-login">
-            Login by using a{' '}
-            <a
-              rel="noopener"
-              href="https://github.com/nostrband/nostr-login"
-              target="_blank"
-            >
-              nostr-login
-            </a>
+            Login by using a browser extension
           </label>
           <Button
-            id="nostr-login"
+            id="extension-login"
+            onClick={loginWithExtension}
             variant="contained"
-            onClick={() => {
-              launchNostrLoginDialog()
-            }}
           >
-            Nostr Login
+            Extension Login
           </Button>
           <Divider
             sx={{
@@ -167,18 +377,16 @@ export const Nostr = () => {
           </Divider>
         </>
       )}
-      <form autoComplete="off">
-        <TextField
-          onKeyDown={handleInputKeyDown}
-          label="Private key (Not recommended)"
-          type="password"
-          autoComplete="off"
-          value={inputValue}
-          onChange={(e) => setInputValue(e.target.value)}
-          fullWidth
-          margin="dense"
-        />
-      </form>
+      <TextField
+        onKeyDown={handleInputKeyDown}
+        label="nip05 login / nip46 bunker string"
+        helperText="Private key (Not recommended)"
+        value={inputValue}
+        onChange={(e) => setInputValue(e.target.value)}
+        fullWidth
+        margin="dense"
+      />
+
       <Button
         disabled={!inputValue}
         onClick={login}

src/pages/profile/index.tsx

@@ -1,48 +1,41 @@
 import ContentCopyIcon from '@mui/icons-material/ContentCopy'
 import EditIcon from '@mui/icons-material/Edit'
 import { Box, IconButton, SxProps, Theme, Typography } from '@mui/material'
+import { truncate } from 'lodash'
 import { Event, VerifiedEvent, kinds, nip19 } from 'nostr-tools'
 import { useEffect, useMemo, useState } from 'react'
-import { useAppSelector } from '../../hooks/store'
+import { useSelector } from 'react-redux'
 import { Link, useNavigate, useParams } from 'react-router-dom'
 import { toast } from 'react-toastify'
 import { LoadingSpinner } from '../../components/LoadingSpinner'
 import { MetadataController } from '../../controllers'
 import { getProfileSettingsRoute } from '../../routes'
+import { State } from '../../store/rootReducer'
 import { NostrJoiningBlock, ProfileMetadata } from '../../types'
-import {
-  getNostrJoiningBlockNumber,
-  getProfileUsername,
-  getRoboHashPicture,
-  hexToNpub,
-  shorten
-} from '../../utils'
+import { getRoboHashPicture, hexToNpub, shorten } from '../../utils'
 import styles from './style.module.scss'
 import { Container } from '../../components/Container'
-import { Footer } from '../../components/Footer/Footer'
 
 export const ProfilePage = () => {
   const navigate = useNavigate()
 
   const { npub } = useParams()
 
-  const metadataController = useMemo(() => MetadataController.getInstance(), [])
+  const metadataController = useMemo(() => new MetadataController(), [])
 
   const [pubkey, setPubkey] = useState<string>()
   const [nostrJoiningBlock, setNostrJoiningBlock] =
     useState<NostrJoiningBlock | null>(null)
   const [profileMetadata, setProfileMetadata] = useState<ProfileMetadata>()
-  const metadataState = useAppSelector((state) => state.metadata)
-  const { usersPubkey } = useAppSelector((state) => state.auth)
-  const userRobotImage = useAppSelector((state) => state.userRobotImage)
+  const metadataState = useSelector((state: State) => state.metadata)
+  const { usersPubkey } = useSelector((state: State) => state.auth)
+  const userRobotImage = useSelector((state: State) => state.userRobotImage)
 
   const [isUsersOwnProfile, setIsUsersOwnProfile] = useState(false)
 
   const [isLoading, setIsLoading] = useState(true)
   const [loadingSpinnerDesc] = useState('Fetching metadata')
 
-  const profileName = pubkey && getProfileUsername(pubkey, profileMetadata)
-
   useEffect(() => {
     if (npub) {
       try {
@@ -58,7 +51,8 @@ export const ProfilePage = () => {
 
   useEffect(() => {
     if (pubkey) {
-      getNostrJoiningBlockNumber(pubkey)
+      metadataController
+        .getNostrJoiningBlockNumber(pubkey)
         .then((res) => {
           setNostrJoiningBlock(res)
         })
@@ -167,10 +161,7 @@ export const ProfilePage = () => {
             className={`${styles.banner} ${!profileMetadata || !profileMetadata.banner ? styles.noImage : ''}`}
           >
             {profileMetadata && profileMetadata.banner ? (
-              <img
-                src={profileMetadata.banner}
-                alt={`banner image for ${profileName}`}
-              />
+              <img src={profileMetadata.banner} />
             ) : (
               ''
             )}
@@ -190,7 +181,6 @@ export const ProfilePage = () => {
                   <img
                     className={styles['image-placeholder']}
                     src={getProfileImage(profileMetadata!)}
-                    alt={profileName}
                   />
                 </div>
               </Box>
@@ -230,7 +220,14 @@ export const ProfilePage = () => {
                       variant="h6"
                       className={styles.bold}
                     >
-                      {profileName}
+                      {truncate(
+                        profileMetadata.display_name ||
+                          profileMetadata.name ||
+                          hexToNpub(pubkey),
+                        {
+                          length: 16
+                        }
+                      )}
                     </Typography>
                   )}
                 </Box>
@@ -284,7 +281,6 @@ export const ProfilePage = () => {
           </Box>
         </Container>
       )}
-      <Footer />
     </>
   )
 }

src/pages/profile/style.module.scss

@@ -24,7 +24,7 @@
 }
 
 .container {
-  color: black;
+  color: black
 }
 
 .left {
@@ -51,8 +51,7 @@
 }
 
 .image-placeholder {
-  width: 100%;
-  height: auto;
+  width: 150px;
 }
 
 .link {
@@ -100,4 +99,4 @@
     margin-left: 5px;
     margin-top: 2px;
   }
-}
+}

src/pages/register/index.tsx

@@ -12,11 +12,6 @@ export const Register = () => {
         margin="dense"
         autoComplete="username"
         disabled
-        sx={{
-          input: {
-            cursor: 'not-allowed'
-          }
-        }}
       />
       <TextField
         label="Password"
@@ -26,11 +21,6 @@ export const Register = () => {
         type="password"
         autoComplete="new-password"
         disabled
-        sx={{
-          input: {
-            cursor: 'not-allowed'
-          }
-        }}
       />
       <TextField
         label="Confirm password"
@@ -40,11 +30,6 @@ export const Register = () => {
         type="password"
         autoComplete="new-password"
         disabled
-        sx={{
-          input: {
-            cursor: 'not-allowed'
-          }
-        }}
       />
 
       <Button variant="contained" fullWidth disabled>

src/pages/settings/Settings.tsx

@@ -2,22 +2,24 @@ import AccountCircleIcon from '@mui/icons-material/AccountCircle'
 import ArrowForwardIosIcon from '@mui/icons-material/ArrowForwardIos'
 import CachedIcon from '@mui/icons-material/Cached'
 import RouterIcon from '@mui/icons-material/Router'
-import { ListItem, useTheme } from '@mui/material'
+import { useTheme } from '@mui/material'
 import List from '@mui/material/List'
+import ListItemButton from '@mui/material/ListItemButton'
 import ListItemIcon from '@mui/material/ListItemIcon'
 import ListItemText from '@mui/material/ListItemText'
 import ListSubheader from '@mui/material/ListSubheader'
-import { useAppSelector } from '../../hooks/store'
-import { Link } from 'react-router-dom'
+import { useSelector } from 'react-redux'
+import { useNavigate } from 'react-router-dom'
 import { appPrivateRoutes, getProfileSettingsRoute } from '../../routes'
+import { State } from '../../store/rootReducer'
 import { Container } from '../../components/Container'
-import { Footer } from '../../components/Footer/Footer'
-import ExtensionIcon from '@mui/icons-material/Extension'
-import { LoginMethod } from '../../store/auth/types'
 
 export const SettingsPage = () => {
   const theme = useTheme()
-  const { usersPubkey, loginMethod } = useAppSelector((state) => state.auth)
+
+  const navigate = useNavigate()
+  const usersPubkey = useSelector((state: State) => state.auth.usersPubkey)
+
   const listItem = (label: string, disabled = false) => {
     return (
       <>
@@ -41,56 +43,56 @@ export const SettingsPage = () => {
   }
 
   return (
-    <>
-      <Container>
-        <List
-          sx={{
-            width: '100%',
-            bgcolor: 'background.paper'
+    <Container>
+      <List
+        sx={{
+          width: '100%',
+          bgcolor: 'background.paper'
+        }}
+        subheader={
+          <ListSubheader
+            sx={{
+              fontSize: '1.5rem',
+              borderBottom: '0.5px solid',
+              paddingBottom: 2,
+              paddingTop: 2
+            }}
+          >
+            Settings
+          </ListSubheader>
+        }
+      >
+        <ListItemButton
+          onClick={() => {
+            navigate(getProfileSettingsRoute(usersPubkey!))
           }}
-          subheader={
-            <ListSubheader
-              sx={{
-                fontSize: '1.5rem',
-                borderBottom: '0.5px solid',
-                paddingBottom: 2,
-                paddingTop: 2,
-                zIndex: 2
-              }}
-            >
-              Settings
-            </ListSubheader>
-          }
         >
-          <ListItem component={Link} to={getProfileSettingsRoute(usersPubkey!)}>
-            <ListItemIcon>
-              <AccountCircleIcon />
-            </ListItemIcon>
-            {listItem('Profile')}
-          </ListItem>
-          <ListItem component={Link} to={appPrivateRoutes.relays}>
-            <ListItemIcon>
-              <RouterIcon />
-            </ListItemIcon>
-            {listItem('Relays')}
-          </ListItem>
-          <ListItem component={Link} to={appPrivateRoutes.cacheSettings}>
-            <ListItemIcon>
-              <CachedIcon />
-            </ListItemIcon>
-            {listItem('Local Cache')}
-          </ListItem>
-          {loginMethod === LoginMethod.nostrLogin && (
-            <ListItem component={Link} to={appPrivateRoutes.nostrLogin}>
-              <ListItemIcon>
-                <ExtensionIcon />
-              </ListItemIcon>
-              {listItem('Nostr Login')}
-            </ListItem>
-          )}
-        </List>
-      </Container>
-      <Footer />
-    </>
+          <ListItemIcon>
+            <AccountCircleIcon />
+          </ListItemIcon>
+          {listItem('Profile')}
+        </ListItemButton>
+        <ListItemButton
+          onClick={() => {
+            navigate(appPrivateRoutes.relays)
+          }}
+        >
+          <ListItemIcon>
+            <RouterIcon />
+          </ListItemIcon>
+          {listItem('Relays')}
+        </ListItemButton>
+        <ListItemButton
+          onClick={() => {
+            navigate(appPrivateRoutes.cacheSettings)
+          }}
+        >
+          <ListItemIcon>
+            <CachedIcon />
+          </ListItemIcon>
+          {listItem('Local Cache')}
+        </ListItemButton>
+      </List>
+    </Container>
   )
 }

src/pages/settings/cache/index.tsx

@@ -14,7 +14,6 @@ import { toast } from 'react-toastify'
 import { localCache } from '../../../services'
 import { LoadingSpinner } from '../../../components/LoadingSpinner'
 import { Container } from '../../../components/Container'
-import { Footer } from '../../../components/Footer/Footer'
 
 export const CacheSettingsPage = () => {
   const theme = useTheme()
@@ -51,52 +50,48 @@ export const CacheSettingsPage = () => {
   }
 
   return (
-    <>
-      <Container>
-        {isLoading && <LoadingSpinner desc={loadingSpinnerDesc} />}
-        <List
-          sx={{
-            width: '100%',
-            bgcolor: 'background.paper',
-            marginTop: 2
-          }}
-          subheader={
-            <ListSubheader
-              sx={{
-                fontSize: '1.5rem',
-                borderBottom: '0.5px solid',
-                paddingBottom: 2,
-                paddingTop: 2,
-                zIndex: 2
-              }}
-            >
-              Cache Setting
-            </ListSubheader>
-          }
-        >
-          <ListItemButton disabled>
-            <ListItemIcon>
-              <IosShareIcon />
-            </ListItemIcon>
-            {listItem('Export (coming soon)')}
-          </ListItemButton>
+    <Container>
+      {isLoading && <LoadingSpinner desc={loadingSpinnerDesc} />}
+      <List
+        sx={{
+          width: '100%',
+          bgcolor: 'background.paper',
+          marginTop: 2
+        }}
+        subheader={
+          <ListSubheader
+            sx={{
+              fontSize: '1.5rem',
+              borderBottom: '0.5px solid',
+              paddingBottom: 2,
+              paddingTop: 2
+            }}
+          >
+            Cache Setting
+          </ListSubheader>
+        }
+      >
+        <ListItemButton disabled>
+          <ListItemIcon>
+            <IosShareIcon />
+          </ListItemIcon>
+          {listItem('Export (coming soon)')}
+        </ListItemButton>
 
-          <ListItemButton disabled>
-            <ListItemIcon>
-              <InputIcon />
-            </ListItemIcon>
-            {listItem('Import (coming soon)')}
-          </ListItemButton>
+        <ListItemButton disabled>
+          <ListItemIcon>
+            <InputIcon />
+          </ListItemIcon>
+          {listItem('Import (coming soon)')}
+        </ListItemButton>
 
-          <ListItemButton onClick={handleClearData}>
-            <ListItemIcon>
-              <ClearIcon sx={{ color: theme.palette.error.main }} />
-            </ListItemIcon>
-            {listItem('Clear Cache')}
-          </ListItemButton>
-        </List>
-      </Container>
-      <Footer />
-    </>
+        <ListItemButton onClick={handleClearData}>
+          <ListItemIcon>
+            <ClearIcon sx={{ color: theme.palette.error.main }} />
+          </ListItemIcon>
+          {listItem('Clear Cache')}
+        </ListItemButton>
+      </List>
+    </Container>
   )
 }

src/pages/settings/nostrLogin/index.tsx

@@ -1,78 +0,0 @@
-import {
-  List,
-  ListItemButton,
-  ListItemIcon,
-  ListItemText,
-  ListSubheader,
-  useTheme
-} from '@mui/material'
-import { launch as launchNostrLoginDialog } from 'nostr-login'
-import { Container } from '../../../components/Container'
-import PeopleIcon from '@mui/icons-material/People'
-import ImportExportIcon from '@mui/icons-material/ImportExport'
-import { useAppSelector } from '../../../hooks/store'
-import { NostrLoginAuthMethod } from '../../../store/auth/types'
-
-export const NostrLoginPage = () => {
-  const theme = useTheme()
-  const nostrLoginAuthMethod = useAppSelector(
-    (state) => state.auth?.nostrLoginAuthMethod
-  )
-
-  return (
-    <Container>
-      <List
-        sx={{
-          width: '100%',
-          bgcolor: 'background.paper'
-        }}
-        subheader={
-          <ListSubheader
-            sx={{
-              fontSize: '1.5rem',
-              borderBottom: '0.5px solid',
-              paddingBottom: 2,
-              paddingTop: 2,
-              zIndex: 2
-            }}
-          >
-            Nostr Settings
-          </ListSubheader>
-        }
-      >
-        <ListItemButton
-          onClick={() => {
-            launchNostrLoginDialog('switch-account')
-          }}
-        >
-          <ListItemIcon>
-            <PeopleIcon />
-          </ListItemIcon>
-          <ListItemText
-            primary={'Nostr Login Accounts'}
-            sx={{
-              color: theme.palette.text.primary
-            }}
-          />
-        </ListItemButton>
-        {nostrLoginAuthMethod === NostrLoginAuthMethod.Local && (
-          <ListItemButton
-            onClick={() => {
-              launchNostrLoginDialog('import')
-            }}
-          >
-            <ListItemIcon>
-              <ImportExportIcon />
-            </ListItemIcon>
-            <ListItemText
-              primary={'Import / Export Keys'}
-              sx={{
-                color: theme.palette.text.primary
-              }}
-            />
-          </ListItemButton>
-        )}
-      </List>
-    </Container>
-  )
-}

src/pages/settings/profile/index.tsx

@@ -12,38 +12,31 @@ import {
   useTheme
 } from '@mui/material'
 import { UnsignedEvent, nip19, kinds, VerifiedEvent, Event } from 'nostr-tools'
-import React, { useEffect, useRef, useState } from 'react'
+import { useEffect, useMemo, useRef, useState } from 'react'
 import { Link, useParams } from 'react-router-dom'
 import { toast } from 'react-toastify'
 import { MetadataController, NostrController } from '../../../controllers'
 import { NostrJoiningBlock, ProfileMetadata } from '../../../types'
 import styles from './style.module.scss'
-import { useAppDispatch, useAppSelector } from '../../../hooks/store'
-
+import { useDispatch, useSelector } from 'react-redux'
+import { State } from '../../../store/rootReducer'
 import { LoadingButton } from '@mui/lab'
 import { Dispatch } from '../../../store/store'
 import { setMetadataEvent } from '../../../store/actions'
 import { LoadingSpinner } from '../../../components/LoadingSpinner'
-import { LoginMethod, NostrLoginAuthMethod } from '../../../store/auth/types'
+import { LoginMethods } from '../../../store/auth/types'
 import { SmartToy } from '@mui/icons-material'
-import {
-  getNostrJoiningBlockNumber,
-  getRoboHashPicture,
-  unixNow
-} from '../../../utils'
+import { getRoboHashPicture } from '../../../utils'
 import { Container } from '../../../components/Container'
-import { Footer } from '../../../components/Footer/Footer'
-import LaunchIcon from '@mui/icons-material/Launch'
-import { launch as launchNostrLoginDialog } from 'nostr-login'
 
 export const ProfileSettingsPage = () => {
   const theme = useTheme()
 
   const { npub } = useParams()
 
-  const dispatch: Dispatch = useAppDispatch()
+  const dispatch: Dispatch = useDispatch()
 
-  const metadataController = MetadataController.getInstance()
+  const metadataController = useMemo(() => new MetadataController(), [])
   const nostrController = NostrController.getInstance()
 
   const [pubkey, setPubkey] = useState<string>()
@@ -51,12 +44,10 @@ export const ProfileSettingsPage = () => {
     useState<NostrJoiningBlock | null>(null)
   const [profileMetadata, setProfileMetadata] = useState<ProfileMetadata>()
   const [savingProfileMetadata, setSavingProfileMetadata] = useState(false)
-  const metadataState = useAppSelector((state) => state.metadata)
-  const keys = useAppSelector((state) => state.auth?.keyPair)
-  const { usersPubkey, loginMethod, nostrLoginAuthMethod } = useAppSelector(
-    (state) => state.auth
-  )
-  const userRobotImage = useAppSelector((state) => state.userRobotImage)
+  const metadataState = useSelector((state: State) => state.metadata)
+  const keys = useSelector((state: State) => state.auth?.keyPair)
+  const { usersPubkey, loginMethod } = useSelector((state: State) => state.auth)
+  const userRobotImage = useSelector((state: State) => state.userRobotImage)
 
   const [isUsersOwnProfile, setIsUsersOwnProfile] = useState(false)
 
@@ -80,7 +71,8 @@ export const ProfileSettingsPage = () => {
 
   useEffect(() => {
     if (pubkey) {
-      getNostrJoiningBlockNumber(pubkey)
+      metadataController
+        .getNostrJoiningBlockNumber(pubkey)
         .then((res) => {
           setNostrJoiningBlock(res)
         })
@@ -205,7 +197,7 @@ export const ProfileSettingsPage = () => {
     // Relay will reject if created_at is too late
     const updatedMetadataState: UnsignedEvent = {
       content: content,
-      created_at: unixNow(),
+      created_at: Math.round(Date.now() / 1000),
       kind: kinds.Metadata,
       pubkey: pubkey!,
       tags: metadataState?.tags || []
@@ -291,8 +283,7 @@ export const ProfileSettingsPage = () => {
               sx={{
                 paddingBottom: 1,
                 paddingTop: 1,
-                fontSize: '1.5rem',
-                zIndex: 2
+                fontSize: '1.5rem'
               }}
               className={styles.subHeader}
             >
@@ -330,8 +321,8 @@ export const ProfileSettingsPage = () => {
                 }}
               >
                 <img
-                  onError={(event: React.SyntheticEvent<HTMLImageElement>) => {
-                    event.currentTarget.src = getRoboHashPicture(npub!)
+                  onError={(event: any) => {
+                    event.target.src = getRoboHashPicture(npub!)
                   }}
                   className={styles.img}
                   src={getProfileImage(profileMetadata)}
@@ -368,7 +359,7 @@ export const ProfileSettingsPage = () => {
                 <>
                   {usersPubkey &&
                     copyItem(nip19.npubEncode(usersPubkey), 'Public Key')}
-                  {loginMethod === LoginMethod.privateKey &&
+                  {loginMethod === LoginMethods.privateKey &&
                     keys &&
                     keys.private &&
                     copyItem(
@@ -378,33 +369,6 @@ export const ProfileSettingsPage = () => {
                     )}
                 </>
               )}
-              {isUsersOwnProfile && (
-                <>
-                  {loginMethod === LoginMethod.nostrLogin &&
-                    nostrLoginAuthMethod === NostrLoginAuthMethod.Local && (
-                      <ListItem
-                        sx={{ marginTop: 1 }}
-                        onClick={() => {
-                          launchNostrLoginDialog('import')
-                        }}
-                      >
-                        <TextField
-                          label="Private Key (nostr-login)"
-                          defaultValue="••••••••••••••••••••••••••••••••••••••••••••••••••"
-                          size="small"
-                          className={styles.textField}
-                          disabled
-                          type={'password'}
-                          InputProps={{
-                            endAdornment: (
-                              <LaunchIcon className={styles.copyItem} />
-                            )
-                          }}
-                        />
-                      </ListItem>
-                    )}
-                </>
-              )}
             </div>
           )}
         </List>
@@ -418,7 +382,6 @@ export const ProfileSettingsPage = () => {
           </LoadingButton>
         )}
       </Container>
-      <Footer />
     </>
   )
 }

src/pages/settings/relays/index.tsx

@@ -12,45 +12,137 @@ import ListItemText from '@mui/material/ListItemText'
 import Switch from '@mui/material/Switch'
 import { useEffect, useState } from 'react'
 import { toast } from 'react-toastify'
-import { Container } from '../../../components/Container'
-import { relayController } from '../../../controllers'
-import { useAppDispatch, useAppSelector, useDidMount } from '../../../hooks'
-import { setRelayMapAction } from '../../../store/actions'
-import { RelayConnectionState, RelayFee, RelayInfo } from '../../../types'
+import { NostrController } from '../../../controllers'
+import { useAppDispatch, useAppSelector } from '../../../hooks'
+import {
+  setRelayMapAction,
+  setRelayMapUpdatedAction
+} from '../../../store/actions'
+import {
+  RelayConnectionState,
+  RelayFee,
+  RelayInfoObject,
+  RelayMap
+} from '../../../types'
 import {
   capitalizeFirstLetter,
   compareObjects,
-  getRelayInfo,
-  getRelayMap,
   hexToNpub,
-  publishRelayMap,
   shorten
 } from '../../../utils'
 import styles from './style.module.scss'
-import { Footer } from '../../../components/Footer/Footer'
+import { Container } from '../../../components/Container'
 
 export const RelaysPage = () => {
+  const nostrController = NostrController.getInstance()
+
+  const relaysState = useAppSelector((state) => state.relays)
   const usersPubkey = useAppSelector((state) => state.auth?.usersPubkey)
 
   const dispatch = useAppDispatch()
 
   const [newRelayURI, setNewRelayURI] = useState<string>()
   const [newRelayURIerror, setNewRelayURIerror] = useState<string>()
-
-  const relayMap = useAppSelector((state) => state.relays?.map)
-  const relaysInfo = useAppSelector((state) => state.relays?.info)
+  const [relayMap, setRelayMap] = useState<RelayMap | undefined>(
+    relaysState?.map
+  )
+  const [relaysInfo, setRelaysInfo] = useState<RelayInfoObject | undefined>(
+    relaysState?.info
+  )
+  const [displayRelaysInfo, setDisplayRelaysInfo] = useState<string[]>([])
+  const [relaysConnectionStatus, setRelaysConnectionStatus] = useState(
+    relaysState?.connectionStatus
+  )
 
   const webSocketPrefix = 'wss://'
 
-  useDidMount(() => {
-    if (usersPubkey) {
-      getRelayMap(usersPubkey).then((newRelayMap) => {
-        if (!compareObjects(relayMap, newRelayMap.map)) {
-          dispatch(setRelayMapAction(newRelayMap.map))
-        }
-      })
+  // Update relay connection status
+  useEffect(() => {
+    if (
+      !compareObjects(relaysConnectionStatus, relaysState?.connectionStatus)
+    ) {
+      setRelaysConnectionStatus(relaysState?.connectionStatus)
     }
-  })
+  }, [relaysConnectionStatus, relaysState?.connectionStatus])
+
+  useEffect(() => {
+    if (!compareObjects(relaysInfo, relaysState?.info)) {
+      setRelaysInfo(relaysState?.info)
+    }
+  }, [relaysInfo, relaysState?.info])
+
+  useEffect(() => {
+    if (!compareObjects(relayMap, relaysState?.map)) {
+      setRelayMap(relaysState?.map)
+    }
+  }, [relayMap, relaysState?.map])
+
+  useEffect(() => {
+    let isMounted = false
+
+    const fetchData = async () => {
+      if (usersPubkey) {
+        isMounted = true
+
+        // call async func to fetch relay map
+        const newRelayMap = await nostrController.getRelayMap(usersPubkey)
+
+        // handle fetched relay map
+        if (isMounted) {
+          if (
+            !relaysState?.mapUpdated ||
+            newRelayMap.mapUpdated > relaysState?.mapUpdated
+          ) {
+            if (
+              !relaysState?.map ||
+              !compareObjects(relaysState.map, newRelayMap)
+            ) {
+              setRelayMap(newRelayMap.map)
+
+              dispatch(setRelayMapAction(newRelayMap.map))
+            } else {
+              // Update relay map updated timestamp
+              dispatch(setRelayMapUpdatedAction())
+            }
+          }
+        }
+      }
+    }
+
+    // Publishing relay map can take some time.
+    // This is why data fetch should happen only if relay map was received more than 5 minutes ago.
+    if (
+      usersPubkey &&
+      (!relaysState?.mapUpdated ||
+        Date.now() - relaysState?.mapUpdated > 5 * 60 * 1000) // 5 minutes
+    ) {
+      fetchData()
+
+      // Update relay connection status
+      if (relaysConnectionStatus) {
+        const notConnectedRelays = Object.keys(relaysConnectionStatus).filter(
+          (key) =>
+            relaysConnectionStatus[key] === RelayConnectionState.NotConnected
+        )
+
+        if (notConnectedRelays.length) {
+          nostrController.connectToRelays(notConnectedRelays)
+        }
+      }
+    }
+
+    // cleanup func
+    return () => {
+      isMounted = false
+    }
+  }, [
+    dispatch,
+    usersPubkey,
+    relaysState?.map,
+    relaysState?.mapUpdated,
+    nostrController,
+    relaysConnectionStatus
+  ])
 
   useEffect(() => {
     // Display notification if an empty relay map has been received
@@ -82,23 +174,24 @@ export const RelaysPage = () => {
 
         if (usersPubkey) {
           // Publish updated relay map.
-          const relayMapPublishingRes = await publishRelayMap(
-            relayMapCopy,
-            usersPubkey,
-            [relay]
-          ).catch((err) => handlePublishRelayMapError(err))
+          const relayMapPublishingRes = await nostrController
+            .publishRelayMap(relayMapCopy, usersPubkey, [relay])
+            .catch((err) => handlePublishRelayMapError(err))
 
           if (relayMapPublishingRes) {
             toast.success(relayMapPublishingRes)
 
+            setRelayMap(relayMapCopy)
+
             dispatch(setRelayMapAction(relayMapCopy))
           }
         }
+
+        nostrController.disconnectFromRelays([relay])
       }
     }
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const handlePublishRelayMapError = (err: any) => {
     const errorPrefix = 'Error while publishing Relay Map'
 
@@ -130,14 +223,15 @@ export const RelaysPage = () => {
 
         if (usersPubkey) {
           // Publish updated relay map
-          const relayMapPublishingRes = await publishRelayMap(
-            relayMapCopy,
-            usersPubkey
-          ).catch((err) => handlePublishRelayMapError(err))
+          const relayMapPublishingRes = await nostrController
+            .publishRelayMap(relayMapCopy, usersPubkey)
+            .catch((err) => handlePublishRelayMapError(err))
 
           if (relayMapPublishingRes) {
             toast.success(relayMapPublishingRes)
 
+            setRelayMap(relayMapCopy)
+
             dispatch(setRelayMapAction(relayMapCopy))
           }
         }
@@ -161,25 +255,29 @@ export const RelaysPage = () => {
         )
       }
     } else if (relayURI && usersPubkey) {
-      const relay = await relayController.connectRelay(relayURI)
+      const connectionStatus = await nostrController.connectToRelays([relayURI])
 
-      if (relay && relay.connected) {
+      if (
+        connectionStatus &&
+        connectionStatus[relayURI] &&
+        connectionStatus[relayURI] === RelayConnectionState.Connected
+      ) {
         const relayMapCopy = JSON.parse(JSON.stringify(relayMap))
 
         relayMapCopy[relayURI] = { write: true, read: true }
 
         // Publish updated relay map
-        const relayMapPublishingRes = await publishRelayMap(
-          relayMapCopy,
-          usersPubkey
-        ).catch((err) => handlePublishRelayMapError(err))
+        const relayMapPublishingRes = await nostrController
+          .publishRelayMap(relayMapCopy, usersPubkey)
+          .catch((err) => handlePublishRelayMapError(err))
 
         if (relayMapPublishingRes) {
+          setRelayMap(relayMapCopy)
           setNewRelayURI('')
 
           dispatch(setRelayMapAction(relayMapCopy))
 
-          getRelayInfo([relayURI])
+          nostrController.getRelayInfo([relayURI])
 
           toast.success(relayMapPublishingRes)
         }
@@ -193,6 +291,29 @@ export const RelaysPage = () => {
     }
   }
 
+  // Handle relay open and close state
+  const handleRelayInfo = (relay: string) => {
+    if (relaysInfo) {
+      const info = relaysInfo[relay]
+
+      if (info) {
+        let displayRelaysInfoCopy: string[] = JSON.parse(
+          JSON.stringify(displayRelaysInfo)
+        )
+
+        if (displayRelaysInfoCopy.includes(relay)) {
+          displayRelaysInfoCopy = displayRelaysInfoCopy.filter(
+            (rel) => rel !== relay
+          )
+        } else {
+          displayRelaysInfoCopy.push(relay)
+        }
+
+        setDisplayRelaysInfo(displayRelaysInfoCopy)
+      }
+    }
+  }
+
   return (
     <Container className={styles.container}>
       <Box className={styles.relayAddContainer}>
@@ -221,214 +342,177 @@ export const RelaysPage = () => {
       </Box>
       {relayMap && (
         <Box className={styles.relaysContainer}>
-          {Object.keys(relayMap).map((relay) => (
-            <RelayItem
-              key={relay}
-              relayURI={relay}
-              isWriteRelay={relayMap[relay].write}
-              relayInfo={relaysInfo ? relaysInfo[relay] : undefined}
-              handleLeaveRelay={handleLeaveRelay}
-              handleRelayWriteChange={handleRelayWriteChange}
-            />
+          {Object.keys(relayMap).map((relay, i) => (
+            <Box className={styles.relay} key={`relay_${i}`}>
+              <List>
+                <ListItem>
+                  <span
+                    className={[
+                      styles.connectionStatus,
+                      relaysConnectionStatus
+                        ? relaysConnectionStatus[relay] ===
+                          RelayConnectionState.Connected
+                          ? styles.connectionStatusConnected
+                          : styles.connectionStatusNotConnected
+                        : styles.connectionStatusUnknown
+                    ].join(' ')}
+                  />
+                  {relaysInfo &&
+                    relaysInfo[relay] &&
+                    relaysInfo[relay].limitation &&
+                    relaysInfo[relay].limitation?.payment_required && (
+                      <Tooltip title="Paid Relay" arrow placement="top">
+                        <ElectricBoltIcon
+                          className={styles.lightningIcon}
+                          color="warning"
+                          onClick={() => handleRelayInfo(relay)}
+                        />
+                      </Tooltip>
+                    )}
+
+                  <ListItemText primary={relay} />
+
+                  <Box
+                    className={styles.leaveRelayContainer}
+                    onClick={() => handleLeaveRelay(relay)}
+                  >
+                    <LogoutIcon />
+                    <span>Leave</span>
+                  </Box>
+                </ListItem>
+                <Divider className={styles.relayDivider} />
+                <ListItem>
+                  <ListItemText
+                    primary="Publish to this relay?"
+                    secondary={
+                      relaysInfo && relaysInfo[relay] ? (
+                        <span
+                          onClick={() => handleRelayInfo(relay)}
+                          className={styles.showInfo}
+                        >
+                          Show info{' '}
+                          {displayRelaysInfo.includes(relay) ? (
+                            <KeyboardArrowUpIcon
+                              className={styles.showInfoIcon}
+                            />
+                          ) : (
+                            <KeyboardArrowDownIcon
+                              className={styles.showInfoIcon}
+                            />
+                          )}
+                        </span>
+                      ) : (
+                        ''
+                      )
+                    }
+                  />
+                  <Switch
+                    checked={relayMap[relay].write}
+                    onChange={(event) => handleRelayWriteChange(relay, event)}
+                  />
+                </ListItem>
+                {displayRelaysInfo.includes(relay) && (
+                  <>
+                    <Divider className={styles.relayDivider} />
+                    <ListItem>
+                      <Box className={styles.relayInfoContainer}>
+                        {relaysInfo &&
+                          relaysInfo[relay] &&
+                          Object.keys(relaysInfo[relay]).map((key: string) => {
+                            const infoTitle = capitalizeFirstLetter(
+                              key.replace('_', ' ')
+                            )
+                            let infoValue = (relaysInfo[relay] as any)[key]
+
+                            switch (key) {
+                              case 'pubkey':
+                                infoValue = shorten(hexToNpub(infoValue), 15)
+
+                                break
+
+                              case 'limitation':
+                                infoValue = (
+                                  <ul key={`${i}_${key}`}>
+                                    {Object.keys(infoValue).map((valueKey) => (
+                                      <li key={`${i}_${key}_${valueKey}`}>
+                                        <span
+                                          className={styles.relayInfoSubTitle}
+                                        >
+                                          {capitalizeFirstLetter(
+                                            valueKey.split('_').join(' ')
+                                          )}
+                                          :
+                                        </span>{' '}
+                                        {`${infoValue[valueKey]}`}
+                                      </li>
+                                    ))}
+                                  </ul>
+                                )
+
+                                break
+
+                              case 'fees':
+                                infoValue = (
+                                  <ul>
+                                    {Object.keys(infoValue).map((valueKey) => (
+                                      <li key={`${i}_${key}_${valueKey}`}>
+                                        <span
+                                          className={styles.relayInfoSubTitle}
+                                        >
+                                          {capitalizeFirstLetter(
+                                            valueKey.split('_').join(' ')
+                                          )}
+                                          :
+                                        </span>{' '}
+                                        {`${infoValue[valueKey].map((fee: RelayFee) => `${fee.amount} ${fee.unit}`)}`}
+                                      </li>
+                                    ))}
+                                  </ul>
+                                )
+                                break
+                              default:
+                                break
+                            }
+
+                            if (Array.isArray(infoValue)) {
+                              infoValue = infoValue.join(', ')
+                            }
+
+                            return (
+                              <span key={`${i}_${key}_container`}>
+                                <span className={styles.relayInfoTitle}>
+                                  {infoTitle}:
+                                </span>{' '}
+                                {infoValue}
+                                {key === 'pubkey' ? (
+                                  <ContentCopyIcon
+                                    className={styles.copyItem}
+                                    onClick={() => {
+                                      navigator.clipboard.writeText(
+                                        hexToNpub(
+                                          (relaysInfo[relay] as any)[key]
+                                        )
+                                      )
+
+                                      toast.success('Copied to clipboard', {
+                                        autoClose: 1000,
+                                        hideProgressBar: true
+                                      })
+                                    }}
+                                  />
+                                ) : null}
+                              </span>
+                            )
+                          })}
+                      </Box>
+                    </ListItem>
+                  </>
+                )}
+              </List>
+            </Box>
           ))}
         </Box>
       )}
-      <Footer />
     </Container>
   )
 }
-
-type RelayItemProp = {
-  relayURI: string
-  isWriteRelay: boolean
-  relayInfo?: RelayInfo
-  handleLeaveRelay: (relay: string) => void
-  handleRelayWriteChange: (
-    relay: string,
-    event: React.ChangeEvent<HTMLInputElement>
-  ) => Promise<void>
-}
-
-const RelayItem = ({
-  relayURI,
-  isWriteRelay,
-  relayInfo,
-  handleLeaveRelay,
-  handleRelayWriteChange
-}: RelayItemProp) => {
-  const [relayConnectionStatus, setRelayConnectionStatus] =
-    useState<RelayConnectionState>()
-
-  const [displayRelayInfo, setDisplayRelayInfo] = useState(false)
-
-  useDidMount(() => {
-    relayController.connectRelay(relayURI).then((relay) => {
-      if (relay && relay.connected) {
-        setRelayConnectionStatus(RelayConnectionState.Connected)
-      } else {
-        setRelayConnectionStatus(RelayConnectionState.NotConnected)
-      }
-    })
-  })
-
-  return (
-    <>
-      <Box className={styles.relay}>
-        <List>
-          <ListItem>
-            <span
-              className={[
-                styles.connectionStatus,
-                relayConnectionStatus
-                  ? relayConnectionStatus === RelayConnectionState.Connected
-                    ? styles.connectionStatusConnected
-                    : styles.connectionStatusNotConnected
-                  : styles.connectionStatusUnknown
-              ].join(' ')}
-            />
-            {relayInfo &&
-              relayInfo.limitation &&
-              relayInfo.limitation?.payment_required && (
-                <Tooltip title="Paid Relay" arrow placement="top">
-                  <ElectricBoltIcon
-                    className={styles.lightningIcon}
-                    color="warning"
-                    onClick={() => setDisplayRelayInfo((prev) => !prev)}
-                  />
-                </Tooltip>
-              )}
-
-            <ListItemText primary={relayURI} />
-
-            <Box
-              className={styles.leaveRelayContainer}
-              onClick={() => handleLeaveRelay(relayURI)}
-            >
-              <LogoutIcon />
-              <span>Leave</span>
-            </Box>
-          </ListItem>
-          <Divider className={styles.relayDivider} />
-          <ListItem>
-            <ListItemText
-              primary="Publish to this relay?"
-              secondary={
-                relayInfo ? (
-                  <span
-                    onClick={() => setDisplayRelayInfo((prev) => !prev)}
-                    className={styles.showInfo}
-                  >
-                    Show info{' '}
-                    {displayRelayInfo ? (
-                      <KeyboardArrowUpIcon className={styles.showInfoIcon} />
-                    ) : (
-                      <KeyboardArrowDownIcon className={styles.showInfoIcon} />
-                    )}
-                  </span>
-                ) : (
-                  ''
-                )
-              }
-            />
-            <Switch
-              checked={isWriteRelay}
-              onChange={(event) => handleRelayWriteChange(relayURI, event)}
-            />
-          </ListItem>
-          {displayRelayInfo && (
-            <>
-              <Divider className={styles.relayDivider} />
-              <ListItem>
-                <Box className={styles.relayInfoContainer}>
-                  {relayInfo &&
-                    Object.keys(relayInfo).map((key: string) => {
-                      const infoTitle = capitalizeFirstLetter(
-                        key.replace('_', ' ')
-                      )
-                      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                      let infoValue = (relayInfo as any)[key]
-
-                      switch (key) {
-                        case 'pubkey':
-                          infoValue = shorten(hexToNpub(infoValue), 15)
-
-                          break
-
-                        case 'limitation':
-                          infoValue = (
-                            <ul>
-                              {Object.keys(infoValue).map((valueKey) => (
-                                <li key={`${relayURI}_${key}_${valueKey}`}>
-                                  <span className={styles.relayInfoSubTitle}>
-                                    {capitalizeFirstLetter(
-                                      valueKey.split('_').join(' ')
-                                    )}
-                                    :
-                                  </span>{' '}
-                                  {`${infoValue[valueKey]}`}
-                                </li>
-                              ))}
-                            </ul>
-                          )
-
-                          break
-
-                        case 'fees':
-                          infoValue = (
-                            <ul>
-                              {Object.keys(infoValue).map((valueKey) => (
-                                <li key={`${relayURI}_${key}_${valueKey}`}>
-                                  <span className={styles.relayInfoSubTitle}>
-                                    {capitalizeFirstLetter(
-                                      valueKey.split('_').join(' ')
-                                    )}
-                                    :
-                                  </span>{' '}
-                                  {`${infoValue[valueKey].map((fee: RelayFee) => `${fee.amount} ${fee.unit}`)}`}
-                                </li>
-                              ))}
-                            </ul>
-                          )
-                          break
-                        default:
-                          break
-                      }
-
-                      if (Array.isArray(infoValue)) {
-                        infoValue = infoValue.join(', ')
-                      }
-
-                      return (
-                        <span key={`${relayURI}_${key}_container`}>
-                          <span className={styles.relayInfoTitle}>
-                            {infoTitle}:
-                          </span>{' '}
-                          {infoValue}
-                          {key === 'pubkey' ? (
-                            <ContentCopyIcon
-                              className={styles.copyItem}
-                              onClick={() => {
-                                navigator.clipboard.writeText(
-                                  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                                  hexToNpub((relayInfo as any)[key])
-                                )
-
-                                toast.success('Copied to clipboard', {
-                                  autoClose: 1000,
-                                  hideProgressBar: true
-                                })
-                              }}
-                            />
-                          ) : null}
-                        </span>
-                      )
-                    })}
-                </Box>
-              </ListItem>
-            </>
-          )}
-        </List>
-      </Box>
-    </>
-  )
-}

src/pages/sign/MarkFormField.tsx

@@ -0,0 +1,37 @@
+import { CurrentUserMark } from '../../types/mark.ts'
+import styles from './style.module.scss'
+import { Box, Button, TextField } from '@mui/material'
+
+import { MARK_TYPE_TRANSLATION } from '../../utils/const.ts'
+
+interface MarkFormFieldProps {
+  handleSubmit: (event: any) => void
+  handleChange: (event: any) => void
+  selectedMark: CurrentUserMark
+  selectedMarkValue: string
+}
+
+/**
+ * Responsible for rendering a form field connected to a mark and keeping track of its value.
+ */
+const MarkFormField = (props: MarkFormFieldProps) => {
+  const { handleSubmit, handleChange, selectedMark, selectedMarkValue } = props;
+  const getSubmitButton = () => selectedMark.isLast ? 'Complete' : 'Next';
+  return (
+    <div className={styles.fixedBottomForm}>
+      <Box component="form" onSubmit={handleSubmit}>
+        <TextField
+          id="mark-value"
+          label={MARK_TYPE_TRANSLATION[selectedMark.mark.type.valueOf()]}
+          value={selectedMarkValue}
+          onChange={handleChange}
+        />
+        <Button type="submit" variant="contained">
+          {getSubmitButton()}
+        </Button>
+      </Box>
+    </div>
+  )
+}
+
+export default MarkFormField;

src/pages/sign/index.tsx

@@ -5,56 +5,45 @@ import JSZip from 'jszip'
 import _ from 'lodash'
 import { MuiFileInput } from 'mui-file-input'
 import { Event, verifyEvent } from 'nostr-tools'
-import { useCallback, useEffect, useState } from 'react'
-import { useAppSelector } from '../../hooks/store'
-import { useLocation, useNavigate, useParams } from 'react-router-dom'
+import { useEffect, useState } from 'react'
+import { useSelector } from 'react-redux'
+import { useLocation, useNavigate } from 'react-router-dom'
 import { toast } from 'react-toastify'
 import { LoadingSpinner } from '../../components/LoadingSpinner'
 import { NostrController } from '../../controllers'
 import { appPublicRoutes } from '../../routes'
+import { State } from '../../store/rootReducer'
 import { CreateSignatureEventContent, Meta, SignedEvent } from '../../types'
 import {
   decryptArrayBuffer,
-  encryptArrayBuffer,
-  extractMarksFromSignedMeta,
+  encryptArrayBuffer, extractMarksFromSignedMeta,
   extractZipUrlAndEncryptionKey,
   generateEncryptionKey,
-  generateKeysFile,
-  getCurrentUserFiles,
+  generateKeysFile, getFilesWithHashes,
   getHash,
   hexToNpub,
-  isOnline,
-  loadZip,
-  unixNow,
+  isOnline, loadZip,
+  now,
   npubToHex,
   parseJson,
   readContentOfZipEntry,
   sendNotification,
   signEventForMetaFile,
-  updateUsersAppData,
-  findOtherUserMarks,
-  timeout
+  updateUsersAppData
 } from '../../utils'
 import { Container } from '../../components/Container'
 import { DisplayMeta } from './internal/displayMeta'
 import styles from './style.module.scss'
+import { PdfFile } from '../../types/drawing.ts'
+import { convertToPdfFile } from '../../utils/pdf.ts'
 import { CurrentUserMark, Mark } from '../../types/mark.ts'
-import { getLastSignersSig, isFullySigned } from '../../utils/sign.ts'
+import { getLastSignersSig } from '../../utils/sign.ts'
 import {
   filterMarksByPubkey,
   getCurrentUserMarks,
-  isCurrentUserMarksComplete,
-  updateMarks
+  isCurrentUserMarksComplete, updateMarks
 } from '../../utils'
 import PdfMarking from '../../components/PDFView/PdfMarking.tsx'
-import {
-  convertToSigitFile,
-  getZipWithFiles,
-  SigitFile
-} from '../../utils/file.ts'
-import { ARRAY_BUFFER, DEFLATE } from '../../utils/const.ts'
-import { generateTimestamp } from '../../utils/opentimestamps.ts'
-
 enum SignedStatus {
   Fully_Signed,
   User_Is_Next_Signer,
@@ -64,45 +53,23 @@ enum SignedStatus {
 export const SignPage = () => {
   const navigate = useNavigate()
   const location = useLocation()
-  const params = useParams()
-
-  const usersAppData = useAppSelector((state) => state.userAppData)
 
   /**
-   * Received from `location.state`
-   *
    * uploadedZip will be received from home page when a user uploads a sigit zip wrapper that contains keys.json
-   * arrayBuffer (decryptedArrayBuffer) will be received in navigation from create page in offline mode
-   * meta (metaInNavState) will be received in navigation from create & home page in online mode
+   * arrayBuffer will be received in navigation from create page in offline mode
+   * meta will be received in navigation from create & home page in online mode
    */
-  let metaInNavState = location?.state?.meta || undefined
-  const { arrayBuffer: decryptedArrayBuffer, uploadedZip } = location.state || {
-    decryptedArrayBuffer: undefined,
-    uploadedZip: undefined
-  }
-
-  /**
-   * If userAppData (redux) is available, and we have the route param (sigit id)
-   * which is actually a `createEventId`, we will fetch a `sigit`
-   * based on the provided route ID and set fetched `sigit` to the `metaInNavState`
-   */
-  if (usersAppData) {
-    const sigitCreateId = params.id
-
-    if (sigitCreateId) {
-      const sigit = usersAppData.sigits[sigitCreateId]
-
-      if (sigit) {
-        metaInNavState = sigit
-      }
-    }
-  }
+  const {
+    meta: metaInNavState,
+    arrayBuffer: decryptedArrayBuffer,
+    uploadedZip
+  } = location.state || {}
 
   const [displayInput, setDisplayInput] = useState(false)
 
   const [selectedFile, setSelectedFile] = useState<File | null>(null)
 
-  const [files, setFiles] = useState<{ [filename: string]: SigitFile }>({})
+  const [files, setFiles] = useState<{ [filename: string]: PdfFile }>({})
 
   const [isLoading, setIsLoading] = useState(true)
   const [loadingSpinnerDesc, setLoadingSpinnerDesc] = useState('')
@@ -114,7 +81,7 @@ export const SignPage = () => {
 
   const [signers, setSigners] = useState<`npub1${string}`[]>([])
   const [viewers, setViewers] = useState<`npub1${string}`[]>([])
-  const [marks, setMarks] = useState<Mark[]>([])
+  const [marks, setMarks] = useState<Mark[] >([])
   const [creatorFileHashes, setCreatorFileHashes] = useState<{
     [key: string]: string
   }>({})
@@ -129,19 +96,17 @@ export const SignPage = () => {
   // This state variable indicates whether the logged-in user is a signer, a creator, or neither.
   const [isSignerOrCreator, setIsSignerOrCreator] = useState(false)
 
-  const usersPubkey = useAppSelector((state) => state.auth.usersPubkey)
+  const usersPubkey = useSelector((state: State) => state.auth.usersPubkey)
 
+  const [authUrl, setAuthUrl] = useState<string>()
   const nostrController = NostrController.getInstance()
-  const [currentUserMarks, setCurrentUserMarks] = useState<CurrentUserMark[]>(
-    []
-  )
-  const [isMarksCompleted, setIsMarksCompleted] = useState(false)
-  const [otherUserMarks, setOtherUserMarks] = useState<Mark[]>([])
+  const [currentUserMarks, setCurrentUserMarks] = useState<CurrentUserMark[]>([]);
+  const [isReadyToSign, setIsReadyToSign] = useState(false);
 
   useEffect(() => {
     if (signers.length > 0) {
       // check if all signers have signed then its fully signed
-      if (isFullySigned(signers, signedBy)) {
+      if (signers.every((signer) => signedBy.includes(signer))) {
         setSignedStatus(SignedStatus.Fully_Signed)
       } else {
         for (const signer of signers) {
@@ -227,19 +192,15 @@ export const SignPage = () => {
       setViewers(createSignatureContent.viewers)
       setCreatorFileHashes(createSignatureContent.fileHashes)
       setSubmittedBy(createSignatureEvent.pubkey)
-      setMarks(createSignatureContent.markConfig)
+      setMarks(createSignatureContent.markConfig);
 
       if (usersPubkey) {
-        const metaMarks = filterMarksByPubkey(
-          createSignatureContent.markConfig,
-          usersPubkey!
-        )
+        const metaMarks = filterMarksByPubkey(createSignatureContent.markConfig, usersPubkey!)
         const signedMarks = extractMarksFromSignedMeta(meta)
-        const currentUserMarks = getCurrentUserMarks(metaMarks, signedMarks)
-        const otherUserMarks = findOtherUserMarks(signedMarks, usersPubkey!)
-        setOtherUserMarks(otherUserMarks)
-        setCurrentUserMarks(currentUserMarks)
-        setIsMarksCompleted(isCurrentUserMarksComplete(currentUserMarks))
+        const currentUserMarks = getCurrentUserMarks(metaMarks, signedMarks);
+        setCurrentUserMarks(currentUserMarks);
+        // setCurrentUserMark(findNextCurrentUserMark(currentUserMarks) || null)
+        setIsReadyToSign(isCurrentUserMarksComplete(currentUserMarks))
       }
 
       setSignedBy(Object.keys(meta.docSignatures) as `npub1${string}`[])
@@ -248,87 +209,7 @@ export const SignPage = () => {
     if (meta) {
       handleUpdatedMeta(meta)
     }
-  }, [meta, usersPubkey])
-
-  const handleDownload = async () => {
-    if (Object.entries(files).length === 0 || !meta || !usersPubkey) return
-    setLoadingSpinnerDesc('Generating file')
-    try {
-      const zip = await getZipWithFiles(meta, files)
-      const arrayBuffer = await zip.generateAsync({
-        type: ARRAY_BUFFER,
-        compression: DEFLATE,
-        compressionOptions: {
-          level: 6
-        }
-      })
-      if (!arrayBuffer) return
-      const blob = new Blob([arrayBuffer])
-      saveAs(blob, `exported-${unixNow()}.sigit.zip`)
-    } catch (error) {
-      console.log('error in zip:>> ', error)
-      if (error instanceof Error) {
-        toast.error(error.message || 'Error occurred in generating zip file')
-      }
-    }
-  }
-
-  const decrypt = useCallback(
-    async (file: File) => {
-      setLoadingSpinnerDesc('Decrypting file')
-
-      const zip = await loadZip(file)
-      if (!zip) return
-
-      const parsedKeysJson = await parseKeysJson(zip)
-      if (!parsedKeysJson) return
-
-      const encryptedArrayBuffer = await readContentOfZipEntry(
-        zip,
-        'compressed.sigit',
-        'arraybuffer'
-      )
-
-      if (!encryptedArrayBuffer) return
-
-      const { keys, sender } = parsedKeysJson
-
-      for (const key of keys) {
-        // decrypt the encryptionKey, with timeout (duration = 60 seconds)
-        const encryptionKey = await Promise.race([
-          nostrController.nip04Decrypt(sender, key),
-          timeout(60000)
-        ])
-          .then((res) => {
-            return res
-          })
-          .catch((err) => {
-            console.log('err :>> ', err)
-            return null
-          })
-
-        // Return if encryption failed
-        if (!encryptionKey) continue
-
-        const arrayBuffer = await decryptArrayBuffer(
-          encryptedArrayBuffer,
-          encryptionKey
-        )
-          .catch((err) => {
-            console.log('err in decryption:>> ', err)
-            return null
-          })
-          .finally(() => {
-            setIsLoading(false)
-          })
-
-        if (arrayBuffer) return arrayBuffer
-      }
-
-      return null
-    },
-    [nostrController]
-  )
+  }, [meta])
 
   useEffect(() => {
     // online mode - from create and home page views
@@ -386,7 +267,7 @@ export const SignPage = () => {
       setIsLoading(false)
       setDisplayInput(true)
     }
-  }, [decryptedArrayBuffer, uploadedZip, metaInNavState, decrypt])
+  }, [decryptedArrayBuffer, uploadedZip, metaInNavState])
 
   const handleArrayBufferFromBlossom = async (
     arrayBuffer: ArrayBuffer,
@@ -412,7 +293,7 @@ export const SignPage = () => {
       return
     }
 
-    const files: { [filename: string]: SigitFile } = {}
+    const files: { [filename: string]: PdfFile } = {}
     const fileHashes: { [key: string]: string | null } = {}
     const fileNames = Object.values(zip.files).map((entry) => entry.name)
 
@@ -426,7 +307,8 @@ export const SignPage = () => {
       )
 
       if (arrayBuffer) {
-        files[fileName] = await convertToSigitFile(arrayBuffer, fileName)
+        files[fileName] = await convertToPdfFile(arrayBuffer, fileName);
+
         const hash = await getHash(arrayBuffer)
         if (hash) {
           fileHashes[fileName] = hash
@@ -463,6 +345,75 @@ export const SignPage = () => {
     })
   }
 
+  const decrypt = async (file: File) => {
+    setLoadingSpinnerDesc('Decrypting file')
+
+    const zip = await loadZip(file);
+    if (!zip) return
+
+    const parsedKeysJson = await parseKeysJson(zip)
+    if (!parsedKeysJson) return
+
+    const encryptedArrayBuffer = await readContentOfZipEntry(
+      zip,
+      'compressed.sigit',
+      'arraybuffer'
+    )
+
+    if (!encryptedArrayBuffer) return
+
+    const { keys, sender } = parsedKeysJson
+
+    for (const key of keys) {
+      // Set up event listener for authentication event
+      nostrController.on('nsecbunker-auth', (url) => {
+        setAuthUrl(url)
+      })
+
+      // Set up timeout promise to handle encryption timeout
+      const timeoutPromise = new Promise<never>((_, reject) => {
+        setTimeout(() => {
+          reject(new Error('Timeout occurred'))
+        }, 60000) // Timeout duration = 60 seconds
+      })
+
+      // decrypt the encryptionKey, with timeout
+      const encryptionKey = await Promise.race([
+        nostrController.nip04Decrypt(sender, key),
+        timeoutPromise
+      ])
+        .then((res) => {
+          return res
+        })
+        .catch((err) => {
+          console.log('err :>> ', err)
+          return null
+        })
+        .finally(() => {
+          setAuthUrl(undefined) // Clear authentication URL
+        })
+
+      // Return if encryption failed
+      if (!encryptionKey) continue
+
+      const arrayBuffer = await decryptArrayBuffer(
+        encryptedArrayBuffer,
+        encryptionKey
+      )
+        .catch((err) => {
+          console.log('err in decryption:>> ', err)
+          return null
+        })
+        .finally(() => {
+          setIsLoading(false)
+        })
+
+      if (arrayBuffer) return arrayBuffer
+    }
+
+    return null
+  }
+
   const handleDecryptedArrayBuffer = async (arrayBuffer: ArrayBuffer) => {
     const decryptedZipFile = new File([arrayBuffer], 'decrypted.zip')
 
@@ -471,25 +422,25 @@ export const SignPage = () => {
     const zip = await loadZip(decryptedZipFile)
     if (!zip) return
 
-    const files: { [filename: string]: SigitFile } = {}
+    const files: { [filename: string]: PdfFile } = {}
     const fileHashes: { [key: string]: string | null } = {}
     const fileNames = Object.values(zip.files)
       .filter((entry) => entry.name.startsWith('files/') && !entry.dir)
       .map((entry) => entry.name)
+      .map((entry) => entry.replace(/^files\//, ''))
 
-    for (const zipFilePath of fileNames) {
+    // generate hashes for all entries in files folder of zipArchive
+    // these hashes can be used to verify the originality of files
+    for (const fileName of fileNames) {
       const arrayBuffer = await readContentOfZipEntry(
         zip,
-        zipFilePath,
+        fileName,
         'arraybuffer'
       )
 
-      const fileName = zipFilePath.replace(/^files\//, '')
       if (arrayBuffer) {
-        files[fileName] = await convertToSigitFile(arrayBuffer, fileName)
+        files[fileName] = await convertToPdfFile(arrayBuffer, fileName);
 
-        // generate hashes for all entries in files folder of zipArchive
-        // these hashes can be used to verify the originality of files
         const hash = await getHash(arrayBuffer)
         if (hash) {
           fileHashes[fileName] = hash
@@ -537,11 +488,7 @@ export const SignPage = () => {
     setIsLoading(true)
     const arrayBuffer = await decrypt(selectedFile)
 
-    if (!arrayBuffer) {
-      setIsLoading(false)
-      toast.error('Error decrypting file')
-      return
-    }
+    if (!arrayBuffer) return
 
     handleDecryptedArrayBuffer(arrayBuffer)
   }
@@ -554,27 +501,16 @@ export const SignPage = () => {
     setLoadingSpinnerDesc('Signing nostr event')
 
     const prevSig = getPrevSignersSig(hexToNpub(usersPubkey!))
-    if (!prevSig) {
-      setIsLoading(false)
-      toast.error('Previous signature is invalid')
-      return
-    }
+    if (!prevSig) return
 
-    const marks = getSignerMarksForMeta() || []
+    const marks = getSignerMarksForMeta()
+    if (!marks) return
 
     const signedEvent = await signEventForMeta({ prevSig, marks })
     if (!signedEvent) return
 
     const updatedMeta = updateMetaSignatures(meta, signedEvent)
 
-    setLoadingSpinnerDesc('Generating an open timestamp.')
-
-    const timestamp = await generateTimestamp(signedEvent.id)
-    if (timestamp) {
-      updatedMeta.timestamps = [...(updatedMeta.timestamps || []), timestamp]
-      updatedMeta.modifiedAt = unixNow()
-    }
-
     if (await isOnline()) {
       await handleOnlineFlow(updatedMeta)
     } else {
@@ -584,10 +520,7 @@ export const SignPage = () => {
   }
 
   // Sign the event for the meta file
-  const signEventForMeta = async (signerContent: {
-    prevSig: string
-    marks: Mark[]
-  }) => {
+  const signEventForMeta = async (signerContent: { prevSig: string, marks: Mark[] }) => {
     return await signEventForMetaFile(
       JSON.stringify(signerContent),
       nostrController,
@@ -596,8 +529,8 @@ export const SignPage = () => {
   }
 
   const getSignerMarksForMeta = (): Mark[] | undefined => {
-    if (currentUserMarks.length === 0) return
-    return currentUserMarks.map(({ mark }: CurrentUserMark) => mark)
+    if (currentUserMarks.length === 0) return;
+    return currentUserMarks.map(( { mark }: CurrentUserMark) => mark);
   }
 
   // Update the meta signatures
@@ -607,7 +540,7 @@ export const SignPage = () => {
       ...metaCopy.docSignatures,
       [hexToNpub(signedEvent.pubkey)]: JSON.stringify(signedEvent, null, 2)
     }
-    metaCopy.modifiedAt = unixNow()
+    metaCopy.modifiedAt = now()
     return metaCopy
   }
 
@@ -617,6 +550,7 @@ export const SignPage = () => {
     encryptionKey: string
   ): Promise<File | null> => {
     // Get the current timestamp in seconds
+    const unixNow = now()
     const blob = new Blob([encryptedArrayBuffer])
     // Create a File object with the Blob data
     const file = new File([blob], `compressed.sigit`, {
@@ -666,18 +600,20 @@ export const SignPage = () => {
 
     if (!arraybuffer) return null
 
-    return new File([new Blob([arraybuffer])], `${unixNow()}.sigit.zip`, {
-      type: 'application/zip'
-    })
+    return new File(
+      [new Blob([arraybuffer])],
+      `${unixNow}.sigit.zip`,
+      {
+        type: 'application/zip'
+      }
+    )
   }
 
   // Handle errors during zip file generation
-  const handleZipError = (err: unknown) => {
+  const handleZipError = (err: any) => {
     console.log('Error in zip:>> ', err)
     setIsLoading(false)
-    if (err instanceof Error) {
-      toast.error(err.message || 'Error occurred in generating zip file')
-    }
+    toast.error(err.message || 'Error occurred in generating zip file')
     return null
   }
 
@@ -758,7 +694,7 @@ export const SignPage = () => {
     setIsLoading(true)
     setLoadingSpinnerDesc('Signing nostr event')
 
-    if (!meta) return
+    if (!meta) return;
 
     const prevSig = getLastSignersSig(meta, signers)
     if (!prevSig) return
@@ -784,9 +720,14 @@ export const SignPage = () => {
       2
     )
 
-    const zip = await getZipWithFiles(meta, files)
+    const zip = new JSZip()
+
     zip.file('meta.json', stringifiedMeta)
 
+    Object.entries(files).forEach(([fileName, arrayBuffer]) => {
+      zip.file(`files/${fileName}`, arrayBuffer)
+    })
+
     const arrayBuffer = await zip
       .generateAsync({
         type: 'arraybuffer',
@@ -805,21 +746,27 @@ export const SignPage = () => {
     if (!arrayBuffer) return
 
     const blob = new Blob([arrayBuffer])
-    saveAs(blob, `exported-${unixNow()}.sigit.zip`)
+    const unixNow = now()
+    saveAs(blob, `exported-${unixNow}.sigit.zip`)
 
     setIsLoading(false)
 
     navigate(appPublicRoutes.verify)
   }
 
-  const handleEncryptedExport = async () => {
+  const handleExportSigit = async () => {
     if (Object.entries(files).length === 0 || !meta) return
 
+    const zip = new JSZip()
+
     const stringifiedMeta = JSON.stringify(meta, null, 2)
-    const zip = await getZipWithFiles(meta, files)
 
     zip.file('meta.json', stringifiedMeta)
 
+    Object.entries(files).forEach(([fileName, arrayBuffer]) => {
+      zip.file(`files/${fileName}`, arrayBuffer)
+    })
+
     const arrayBuffer = await zip
       .generateAsync({
         type: 'arraybuffer',
@@ -845,7 +792,8 @@ export const SignPage = () => {
     const finalZipFile = await createFinalZipFile(encryptedArrayBuffer, key)
 
     if (!finalZipFile) return
-    saveAs(finalZipFile, `exported-${unixNow()}.sigit.zip`)
+    const unixNow = now()
+    saveAs(finalZipFile, `exported-${unixNow}.sigit.zip`)
   }
 
   /**
@@ -881,94 +829,100 @@ export const SignPage = () => {
     }
   }
 
-  if (isLoading) {
-    return <LoadingSpinner desc={loadingSpinnerDesc} />
-  }
-
-  if (!isMarksCompleted && signedStatus === SignedStatus.User_Is_Next_Signer) {
+  if (authUrl) {
     return (
-      <PdfMarking
-        files={getCurrentUserFiles(files, currentFileHashes, creatorFileHashes)}
-        currentUserMarks={currentUserMarks}
-        setIsMarksCompleted={setIsMarksCompleted}
-        setCurrentUserMarks={setCurrentUserMarks}
-        setUpdatedMarks={setUpdatedMarks}
-        handleDownload={handleDownload}
-        otherUserMarks={otherUserMarks}
-        meta={meta}
+      <iframe
+        title="Nsecbunker auth"
+        src={authUrl}
+        width="100%"
+        height="500px"
       />
     )
   }
 
-  return (
-    <>
-      <Container className={styles.container}>
-        {displayInput && (
-          <>
-            <Typography component="label" variant="h6">
-              Select sigit file
-            </Typography>
+  if (isLoading) {
+    return <LoadingSpinner desc={loadingSpinnerDesc} />
+  }
 
-            <Box className={styles.inputBlock}>
-              <MuiFileInput
-                placeholder="Select file"
-                inputProps={{ accept: '.sigit.zip' }}
-                value={selectedFile}
-                onChange={(value) => setSelectedFile(value)}
+  if (isReadyToSign) {
+    return (
+      <>
+        <Container className={styles.container}>
+          {displayInput && (
+            <>
+              <Typography component="label" variant="h6">
+                Select sigit file
+              </Typography>
+
+              <Box className={styles.inputBlock}>
+                <MuiFileInput
+                  placeholder="Select file"
+                  inputProps={{ accept: '.sigit.zip' }}
+                  value={selectedFile}
+                  onChange={(value) => setSelectedFile(value)}
+                />
+              </Box>
+
+              {selectedFile && (
+                <Box sx={{ mt: 2, display: 'flex', justifyContent: 'center' }}>
+                  <Button onClick={handleDecrypt} variant="contained">
+                    Decrypt
+                  </Button>
+                </Box>
+              )}
+            </>
+          )}
+
+          {submittedBy && Object.entries(files).length > 0 && meta && (
+            <>
+              <DisplayMeta
+                meta={meta}
+                files={files}
+                submittedBy={submittedBy}
+                signers={signers}
+                viewers={viewers}
+                creatorFileHashes={creatorFileHashes}
+                currentFileHashes={currentFileHashes}
+                signedBy={signedBy}
+                nextSigner={nextSinger}
+                getPrevSignersSig={getPrevSignersSig}
               />
-            </Box>
 
-            {selectedFile && (
-              <Box sx={{ mt: 2, display: 'flex', justifyContent: 'center' }}>
-                <Button onClick={handleDecrypt} variant="contained">
-                  Decrypt
-                </Button>
-              </Box>
-            )}
-          </>
-        )}
+              {signedStatus === SignedStatus.Fully_Signed && (
+                <Box sx={{ mt: 1, display: 'flex', justifyContent: 'center' }}>
+                  <Button onClick={handleExport} variant="contained">
+                    Export
+                  </Button>
+                </Box>
+              )}
 
-        {submittedBy && Object.entries(files).length > 0 && meta && (
-          <>
-            <DisplayMeta
-              meta={meta}
-              files={files}
-              submittedBy={submittedBy}
-              signers={signers}
-              viewers={viewers}
-              creatorFileHashes={creatorFileHashes}
-              currentFileHashes={currentFileHashes}
-              signedBy={signedBy}
-              nextSigner={nextSinger}
-              getPrevSignersSig={getPrevSignersSig}
-            />
+              {signedStatus === SignedStatus.User_Is_Next_Signer && (
+                <Box sx={{ mt: 1, display: 'flex', justifyContent: 'center' }}>
+                  <Button onClick={handleSign} variant="contained">
+                    Sign
+                  </Button>
+                </Box>
+              )}
 
-            {signedStatus === SignedStatus.Fully_Signed && (
-              <Box sx={{ mt: 1, display: 'flex', justifyContent: 'center' }}>
-                <Button onClick={handleExport} variant="contained">
-                  Export Sigit
-                </Button>
-              </Box>
-            )}
+              {isSignerOrCreator && (
+                <Box sx={{ mt: 1, display: 'flex', justifyContent: 'center' }}>
+                  <Button onClick={handleExportSigit} variant="contained">
+                    Export Sigit
+                  </Button>
+                </Box>
+              )}
+            </>
+          )}
+        </Container>
+      </>
+    )
+  }
 
-            {signedStatus === SignedStatus.User_Is_Next_Signer && (
-              <Box sx={{ mt: 1, display: 'flex', justifyContent: 'center' }}>
-                <Button onClick={handleSign} variant="contained">
-                  Sign
-                </Button>
-              </Box>
-            )}
-
-            {isSignerOrCreator && (
-              <Box sx={{ mt: 1, display: 'flex', justifyContent: 'center' }}>
-                <Button onClick={handleEncryptedExport} variant="contained">
-                  Export Encrypted Sigit
-                </Button>
-              </Box>
-            )}
-          </>
-        )}
-      </Container>
-    </>
-  )
+  return <PdfMarking
+    files={getFilesWithHashes(files, currentFileHashes)}
+    currentUserMarks={currentUserMarks}
+    setIsReadyToSign={setIsReadyToSign}
+    setCurrentUserMarks={setCurrentUserMarks}
+    setUpdatedMarks={setUpdatedMarks}
+  />
 }

src/pages/sign/internal/displayMeta.tsx

@@ -32,13 +32,13 @@ import { useState, useEffect } from 'react'
 import { toast } from 'react-toastify'
 import { UserAvatar } from '../../../components/UserAvatar'
 import { MetadataController } from '../../../controllers'
-import { npubToHex, hexToNpub, parseJson } from '../../../utils'
+import { npubToHex, shorten, hexToNpub, parseJson } from '../../../utils'
 import styles from '../style.module.scss'
-import { SigitFile } from '../../../utils/file'
+import { PdfFile } from '../../../types/drawing.ts'
 
 type DisplayMetaProps = {
   meta: Meta
-  files: { [fileName: string]: SigitFile }
+  files: { [filename: string]: PdfFile }
   submittedBy: string
   signers: `npub1${string}`[]
   viewers: `npub1${string}`[]
@@ -105,7 +105,7 @@ export const DisplayMeta = ({
   }, [signers, viewers])
 
   useEffect(() => {
-    const metadataController = MetadataController.getInstance()
+    const metadataController = new MetadataController()
 
     const hexKeys: string[] = [
       npubToHex(submittedBy)!,
@@ -141,11 +141,14 @@ export const DisplayMeta = ({
           })
       }
     })
-  }, [users, submittedBy, metadata])
+  }, [users, submittedBy])
 
-  const downloadFile = async (fileName: string) => {
-    const file = files[fileName]
-    saveAs(file)
+  const downloadFile = async (filename: string) => {
+    const arrayBuffer = await files[filename].file.arrayBuffer()
+    if (!arrayBuffer) return
+
+    const blob = new Blob([arrayBuffer])
+    saveAs(blob, filename)
   }
 
   return (
@@ -167,7 +170,20 @@ export const DisplayMeta = ({
         <Typography variant="h6" sx={{ color: textColor }}>
           Submitted By
         </Typography>
-        <UserAvatar pubkey={submittedBy} isNameVisible={true} />
+        {(function () {
+          const profile = metadata[submittedBy]
+          return (
+            <UserAvatar
+              pubkey={submittedBy}
+              name={
+                profile?.display_name ||
+                profile?.name ||
+                shorten(hexToNpub(submittedBy))
+              }
+              image={profile?.picture}
+            />
+          )
+        })()}
       </ListItem>
       <ListItem
         sx={{
@@ -267,12 +283,14 @@ type DisplayUserProps = {
 const DisplayUser = ({
   meta,
   user,
+  metadata,
   signedBy,
   nextSigner,
   getPrevSignersSig
 }: DisplayUserProps) => {
   const theme = useTheme()
 
+  const userMeta = metadata[user.pubkey]
   const [userStatus, setUserStatus] = useState<UserStatus>(UserStatus.Pending)
   const [prevSignatureStatus, setPreviousSignatureStatus] =
     useState<PrevSignatureValidationEnum>(PrevSignatureValidationEnum.Pending)
@@ -355,7 +373,15 @@ const DisplayUser = ({
   return (
     <TableRow>
       <TableCell className={styles.tableCell}>
-        <UserAvatar pubkey={user.pubkey} isNameVisible={true} />
+        <UserAvatar
+          pubkey={user.pubkey}
+          name={
+            userMeta?.display_name ||
+            userMeta?.name ||
+            shorten(hexToNpub(user.pubkey))
+          }
+          image={userMeta?.picture}
+        />
       </TableCell>
       <TableCell className={styles.tableCell}>{user.role}</TableCell>
       <TableCell>

src/pages/sign/style.module.scss

@@ -2,6 +2,8 @@
 
 .container {
   color: $text-color;
+  width: 550px;
+  max-width: 550px;
 
   .inputBlock {
     position: relative;
@@ -14,7 +16,6 @@
     border-bottom: 0.5px solid;
     padding: 8px 16px;
     font-size: 1.5rem;
-    z-index: 2;
   }
 
   .filesWrapper {
@@ -63,9 +64,10 @@
     display: flex;
     justify-content: center;
     align-items: center;
+    //z-index: 200;
   }
 
-  .fixedBottomForm input[type='text'] {
+  .fixedBottomForm input[type="text"] {
     width: 80%;
     padding: 10px;
     font-size: 16px;

src/pages/verify/index.tsx

@@ -1,370 +1,111 @@
-import { Box, Button, Typography } from '@mui/material'
+import {
+  Box,
+  Button,
+  List,
+  ListItem,
+  ListSubheader,
+  Tooltip,
+  Typography,
+  useTheme
+} from '@mui/material'
 import JSZip from 'jszip'
 import { MuiFileInput } from 'mui-file-input'
-import { useEffect, useRef, useState } from 'react'
+import { Event, kinds, verifyEvent } from 'nostr-tools'
+import { useEffect, useState } from 'react'
 import { toast } from 'react-toastify'
 import { LoadingSpinner } from '../../components/LoadingSpinner'
-import { NostrController } from '../../controllers'
+import { UserAvatar } from '../../components/UserAvatar'
+import { MetadataController, NostrController } from '../../controllers'
 import {
-  DocSignatureEvent,
+  CreateSignatureEventContent,
   Meta,
-  SignedEvent,
-  OpenTimestamp,
-  OpenTimestampUpgradeVerifyResponse
+  ProfileMetadata,
+  SignedEventContent
 } from '../../types'
 import {
-  decryptArrayBuffer,
+  decryptArrayBuffer, extractMarksFromSignedMeta,
+  extractZipUrlAndEncryptionKey,
   getHash,
-  hexToNpub,
-  unixNow,
+  hexToNpub, now,
+  npubToHex,
   parseJson,
   readContentOfZipEntry,
-  signEventForMetaFile,
-  getCurrentUserFiles,
-  updateUsersAppData,
-  npubToHex,
-  sendNotification
+  shorten, signEventForMetaFile
 } from '../../utils'
 import styles from './style.module.scss'
+import { Cancel, CheckCircle } from '@mui/icons-material'
 import { useLocation } from 'react-router-dom'
 import axios from 'axios'
-import { FONT_SIZE, FONT_TYPE, inPx } from '../../utils/pdf.ts'
-import { useAppSelector } from '../../hooks/store'
+import { PdfFile } from '../../types/drawing.ts'
+import {
+  addMarks,
+  convertToPdfBlob,
+  convertToPdfFile,
+  groupMarksByPage,
+} from '../../utils/pdf.ts'
+import { State } from '../../store/rootReducer.ts'
+import { useSelector } from 'react-redux'
 import { getLastSignersSig } from '../../utils/sign.ts'
 import { saveAs } from 'file-saver'
 import { Container } from '../../components/Container'
-import { useSigitMeta } from '../../hooks/useSigitMeta.tsx'
-import { StickySideColumns } from '../../layouts/StickySideColumns.tsx'
-import { UsersDetails } from '../../components/UsersDetails.tsx'
-import FileList from '../../components/FileList'
-import { CurrentUserFile } from '../../types/file.ts'
-import { Mark } from '../../types/mark.ts'
-import React from 'react'
-import {
-  convertToSigitFile,
-  getZipWithFiles,
-  SigitFile
-} from '../../utils/file.ts'
-import { FileDivider } from '../../components/FileDivider.tsx'
-import { ExtensionFileBox } from '../../components/ExtensionFileBox.tsx'
-import { useScale } from '../../hooks/useScale.tsx'
-import {
-  faCircleInfo,
-  faFile,
-  faFileDownload
-} from '@fortawesome/free-solid-svg-icons'
-import { upgradeAndVerifyTimestamp } from '../../utils/opentimestamps.ts'
-import _ from 'lodash'
-import { MARK_TYPE_CONFIG } from '../../components/getMarkComponents.tsx'
-
-interface PdfViewProps {
-  files: CurrentUserFile[]
-  currentFile: CurrentUserFile | null
-  parsedSignatureEvents: {
-    [signer: `npub1${string}`]: DocSignatureEvent
-  }
-}
-
-const SlimPdfView = ({
-  files,
-  currentFile,
-  parsedSignatureEvents
-}: PdfViewProps) => {
-  const pdfRefs = useRef<(HTMLDivElement | null)[]>([])
-  const { from } = useScale()
-  useEffect(() => {
-    if (currentFile !== null && !!pdfRefs.current[currentFile.id]) {
-      pdfRefs.current[currentFile.id]?.scrollIntoView({
-        behavior: 'smooth'
-      })
-    }
-  }, [currentFile])
-  return (
-    <div className="files-wrapper">
-      {files.length > 0 ? (
-        files.map((currentUserFile, i) => {
-          const { hash, file, id } = currentUserFile
-          const signatureEvents = Object.keys(parsedSignatureEvents)
-          if (!hash) return
-          return (
-            <React.Fragment key={file.name}>
-              <div
-                id={file.name}
-                ref={(el) => (pdfRefs.current[id] = el)}
-                className="file-wrapper"
-              >
-                {file.isPdf &&
-                  file.pages?.map((page, i) => {
-                    const marks: Mark[] = []
-
-                    signatureEvents.forEach((e) => {
-                      const m = parsedSignatureEvents[
-                        e as `npub1${string}`
-                      ].parsedContent?.marks.filter(
-                        (m) => m.pdfFileHash == hash && m.location.page == i
-                      )
-                      if (m) {
-                        marks.push(...m)
-                      }
-                    })
-                    return (
-                      <div className="image-wrapper" key={i}>
-                        <img
-                          draggable="false"
-                          src={page.image}
-                          alt={`page ${i} of ${file.name}`}
-                        />
-                        {marks.map((m) => {
-                          const { render: MarkRenderComponent } =
-                            MARK_TYPE_CONFIG[m.type] || {}
-                          return (
-                            <div
-                              className={`file-mark ${styles.mark}`}
-                              key={m.id}
-                              style={{
-                                left: inPx(from(page.width, m.location.left)),
-                                top: inPx(from(page.width, m.location.top)),
-                                width: inPx(from(page.width, m.location.width)),
-                                height: inPx(
-                                  from(page.width, m.location.height)
-                                ),
-                                fontFamily: FONT_TYPE,
-                                fontSize: inPx(from(page.width, FONT_SIZE))
-                              }}
-                            >
-                              {typeof MarkRenderComponent !== 'undefined' && (
-                                <MarkRenderComponent value={m.value} mark={m} />
-                              )}
-                            </div>
-                          )
-                        })}
-                      </div>
-                    )
-                  })}
-                {file.isImage && (
-                  <img
-                    className="file-image"
-                    src={file.objectUrl}
-                    alt={file.name}
-                  />
-                )}
-                {!(file.isPdf || file.isImage) && (
-                  <ExtensionFileBox extension={file.extension} />
-                )}
-              </div>
-              {i < files.length - 1 && <FileDivider />}
-            </React.Fragment>
-          )
-        })
-      ) : (
-        <LoadingSpinner variant="small" />
-      )}
-    </div>
-  )
-}
 
 export const VerifyPage = () => {
+  const theme = useTheme()
+  const textColor = theme.palette.getContrastText(
+    theme.palette.background.paper
+  )
+
   const location = useLocation()
-  const usersPubkey = useAppSelector((state) => state.auth.usersPubkey)
-
-  const nostrController = NostrController.getInstance()
-
-  const [isLoading, setIsLoading] = useState(false)
-  const [loadingSpinnerDesc, setLoadingSpinnerDesc] = useState('')
-
   /**
    * uploadedZip will be received from home page when a user uploads a sigit zip wrapper that contains meta.json
    * meta will be received in navigation from create & home page in online mode
    */
   const { uploadedZip, meta: metaInNavState } = location.state || {}
+
+  const [isLoading, setIsLoading] = useState(false)
+  const [loadingSpinnerDesc, setLoadingSpinnerDesc] = useState('')
+
   const [selectedFile, setSelectedFile] = useState<File | null>(null)
-  useEffect(() => {
-    if (uploadedZip) {
-      setSelectedFile(uploadedZip)
-    }
-  }, [uploadedZip])
+  const [meta, setMeta] = useState<Meta | null>(null)
 
-  const [meta, setMeta] = useState<Meta>(metaInNavState)
-  const {
-    submittedBy,
-    zipUrl,
-    encryptionKey,
-    signers,
-    viewers,
-    fileHashes,
-    parsedSignatureEvents,
-    timestamps
-  } = useSigitMeta(meta)
+  const [submittedBy, setSubmittedBy] = useState<string>()
 
-  const [files, setFiles] = useState<{ [filename: string]: SigitFile }>({})
-
-  const [currentFile, setCurrentFile] = useState<CurrentUserFile | null>(null)
+  const [signers, setSigners] = useState<`npub1${string}`[]>([])
+  const [viewers, setViewers] = useState<`npub1${string}`[]>([])
+  const [creatorFileHashes, setCreatorFileHashes] = useState<{
+    [key: string]: string
+  }>({})
   const [currentFileHashes, setCurrentFileHashes] = useState<{
     [key: string]: string | null
   }>({})
+  const [files, setFiles] = useState<{ [filename: string]: PdfFile}>({})
 
-  const signTimestampEvent = async (signerContent: {
-    timestamps: OpenTimestamp[]
-  }): Promise<SignedEvent | null> => {
-    return await signEventForMetaFile(
-      JSON.stringify(signerContent),
-      nostrController,
-      setIsLoading
-    )
-  }
+  const [metadata, setMetadata] = useState<{ [key: string]: ProfileMetadata }>(
+    {}
+  )
+  const usersPubkey = useSelector((state: State) => state.auth.usersPubkey)
+  const nostrController = NostrController.getInstance()
 
   useEffect(() => {
-    if (Object.entries(files).length > 0) {
-      const tmp = getCurrentUserFiles(files, currentFileHashes, fileHashes)
-      setCurrentFile(tmp[0])
-    }
-  }, [currentFileHashes, fileHashes, files])
-
-  useEffect(() => {
-    if (
-      timestamps &&
-      timestamps.length > 0 &&
-      usersPubkey &&
-      submittedBy &&
-      parsedSignatureEvents
-    ) {
-      if (timestamps.every((t) => !!t.verification)) {
-        return
-      }
-      const upgradeT = async (timestamps: OpenTimestamp[]) => {
-        try {
-          setLoadingSpinnerDesc('Upgrading your timestamps.')
-
-          const findCreatorTimestamp = (timestamps: OpenTimestamp[]) => {
-            if (usersPubkey === submittedBy) {
-              return timestamps[0]
-            }
-          }
-
-          const findSignerTimestamp = (timestamps: OpenTimestamp[]) => {
-            const parsedEvent = parsedSignatureEvents[hexToNpub(usersPubkey)]
-            if (parsedEvent?.id) {
-              return timestamps.find((t) => t.nostrId === parsedEvent.id)
-            }
-          }
-
-          /**
-           * Checks if timestamp verification has been achieved for the first time.
-           * Note that the upgrade flag is separate from verification. It is possible for a timestamp
-           * to not be upgraded, but to be verified for the first time.
-           * @param upgradedTimestamp
-           * @param timestamps
-           */
-          const isNewlyVerified = (
-            upgradedTimestamp: OpenTimestampUpgradeVerifyResponse,
-            timestamps: OpenTimestamp[]
-          ) => {
-            if (!upgradedTimestamp.verified) return false
-            const oldT = timestamps.find(
-              (t) => t.nostrId === upgradedTimestamp.timestamp.nostrId
-            )
-            if (!oldT) return false
-            if (!oldT.verification && upgradedTimestamp.verified) return true
-          }
-
-          const userTimestamps: OpenTimestamp[] = []
-
-          const creatorTimestamp = findCreatorTimestamp(timestamps)
-          if (creatorTimestamp) {
-            userTimestamps.push(creatorTimestamp)
-          }
-
-          const signerTimestamp = findSignerTimestamp(timestamps)
-          if (signerTimestamp) {
-            userTimestamps.push(signerTimestamp)
-          }
-
-          if (userTimestamps.every((t) => !!t.verification)) {
-            return
-          }
-
-          const upgradedUserTimestamps = await Promise.all(
-            userTimestamps.map(upgradeAndVerifyTimestamp)
-          )
-
-          const upgradedTimestamps = upgradedUserTimestamps
-            .filter((t) => t.upgraded || isNewlyVerified(t, userTimestamps))
-            .map((t) => {
-              const timestamp: OpenTimestamp = { ...t.timestamp }
-              if (t.verified) {
-                timestamp.verification = t.verification
-              }
-              return timestamp
-            })
-
-          if (upgradedTimestamps.length === 0) {
-            return
-          }
-
-          setLoadingSpinnerDesc('Signing a timestamp upgrade event.')
-
-          const signedEvent = await signTimestampEvent({
-            timestamps: upgradedTimestamps
-          })
-          if (!signedEvent) return
-
-          const finalTimestamps = timestamps.map((t) => {
-            const upgraded = upgradedTimestamps.find(
-              (tu) => tu.nostrId === t.nostrId
-            )
-            if (upgraded) {
-              return {
-                ...upgraded,
-                signature: JSON.stringify(signedEvent, null, 2)
-              }
-            }
-            return t
-          })
-
-          const updatedMeta = _.cloneDeep(meta)
-          updatedMeta.timestamps = [...finalTimestamps]
-          updatedMeta.modifiedAt = unixNow()
-
-          const updatedEvent = await updateUsersAppData(updatedMeta)
-          if (!updatedEvent) return
-
-          const userSet = new Set<`npub1${string}`>()
-          signers.forEach((signer) => {
-            if (signer !== usersPubkey) {
-              userSet.add(signer)
-            }
-          })
-
-          viewers.forEach((viewer) => {
-            userSet.add(viewer)
-          })
-
-          const users = Array.from(userSet)
-          const promises = users.map((user) =>
-            sendNotification(npubToHex(user)!, updatedMeta)
-          )
-
-          await Promise.all(promises)
-
-          toast.success('Timestamp updates have been sent successfully.')
-
-          setMeta(meta)
-        } catch (err) {
-          console.error(err)
-          toast.error(
-            'There was an error upgrading or verifying your timestamps!'
-          )
-        }
-      }
-      upgradeT(timestamps)
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [timestamps, submittedBy, parsedSignatureEvents])
-
-  useEffect(() => {
-    if (metaInNavState && encryptionKey) {
+    if (uploadedZip) {
+      setSelectedFile(uploadedZip)
+    } else if (metaInNavState) {
       const processSigit = async () => {
         setIsLoading(true)
+        setLoadingSpinnerDesc('Extracting zipUrl and encryption key from meta')
+
+        const res = await extractZipUrlAndEncryptionKey(metaInNavState)
+        if (!res) {
+          setIsLoading(false)
+          return
+        }
+
+        const {
+          zipUrl,
+          encryptionKey,
+          createSignatureEvent,
+          createSignatureContent
+        } = res
 
         setLoadingSpinnerDesc('Fetching file from file server')
         axios
@@ -398,7 +139,7 @@ export const VerifyPage = () => {
 
               if (!zip) return
 
-              const files: { [fileName: string]: SigitFile } = {}
+              const files: { [filename: string]: PdfFile } = {}
               const fileHashes: { [key: string]: string | null } = {}
               const fileNames = Object.values(zip.files).map(
                 (entry) => entry.name
@@ -414,10 +155,7 @@ export const VerifyPage = () => {
                 )
 
                 if (arrayBuffer) {
-                  files[fileName] = await convertToSigitFile(
-                    arrayBuffer,
-                    fileName!
-                  )
+                  files[fileName] = await convertToPdfFile(arrayBuffer, fileName!)
                   const hash = await getHash(arrayBuffer)
 
                   if (hash) {
@@ -431,7 +169,16 @@ export const VerifyPage = () => {
               setCurrentFileHashes(fileHashes)
               setFiles(files)
 
+
+              setSigners(createSignatureContent.signers)
+              setViewers(createSignatureContent.viewers)
+              setCreatorFileHashes(createSignatureContent.fileHashes)
+              setSubmittedBy(createSignatureEvent.pubkey)
+
+              setMeta(metaInNavState)
               setIsLoading(false)
+
+
             }
           })
           .catch((err) => {
@@ -447,7 +194,49 @@ export const VerifyPage = () => {
 
       processSigit()
     }
-  }, [encryptionKey, metaInNavState, zipUrl])
+  }, [uploadedZip, metaInNavState])
+
+  useEffect(() => {
+    if (submittedBy) {
+      const metadataController = new MetadataController()
+
+      const users = [submittedBy, ...signers, ...viewers]
+
+      users.forEach((user) => {
+        const pubkey = npubToHex(user)!
+
+        if (!(pubkey in metadata)) {
+          const handleMetadataEvent = (event: Event) => {
+            const metadataContent =
+              metadataController.extractProfileMetadataContent(event)
+            if (metadataContent)
+              setMetadata((prev) => ({
+                ...prev,
+                [pubkey]: metadataContent
+              }))
+          }
+
+          metadataController.on(pubkey, (kind: number, event: Event) => {
+            if (kind === kinds.Metadata) {
+              handleMetadataEvent(event)
+            }
+          })
+
+          metadataController
+            .findMetadata(pubkey)
+            .then((metadataEvent) => {
+              if (metadataEvent) handleMetadataEvent(metadataEvent)
+            })
+            .catch((err) => {
+              console.error(
+                `error occurred in finding metadata for: ${user}`,
+                err
+              )
+            })
+        }
+      })
+    }
+  }, [submittedBy, signers, viewers])
 
   const handleVerify = async () => {
     if (!selectedFile) return
@@ -461,7 +250,6 @@ export const VerifyPage = () => {
 
     if (!zip) return
 
-    const files: { [filename: string]: SigitFile } = {}
     const fileHashes: { [key: string]: string | null } = {}
     const fileNames = Object.values(zip.files)
       .filter((entry) => entry.name.startsWith('files/') && !entry.dir)
@@ -469,27 +257,25 @@ export const VerifyPage = () => {
 
     // generate hashes for all entries in files folder of zipArchive
     // these hashes can be used to verify the originality of files
-    for (const zipFilePath of fileNames) {
+    for (const fileName of fileNames) {
       const arrayBuffer = await readContentOfZipEntry(
         zip,
-        zipFilePath,
+        fileName,
         'arraybuffer'
       )
 
-      const fileName = zipFilePath.replace(/^files\//, '')
       if (arrayBuffer) {
-        files[fileName] = await convertToSigitFile(arrayBuffer, fileName)
         const hash = await getHash(arrayBuffer)
 
         if (hash) {
-          fileHashes[fileName] = hash
+          fileHashes[fileName.replace(/^files\//, '')] = hash
         }
       } else {
-        fileHashes[fileName] = null
+        fileHashes[fileName.replace(/^files\//, '')] = null
       }
     }
 
-    setFiles(files)
+    console.log('fileHashes :>> ', fileHashes)
     setCurrentFileHashes(fileHashes)
 
     setLoadingSpinnerDesc('Parsing meta.json')
@@ -518,13 +304,84 @@ export const VerifyPage = () => {
 
     if (!parsedMetaJson) return
 
-    setMeta(parsedMetaJson)
+    const createSignatureEvent = await parseJson<Event>(
+      parsedMetaJson.createSignature
+    ).catch((err) => {
+      console.log('err in parsing the createSignature event:>> ', err)
+      toast.error(
+        err.message || 'error occurred in parsing the create signature event'
+      )
+      setIsLoading(false)
+      return null
+    })
 
+    if (!createSignatureEvent) return
+
+    const isValidCreateSignature = verifyEvent(createSignatureEvent)
+
+    if (!isValidCreateSignature) {
+      toast.error('Create signature is invalid')
+      setIsLoading(false)
+      return
+    }
+
+    const createSignatureContent = await parseJson<CreateSignatureEventContent>(
+      createSignatureEvent.content
+    ).catch((err) => {
+      console.log(
+        `err in parsing the createSignature event's content :>> `,
+        err
+      )
+      toast.error(
+        err.message ||
+          `error occurred in parsing the create signature event's content`
+      )
+      setIsLoading(false)
+      return null
+    })
+
+    if (!createSignatureContent) return
+
+    setSigners(createSignatureContent.signers)
+    setViewers(createSignatureContent.viewers)
+    setCreatorFileHashes(createSignatureContent.fileHashes)
+    setSubmittedBy(createSignatureEvent.pubkey)
+
+    setMeta(parsedMetaJson)
     setIsLoading(false)
   }
 
-  const handleMarkedExport = async () => {
-    if (Object.entries(files).length === 0 || !meta || !usersPubkey) return
+  const getPrevSignersSig = (npub: string) => {
+    if (!meta) return null
+
+    // if user is first signer then use creator's signature
+    if (signers[0] === npub) {
+      try {
+        const createSignatureEvent: Event = JSON.parse(meta.createSignature)
+        return createSignatureEvent.sig
+      } catch (error) {
+        return null
+      }
+    }
+
+    // find the index of signer
+    const currentSignerIndex = signers.findIndex((signer) => signer === npub)
+    // return null if could not found user in signer's list
+    if (currentSignerIndex === -1) return null
+    // find prev signer
+    const prevSigner = signers[currentSignerIndex - 1]
+
+    // get the signature of prev signer
+    try {
+      const prevSignersEvent: Event = JSON.parse(meta.docSignatures[prevSigner])
+      return prevSignersEvent.sig
+    } catch (error) {
+      return null
+    }
+  }
+
+  const handleExport = async () => {
+    if (Object.entries(files).length === 0 ||!meta ||!usersPubkey) return;
 
     const usersNpub = hexToNpub(usersPubkey)
     if (
@@ -538,8 +395,10 @@ export const VerifyPage = () => {
     setIsLoading(true)
     setLoadingSpinnerDesc('Signing nostr event')
 
+    if (!meta) return;
+
     const prevSig = getLastSignersSig(meta, signers)
-    if (!prevSig) return
+    if (!prevSig) return;
 
     const signedEvent = await signEventForMetaFile(
       JSON.stringify({ prevSig }),
@@ -547,15 +406,24 @@ export const VerifyPage = () => {
       setIsLoading
     )
 
-    if (!signedEvent) return
+    if (!signedEvent) return;
 
     const exportSignature = JSON.stringify(signedEvent, null, 2)
-    const updatedMeta = { ...meta, exportSignature }
+    const updatedMeta = {...meta, exportSignature }
     const stringifiedMeta = JSON.stringify(updatedMeta, null, 2)
 
-    const zip = await getZipWithFiles(updatedMeta, files)
+    const zip = new JSZip()
     zip.file('meta.json', stringifiedMeta)
 
+    const marks = extractMarksFromSignedMeta(updatedMeta)
+    const marksByPage = groupMarksByPage(marks)
+
+    for (const [fileName, pdf] of Object.entries(files)) {
+      const pages = await addMarks(pdf.file, marksByPage)
+      const blob = await convertToPdfBlob(pages)
+      zip.file(`/files/${fileName}`, blob)
+    }
+
     const arrayBuffer = await zip
       .generateAsync({
         type: 'arraybuffer',
@@ -574,11 +442,105 @@ export const VerifyPage = () => {
     if (!arrayBuffer) return
 
     const blob = new Blob([arrayBuffer])
-    saveAs(blob, `exported-${unixNow()}.sigit.zip`)
+    saveAs(blob, `exported-${now()}.sigit.zip`)
 
     setIsLoading(false)
   }
 
+  const displayUser = (pubkey: string, verifySignature = false) => {
+    const profile = metadata[pubkey]
+
+    let isValidSignature = false
+
+    if (verifySignature) {
+      const npub = hexToNpub(pubkey)
+      const signedEventString = meta ? meta.docSignatures[npub] : null
+      if (signedEventString) {
+        try {
+          const signedEvent = JSON.parse(signedEventString)
+          const isVerifiedEvent = verifyEvent(signedEvent)
+
+          if (isVerifiedEvent) {
+            // get the actual signature of prev signer
+            const prevSignersSig = getPrevSignersSig(npub)
+
+            // get the signature of prev signer from the content of current signers signedEvent
+
+            try {
+              const obj: SignedEventContent = JSON.parse(signedEvent.content)
+              if (
+                obj.prevSig &&
+                prevSignersSig &&
+                obj.prevSig === prevSignersSig
+              ) {
+                isValidSignature = true
+              }
+            } catch (error) {
+              isValidSignature = false
+            }
+          }
+        } catch (error) {
+          console.error(
+            `An error occurred in parsing and verifying the signature event for ${pubkey}`,
+            error
+          )
+        }
+      }
+    }
+
+    return (
+      <>
+        <UserAvatar
+          pubkey={pubkey}
+          name={
+            profile?.display_name || profile?.name || shorten(hexToNpub(pubkey))
+          }
+          image={profile?.picture}
+        />
+
+        {verifySignature && (
+          <>
+            {isValidSignature && (
+              <Tooltip title="Valid signature">
+                <CheckCircle sx={{ color: theme.palette.success.light }} />
+              </Tooltip>
+            )}
+
+            {!isValidSignature && (
+              <Tooltip title="Invalid signature">
+                <Cancel sx={{ color: theme.palette.error.main }} />
+              </Tooltip>
+            )}
+          </>
+        )}
+      </>
+    )
+  }
+
+  const displayExportedBy = () => {
+    if (!meta || !meta.exportSignature) return null
+
+    const exportSignatureString = meta.exportSignature
+
+    try {
+      const exportSignatureEvent = JSON.parse(exportSignatureString) as Event
+
+      if (verifyEvent(exportSignatureEvent)) {
+        return displayUser(exportSignatureEvent.pubkey)
+      } else {
+        toast.error(`Invalid export signature!`)
+        return (
+          <Typography component="label" sx={{ color: 'red' }}>
+            Invalid export signature
+          </Typography>
+        )
+      }
+    } catch (error) {
+      console.error(`An error occurred wile parsing exportSignature`, error)
+      return null
+    }
+  }
+
   return (
     <>
       {isLoading && <LoadingSpinner desc={loadingSpinnerDesc} />}
@@ -611,33 +573,147 @@ export const VerifyPage = () => {
         )}
 
         {meta && (
-          <StickySideColumns
-            left={
-              currentFile !== null && (
-                <FileList
-                  files={getCurrentUserFiles(
-                    files,
-                    currentFileHashes,
-                    fileHashes
+          <>
+            <List
+              sx={{
+                bgcolor: 'background.paper',
+                marginTop: 2
+              }}
+              subheader={
+                <ListSubheader className={styles.subHeader}>
+                  Meta Info
+                </ListSubheader>
+              }
+            >
+              {submittedBy && (
+                <ListItem
+                  sx={{
+                    marginTop: 1,
+                    gap: '15px'
+                  }}
+                >
+                  <Typography variant="h6" sx={{ color: textColor }}>
+                    Submitted By
+                  </Typography>
+                  {displayUser(submittedBy)}
+                </ListItem>
+              )}
+
+              <ListItem
+                sx={{
+                  marginTop: 1,
+                  gap: '15px'
+                }}
+              >
+                <Typography variant="h6" sx={{ color: textColor }}>
+                  Exported By
+                </Typography>
+                {displayExportedBy()}
+                <Box sx={{ mt: 1, display: 'flex', justifyContent: 'center' }}>
+                  <Button onClick={handleExport} variant="contained">
+                    Export Sigit
+                  </Button>
+                </Box>
+              </ListItem>
+
+              {signers.length > 0 && (
+                <ListItem
+                  sx={{
+                    marginTop: 1,
+                    flexDirection: 'column',
+                    alignItems: 'flex-start'
+                  }}
+                >
+                  <Typography variant="h6" sx={{ color: textColor }}>
+                    Signers
+                  </Typography>
+                  <ul className={styles.usersList}>
+                    {signers.map((signer) => (
+                      <li
+                        key={signer}
+                        style={{
+                          color: textColor,
+                          display: 'flex',
+                          alignItems: 'center',
+                          gap: '15px'
+                        }}
+                      >
+                        {displayUser(npubToHex(signer)!, true)}
+                      </li>
+                    ))}
+                  </ul>
+                </ListItem>
+              )}
+
+              {viewers.length > 0 && (
+                <ListItem
+                  sx={{
+                    marginTop: 1,
+                    flexDirection: 'column',
+                    alignItems: 'flex-start'
+                  }}
+                >
+                  <Typography variant="h6" sx={{ color: textColor }}>
+                    Viewers
+                  </Typography>
+                  <ul className={styles.usersList}>
+                    {viewers.map((viewer) => (
+                      <li key={viewer} style={{ color: textColor }}>
+                        {displayUser(npubToHex(viewer)!)}
+                      </li>
+                    ))}
+                  </ul>
+                </ListItem>
+              )}
+
+              <ListItem
+                sx={{
+                  marginTop: 1,
+                  flexDirection: 'column',
+                  alignItems: 'flex-start'
+                }}
+              >
+                <Typography variant="h6" sx={{ color: textColor }}>
+                  Files
+                </Typography>
+                <Box className={styles.filesWrapper}>
+                  {Object.entries(currentFileHashes).map(
+                    ([filename, hash], index) => {
+                      const isValidHash = creatorFileHashes[filename] === hash
+
+                      return (
+                        <Box key={`file-${index}`} className={styles.file}>
+                          <Typography
+                            component="label"
+                            sx={{
+                              color: textColor,
+                              flexGrow: 1
+                            }}
+                          >
+                            {filename}
+                          </Typography>
+                          {isValidHash && (
+                            <Tooltip title="File integrity check passed" arrow>
+                              <CheckCircle
+                                sx={{ color: theme.palette.success.light }}
+                              />
+                            </Tooltip>
+                          )}
+                          {!isValidHash && (
+                            <Tooltip title="File integrity check failed" arrow>
+                              <Cancel
+                                sx={{ color: theme.palette.error.main }}
+                              />
+                            </Tooltip>
+                          )}
+                        </Box>
+                      )
+                    }
                   )}
-                  currentFile={currentFile}
-                  setCurrentFile={setCurrentFile}
-                  handleDownload={handleMarkedExport}
-                  downloadLabel="Download Sigit"
-                />
-              )
-            }
-            right={<UsersDetails meta={meta} />}
-            leftIcon={faFileDownload}
-            centerIcon={faFile}
-            rightIcon={faCircleInfo}
-          >
-            <SlimPdfView
-              currentFile={currentFile}
-              files={getCurrentUserFiles(files, currentFileHashes, fileHashes)}
-              parsedSignatureEvents={parsedSignatureEvents}
-            />
-          </StickySideColumns>
+                </Box>
+              </ListItem>
+            </List>
+          </>
         )}
       </Container>
     </>

src/pages/verify/style.module.scss

@@ -50,17 +50,3 @@
     }
   }
 }
-
-.mark {
-  position: absolute;
-
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-[data-dev='true'] {
-  .mark {
-    outline: 1px dotted black;
-  }
-}

src/routes/index.tsx

@@ -1,10 +1,13 @@
+import { Modal } from '../layouts/modal'
 import { CreatePage } from '../pages/create'
 import { HomePage } from '../pages/home'
 import { LandingPage } from '../pages/landing'
+import { Login } from '../pages/login'
+import { Nostr } from '../pages/nostr'
 import { ProfilePage } from '../pages/profile'
+import { Register } from '../pages/register'
 import { SettingsPage } from '../pages/settings/Settings'
 import { CacheSettingsPage } from '../pages/settings/cache'
-import { NostrLoginPage } from '../pages/settings/nostrLogin'
 import { ProfileSettingsPage } from '../pages/settings/profile'
 import { RelaysPage } from '../pages/settings/relays'
 import { SignPage } from '../pages/sign'
@@ -19,8 +22,7 @@ export const appPrivateRoutes = {
   settings: '/settings',
   profileSettings: '/settings/profile/:npub',
   cacheSettings: '/settings/cache',
-  relays: '/settings/relays',
-  nostrLogin: '/settings/nostrLogin'
+  relays: '/settings/relays'
 }
 
 export const appPublicRoutes = {
@@ -83,7 +85,29 @@ export const publicRoutes: PublicRouteProps[] = [
   {
     path: appPublicRoutes.landingPage,
     hiddenWhenLoggedIn: true,
-    element: <LandingPage />
+    element: <LandingPage />,
+    children: [
+      {
+        element: <Modal />,
+        children: [
+          {
+            path: appPublicRoutes.login,
+            hiddenWhenLoggedIn: true,
+            element: <Login />
+          },
+          {
+            path: appPublicRoutes.register,
+            hiddenWhenLoggedIn: true,
+            element: <Register />
+          },
+          {
+            path: appPublicRoutes.nostr,
+            hiddenWhenLoggedIn: true,
+            element: <Nostr />
+          }
+        ]
+      }
+    ]
   },
   {
     path: appPublicRoutes.profile,
@@ -105,7 +129,7 @@ export const privateRoutes = [
     element: <CreatePage />
   },
   {
-    path: `${appPrivateRoutes.sign}/:id?`,
+    path: appPrivateRoutes.sign,
     element: <SignPage />
   },
   {
@@ -123,9 +147,5 @@ export const privateRoutes = [
   {
     path: appPrivateRoutes.relays,
     element: <RelaysPage />
-  },
-  {
-    path: appPrivateRoutes.nostrLogin,
-    element: <NostrLoginPage />
   }
 ]

src/services/LoginMethodStrategy/NostrLoginStrategy.ts

@@ -1,81 +0,0 @@
-import { Event, UnsignedEvent, EventTemplate, NostrEvent } from 'nostr-tools'
-import { SignedEvent } from '../../types'
-import { LoginMethodStrategy } from './loginMethodStrategy'
-import { WindowNostr } from 'nostr-tools/nip07'
-
-/**
- * Login Method Strategy when using nostr-login package.
- *
- * This class extends {@link LoginMethodStrategy base strategy} and implements all login method operations
- * @see {@link LoginMethodStrategy}
- */
-export class NostrLoginStrategy extends LoginMethodStrategy {
-  private nostr: WindowNostr
-
-  constructor() {
-    super()
-    if (!window.nostr) {
-      throw new Error(
-        `window.nostr object not present. Make sure you have an nostr extension installed/working properly.`
-      )
-    }
-
-    this.nostr = window.nostr as WindowNostr
-  }
-
-  async nip04Encrypt(receiver: string, content: string): Promise<string> {
-    if (!this.nostr.nip04) {
-      throw new Error(
-        `Your nostr extension does not support nip04 encryption & decryption`
-      )
-    }
-
-    const encrypted = await this.nostr.nip04.encrypt(receiver, content)
-    return encrypted
-  }
-
-  async nip04Decrypt(sender: string, content: string): Promise<string> {
-    if (!this.nostr.nip04) {
-      throw new Error(
-        `Your nostr extension does not support nip04 encryption & decryption`
-      )
-    }
-
-    const decrypted = await this.nostr.nip04.decrypt(sender, content)
-    return decrypted
-  }
-
-  async nip44Encrypt(receiver: string, content: string): Promise<string> {
-    if (!this.nostr.nip44) {
-      throw new Error(
-        `Your nostr extension does not support nip44 encryption & decryption`
-      )
-    }
-
-    // Encrypt the content using NIP-44 provided by the nostr extension.
-    const encrypted = await this.nostr.nip44.encrypt(receiver, content)
-    return encrypted as string
-  }
-
-  async nip44Decrypt(sender: string, content: string): Promise<string> {
-    if (!this.nostr.nip44) {
-      throw new Error(
-        `Your nostr extension does not support nip44 encryption & decryption`
-      )
-    }
-
-    // Decrypt the content using NIP-44 provided by the nostr extension.
-    const decrypted = await this.nostr.nip44.decrypt(sender, content)
-    return decrypted as string
-  }
-
-  async signEvent(event: UnsignedEvent | EventTemplate): Promise<SignedEvent> {
-    return (await this.nostr
-      .signEvent(event as NostrEvent)
-      .catch((err: unknown) => {
-        console.log('Error while signing event: ', err)
-
-        throw err
-      })) as Event
-  }
-}