Merge pull request #61 from luminous-devs/main

v1.1.1

.github/workflows/main.yml

@@ -17,16 +17,10 @@ jobs:
         settings:
           - platform: 'macos-latest'
             args: '--target universal-apple-darwin'
-          - platform: 'macos-latest'
-            args: '--target x86_64-apple-darwin'
-          - platform: 'macos-latest'
-            args: '--target aarch64-apple-darwin'
           - platform: 'ubuntu-20.04'
             args: ''
           - platform: 'windows-latest'
             args: '--target x86_64-pc-windows-msvc'
-          - platform: 'windows-latest'
-            args: '--target i686-pc-windows-msvc'
     runs-on: ${{ matrix.settings.platform }}
     steps:
       - uses: actions/checkout@v3
@@ -62,6 +56,12 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
           TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
+          ENABLE_CODE_SIGNING: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+          APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
         with:
           tagName: v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version
           releaseName: 'App v__VERSION__'

LICENSE

@@ -1,20 +1,674 @@
-BIT License
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-Copyright (c) [2023] [Reya]
+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.
 
-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:
+                            Preamble
 
-Keep it related to Nostr and Bitcoin, if not GO FUCK YOURSELF.
+The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
 
-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.
+The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is 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. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+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.
+
+To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+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 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. Use with the GNU Affero General Public License.
+
+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 Affero 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 special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+14. Revised Versions of this License.
+
+The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 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 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 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 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 General Public License for more details.
+
+    You should have received a copy of the GNU 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 the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+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 GPL, see
+<https://www.gnu.org/licenses/>.
+
+The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

README.md

@@ -1,100 +1,41 @@
-<p align="center">
-  <a href="#">
+### Introduction
 
-  </a>
-  <p align="center">
-   <img width="150" height="150" src="https://bafybeiascaupgzgxuoercns33vhxhq7c6oibhvxnzenvurgsjdyr4jp3la.ipfs.w3s.link/macos-512.png" alt="Logo">
-  </p>
-  <h1 align="center"><b>Lume</b></h1>
-  <p align="center">
-    An ambitious nostr client
-    <br />
-    <a href="https://uselume.xyz"><strong>uselume.xyz »</strong></a>
-    <br />
-    <b>Download for </b>
-    macOS
-    ·
-    Windows
-    ·
-    Linux
-    <br />
-    <i>~ Links will be added once a release is available. ~</i>
-  </p>
-</p>
-Lume is an open source cross-platform Nostr client, powered by (<a href="https://tauri.app" target="_blank">Tauri</a>) and web-tech.
-<br/>
-<br/>
+Lume is a nostr client
 
-> NOTE: Lume is under active development, most of the listed features are still experimental and subject to change.
+### Usage
 
-Nostr is truly censorship-resistant protocol for social network and messenger app, combine with Bitcoin, they are powerful tools bring you to freedom. Lume is one of many great clients to help you interact with them, built with Tauri and Web-tech aiming for speed and efficiency
+Download Lume for your platform here: [https://github.com/luminous-devs/lume/releases](https://github.com/luminous-devs/lume/releases)
 
-Lume is simple as it is, no more buzzwords
+Supported platform: macOS, Windows and Linux
 
-<p align="center">
-  <img src="https://void.cat/d/2oaFfzJsjnKNye6fHTpaq2" alt="App screenshot">
-  <br />
-  <br />
-</p>
+### Develop
 
-## How Nostr works?
-
-Everybody runs a client. It can be a native client, a web client, etc. To publish something, you write a post, sign it with your key and send it to multiple relays (servers hosted by someone else, or yourself). To get updates from other people, you ask multiple relays if they know anything about these other people. Anyone can run a relay. A relay is very simple and dumb. It does nothing besides accepting posts from some people and forwarding to others. Relays don't have to be trusted. Signatures are verified on the client side. [Learn more](https://github.com/nostr-protocol/nostr)
-
-## Motivation
-
-When Nostr became popular, many clients exist but none of them satisfy me, so I built my own. I don't many experence in develop desktop app before, my background is just strongly in Ruby on Rails, this is also a good opportunity for me to improve my skills.
-
-## Development
-
-Prerequisites:
-
-- Nodejs >= 18.0.0
-- Install pnpm: [docs](https://pnpm.io/)
-- Setup Tauri: [docs](https://tauri.app/v1/guides/getting-started/prerequisites)
-
-Clone repo:
-
-Note: always use `canary` branch for development
+Clone project
 
 ```
-git clone -b canary https://github.com/luminous-devs/lume.git
+git clone https://github.com/luminous-devs/lume.git && cd lume
 ```
 
-Move to clone folder in previous step
-
-```
-cd lume/
-```
-
-Install dependencies
+Install packages
 
 ```
 pnpm install
 ```
 
-Run development build
+Run dev
 
 ```
 pnpm tauri dev
 ```
 
-First time launch app, Lume automatically create local database (sqlite) and run migrations, place at `src-tauri/migrations`
+Build
 
 ```
-Database folder: tauri::api::path::BaseDirectory::App
-MacOS: /Users/<username>/Library/Application Support/com.lume.nu/lume.db
+pnpm tauri build
 ```
 
-In `splashscreen` page, Lume will check accounts table has any account or not. If not redirect to `/onboarding`. If present, run `subscribe` to fetch events from `DEFAULT_RELAYS`
+(Advance) - Generate SQLite migration
 
-In `/onboarding` page, user can import old `private key` or create new .If import old key, fetch `kind 0, 3` then insert to accounts table in database .If create new, show to user npub/nsec as well as random profile, then move to pre-follows page. Then redirect back to `splashscreen`
-
-**About Lume event processing**
-
-- Lume is using [nostr-relaypool-ts](https://github.com/adamritter/nostr-relaypool-ts) to interact with relays
-- When user open app, if `total notes in db == 0`, splashscreen `src/app/page.tsx` will fetch all events from 24 hours ago, if above zero, it will fetch all events since `last time` logged
-- When user using app, `event collector` component have role fetch all events since `current time` and save to `database`
-- `event collector` also have role update `last time logged` to local storage when user close the app
-- Newsfeed page `following or circle` will fetch event from `database` then render in `virtuaso` component
-- Lume don't render event directly after get it from relays, event will be saved in database first, and fetch via `sql query`
+```
+pnpm add-migrate <migrate_name>
+```

package.json

@@ -1,7 +1,7 @@
 {
   "name": "lume",
   "private": true,
-  "version": "1.0.0",
+  "version": "1.1.1",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
@@ -9,7 +9,8 @@
     "add-migrate": "cd src-tauri/ && sqlx migrate add",
     "prepare": "husky install",
     "lint": "eslint ./src --fix",
-    "format": "prettier ./src --write"
+    "format": "prettier ./src --write",
+    "dep-update": "pnpm update && cd src-tauri/ && cargo update"
   },
   "lint-staged": {
     "**/*.{ts, tsx}": "eslint --fix",
@@ -17,66 +18,81 @@
   },
   "dependencies": {
     "@headlessui/react": "^1.7.15",
-    "@nostr-dev-kit/ndk": "^0.7.3",
+    "@nostr-dev-kit/ndk": "^0.7.7",
+    "@nostr-fetch/adapter-ndk": "^0.11.0",
+    "@radix-ui/react-dialog": "^1.0.4",
     "@radix-ui/react-popover": "^1.0.6",
     "@radix-ui/react-tooltip": "^1.0.6",
-    "@tanstack/react-query": "^4.29.19",
-    "@tanstack/react-query-devtools": "^4.29.19",
+    "@tanstack/react-query": "^4.32.0",
+    "@tanstack/react-query-devtools": "^4.32.0",
     "@tanstack/react-virtual": "3.0.0-beta.54",
     "@tauri-apps/api": "^1.4.0",
+    "@tiptap/extension-image": "^2.0.4",
+    "@tiptap/extension-mention": "^2.0.4",
+    "@tiptap/extension-placeholder": "^2.0.4",
+    "@tiptap/pm": "^2.0.4",
+    "@tiptap/react": "^2.0.4",
+    "@tiptap/starter-kit": "^2.0.4",
+    "@tiptap/suggestion": "^2.0.4",
     "cheerio": "1.0.0-rc.12",
     "dayjs": "^1.11.9",
     "destr": "^1.2.2",
-    "framer-motion": "^10.12.18",
+    "framer-motion": "^10.13.1",
     "get-urls": "^11.0.0",
+    "html-to-text": "^9.0.5",
     "immer": "^10.0.2",
     "light-bolt11-decoder": "^3.0.0",
-    "nostr-tools": "^1.12.1",
+    "nostr-fetch": "^0.12.2",
+    "nostr-tools": "^1.13.1",
+    "qrcode.react": "^3.1.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-hook-form": "^7.45.1",
+    "react-hook-form": "^7.45.2",
     "react-hotkeys-hook": "^4.4.1",
+    "react-markdown": "^8.0.7",
     "react-player": "^2.12.0",
-    "react-router-dom": "^6.14.1",
+    "react-router-dom": "^6.14.2",
     "react-string-replace": "^1.1.1",
-    "react-virtuoso": "^4.3.11",
-    "slate": "^0.94.1",
-    "slate-history": "^0.93.0",
-    "slate-react": "^0.94.2",
-    "tailwind-merge": "^1.13.2",
+    "react-virtuoso": "^4.4.2",
+    "remark-gfm": "^3.0.1",
+    "tailwind-merge": "^1.14.0",
     "tauri-plugin-autostart-api": "github:tauri-apps/tauri-plugin-autostart#v1",
     "tauri-plugin-sql-api": "github:tauri-apps/tauri-plugin-sql",
+    "tauri-plugin-stronghold-api": "github:tauri-apps/tauri-plugin-stronghold#v1",
+    "tauri-plugin-upload-api": "github:tauri-apps/tauri-plugin-upload#v1",
+    "tippy.js": "^6.3.7",
     "zustand": "^4.3.9"
   },
   "devDependencies": {
     "@tailwindcss/typography": "^0.5.9",
     "@tauri-apps/cli": "^1.4.0",
-    "@trivago/prettier-plugin-sort-imports": "^4.1.1",
-    "@types/node": "^18.16.19",
-    "@types/react": "^18.2.14",
-    "@types/react-dom": "^18.2.6",
+    "@trivago/prettier-plugin-sort-imports": "^4.2.0",
+    "@types/html-to-text": "^9.0.1",
+    "@types/node": "^18.17.1",
+    "@types/react": "^18.2.17",
+    "@types/react-dom": "^18.2.7",
     "@types/youtube-player": "^5.5.7",
-    "@typescript-eslint/eslint-plugin": "^5.61.0",
-    "@typescript-eslint/parser": "^5.61.0",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "@typescript-eslint/parser": "^5.62.0",
     "@vitejs/plugin-react-swc": "^3.3.2",
     "autoprefixer": "^10.4.14",
     "cross-env": "^7.0.3",
     "csstype": "^3.1.2",
     "encoding": "^0.1.13",
-    "eslint": "^8.44.0",
+    "eslint": "^8.45.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-react": "^7.33.0",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "husky": "^8.0.3",
     "lint-staged": "^13.2.3",
-    "postcss": "^8.4.24",
+    "postcss": "^8.4.27",
     "prettier": "^2.8.8",
     "prettier-plugin-tailwindcss": "^0.3.0",
     "prop-types": "^15.8.1",
-    "tailwindcss": "^3.3.2",
+    "tailwindcss": "^3.3.3",
     "typescript": "^4.9.5",
-    "vite": "^4.3.9",
+    "vite": "^4.4.7",
     "vite-plugin-top-level-await": "^1.3.1",
     "vite-tsconfig-paths": "^4.2.0"
   }

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lume"
-version = "1.0.0"
+version = "1.1.1"
 description = "nostr client"
 authors = ["Ren Amamiya"]
 license = ""
@@ -16,11 +16,36 @@ tauri-build = { version = "1.2", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.2", features = [ "clipboard-read-text", "clipboard-write-text", "dialog-open", "fs-read-dir", "fs-read-file", "http-all", "http-multipart", "notification-all", "os-all", "process-relaunch", "shell-open", "system-tray", "updater", "window-close", "window-start-dragging"] }
+tauri = { version = "1.2", features = [
+  "fs-remove-file",
+  "fs-write-file",
+  "window-create",
+  "path-all",
+  "fs-read-dir",
+  "fs-read-file",
+  "clipboard-read-text",
+  "clipboard-write-text",
+  "dialog-open",
+  "http-all",
+  "http-multipart",
+  "notification-all",
+  "os-all",
+  "process-relaunch",
+  "shell-open",
+  "system-tray",
+  "updater",
+  "window-close",
+  "window-start-dragging",
+] }
 tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-sqlx-cli = {version = "0.6.3", default-features = false, features = ["sqlite"] }
+tauri-plugin-stronghold = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
+tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
+sqlx-cli = { version = "0.7.0", default-features = false, features = [
+  "sqlite",
+] }
+rust-argon2 = "1.0"
+rand = "0.8.5"
 
 [dependencies.tauri-plugin-sql]
 git = "https://github.com/tauri-apps/plugins-workspace"

src-tauri/migrations/20230718072634_clean_up_old_tables.sql

@@ -0,0 +1,6 @@
+-- Add migration script here
+DROP TABLE IF EXISTS blacklist;
+
+DROP TABLE IF EXISTS channel_messages;
+
+DROP TABLE IF EXISTS channels;

src-tauri/migrations/20230725010250_update_default_relays.sql

@@ -0,0 +1,6 @@
+-- Add migration script here
+UPDATE settings
+SET
+  value = '["wss://relayable.org","wss://relay.damus.io","wss://relay.nostr.band/all","wss://nostr.mutinywallet.com"]'
+WHERE
+  key = 'relays';

src-tauri/src/main.rs

@@ -7,9 +7,10 @@
 #[macro_use]
 extern crate objc;
 
+// use rand::distributions::{Alphanumeric, DistString};
 use tauri::{Manager, WindowEvent};
-use tauri_plugin_sql::{Migration, MigrationKind};
 use tauri_plugin_autostart::MacosLauncher;
+use tauri_plugin_sql::{Migration, MigrationKind};
 
 #[cfg(target_os = "macos")]
 use window_ext::WindowExt;
@@ -106,17 +107,56 @@ fn main() {
               sql: include_str!("../migrations/20230619082415_add_replies.sql"),
               kind: MigrationKind::Up,
             },
+            Migration {
+              version: 20230718072634,
+              description: "clean up",
+              sql: include_str!("../migrations/20230718072634_clean_up_old_tables.sql"),
+              kind: MigrationKind::Up,
+            },
+            Migration {
+              version: 20230725010250,
+              description: "update default relays",
+              sql: include_str!("../migrations/20230725010250_update_default_relays.sql"),
+              kind: MigrationKind::Up,
+            },
           ],
         )
         .build(),
     )
-    .plugin(tauri_plugin_autostart::init(MacosLauncher::LaunchAgent, Some(vec!["--flag1", "--flag2"])))
+    .plugin(
+      tauri_plugin_stronghold::Builder::new(|password| {
+        let config = argon2::Config {
+          lanes: 2,
+          mem_cost: 50_000,
+          time_cost: 30,
+          thread_mode: argon2::ThreadMode::from_threads(2),
+          variant: argon2::Variant::Argon2id,
+          ..Default::default()
+        };
+
+        // let salt = Alphanumeric.sample_string(&mut rand::thread_rng(), 12);
+        let key = argon2::hash_raw(
+          password.as_ref(),
+          b"LUME_NEED_RUST_DEVELOPER_HELP_MAKE_SALT_RANDOM",
+          &config,
+        )
+        .expect("failed to hash password");
+
+        key.to_vec()
+      })
+      .build(),
+    )
+    .plugin(tauri_plugin_autostart::init(
+      MacosLauncher::LaunchAgent,
+      Some(vec!["--flag1", "--flag2"]),
+    ))
     .plugin(tauri_plugin_single_instance::init(|app, argv, cwd| {
       println!("{}, {argv:?}, {cwd}", app.package_info().name);
       app
         .emit_all("single-instance", Payload { args: argv, cwd })
         .unwrap();
     }))
+    .plugin(tauri_plugin_upload::init())
     .run(tauri::generate_context!())
     .expect("error while running tauri application");
 }

src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
 	},
 	"package": {
 		"productName": "Lume",
-		"version": "1.0.0"
+		"version": "1.1.1"
 	},
 	"tauri": {
 		"allowlist": {
@@ -28,6 +28,8 @@
 				"all": false,
 				"readFile": true,
 				"readDir": true,
+				"writeFile": true,
+				"removeFile": true,
 				"scope": [
 					"$APPDATA/*",
 					"$DATA/*",
@@ -41,6 +43,9 @@
 					"$VIDEO/*"
 				]
 			},
+			"path": {
+				"all": true
+			},
 			"shell": {
 				"all": false,
 				"open": true
@@ -59,7 +64,8 @@
 			},
 			"window": {
 				"startDragging": true,
-				"close": true
+				"close": true,
+				"create": true
 			},
 			"process": {
 				"all": false,

src/app.tsx

@@ -5,13 +5,18 @@ import { CreateStep1Screen } from '@app/auth/create/step-1';
 import { CreateStep2Screen } from '@app/auth/create/step-2';
 import { CreateStep3Screen } from '@app/auth/create/step-3';
 import { CreateStep4Screen } from '@app/auth/create/step-4';
+import { CreateStep5Screen } from '@app/auth/create/step-5';
 import { AuthImportScreen } from '@app/auth/import';
 import { ImportStep1Screen } from '@app/auth/import/step-1';
 import { ImportStep2Screen } from '@app/auth/import/step-2';
+import { ImportStep3Screen } from '@app/auth/import/step-3';
+import { MigrateScreen } from '@app/auth/migrate';
 import { OnboardingScreen } from '@app/auth/onboarding';
+import { ResetScreen } from '@app/auth/reset';
+import { UnlockScreen } from '@app/auth/unlock';
 import { WelcomeScreen } from '@app/auth/welcome';
 import { ChannelScreen } from '@app/channel';
-import { ChatScreen } from '@app/chat';
+import { ChatScreen } from '@app/chats';
 import { ErrorScreen } from '@app/error';
 import { NoteScreen } from '@app/note';
 import { Root } from '@app/root';
@@ -20,7 +25,7 @@ import { GeneralSettingsScreen } from '@app/settings/general';
 import { ShortcutsSettingsScreen } from '@app/settings/shortcuts';
 import { SpaceScreen } from '@app/space';
 import { TrendingScreen } from '@app/trending';
-import { UserScreen } from '@app/user';
+import { UserScreen } from '@app/users';
 
 import { AppLayout } from '@shared/appLayout';
 import { AuthLayout } from '@shared/authLayout';
@@ -51,6 +56,7 @@ const router = createBrowserRouter([
         children: [
           { path: '', element: <ImportStep1Screen /> },
           { path: 'step-2', element: <ImportStep2Screen /> },
+          { path: 'step-3', element: <ImportStep3Screen /> },
         ],
       },
       {
@@ -61,8 +67,12 @@ const router = createBrowserRouter([
           { path: 'step-2', element: <CreateStep2Screen /> },
           { path: 'step-3', element: <CreateStep3Screen /> },
           { path: 'step-4', element: <CreateStep4Screen /> },
+          { path: 'step-5', element: <CreateStep5Screen /> },
         ],
       },
+      { path: 'unlock', element: <UnlockScreen /> },
+      { path: 'migrate', element: <MigrateScreen /> },
+      { path: 'reset', element: <ResetScreen /> },
     ],
   },
   {
@@ -76,8 +86,8 @@ const router = createBrowserRouter([
       { path: 'space', element: <SpaceScreen /> },
       { path: 'trending', element: <TrendingScreen /> },
       { path: 'note/:id', element: <NoteScreen /> },
-      { path: 'user/:pubkey', element: <UserScreen /> },
-      { path: 'chat/:pubkey', element: <ChatScreen /> },
+      { path: 'users/:pubkey', element: <UserScreen /> },
+      { path: 'chats/:pubkey', element: <ChatScreen /> },
       { path: 'channel/:id', element: <ChannelScreen /> },
     ],
   },

src/app/auth/components/user.tsx

@@ -24,7 +24,7 @@ export function User({ pubkey, fallback }: { pubkey: string; fallback?: string }
     <div className="flex items-center gap-2">
       <div className="relative h-10 w-10 shrink rounded-md">
         <Image
-          src={user.picture || user.image}
+          src={user?.picture || user?.image}
           fallback={DEFAULT_AVATAR}
           alt={pubkey}
           className="h-10 w-10 rounded-md object-cover"
@@ -32,10 +32,10 @@ export function User({ pubkey, fallback }: { pubkey: string; fallback?: string }
       </div>
       <div className="flex w-full flex-1 flex-col items-start text-start">
         <span className="truncate font-medium leading-tight text-zinc-100">
-          {user.name || user.displayName || user.display_name}
+          {user?.name || user?.displayName || user?.display_name}
         </span>
-        <span className="text-base leading-tight text-zinc-400">
-          {user.nip05?.toLowerCase() || shortenKey(pubkey)}
+        <span className="max-w-[15rem] truncate text-base leading-tight text-zinc-400">
+          {user?.nip05?.toLowerCase() || shortenKey(pubkey)}
         </span>
       </div>
     </div>

src/app/auth/create/step-1.tsx

@@ -1,4 +1,5 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { BaseDirectory, writeTextFile } from '@tauri-apps/api/fs';
 import { generatePrivateKey, getPublicKey, nip19 } from 'nostr-tools';
 import { useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
@@ -8,12 +9,18 @@ import { createAccount } from '@libs/storage';
 import { Button } from '@shared/button';
 import { EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
 
-export function CreateStep1Screen() {
-  const navigate = useNavigate();
-  const queryClient = useQueryClient();
+import { useOnboarding } from '@stores/onboarding';
+import { useStronghold } from '@stores/stronghold';
 
-  const [type, setType] = useState('password');
+export function CreateStep1Screen() {
+  const queryClient = useQueryClient();
+  const navigate = useNavigate();
+  const setPrivkey = useStronghold((state) => state.setPrivkey);
+  const setPubkey = useOnboarding((state) => state.setPubkey);
+
+  const [privkeyInput, setPrivkeyInput] = useState('password');
   const [loading, setLoading] = useState(false);
+  const [downloaded, setDownloaded] = useState(false);
 
   const privkey = useMemo(() => generatePrivateKey(), []);
   const pubkey = getPublicKey(privkey);
@@ -22,22 +29,32 @@ export function CreateStep1Screen() {
 
   // toggle private key
   const showPrivateKey = () => {
-    if (type === 'password') {
-      setType('text');
+    if (privkeyInput === 'password') {
+      setPrivkeyInput('text');
     } else {
-      setType('password');
+      setPrivkeyInput('password');
     }
   };
 
+  const download = async () => {
+    await writeTextFile(
+      'lume-keys.txt',
+      `Public key: ${pubkey}\nPrivate key: ${privkey}`,
+      {
+        dir: BaseDirectory.Download,
+      }
+    );
+    setDownloaded(true);
+  };
+
   const account = useMutation({
     mutationFn: (data: {
       npub: string;
       pubkey: string;
-      privkey: string;
       follows: null | string[][];
       is_active: number;
     }) => {
-      return createAccount(data.npub, data.pubkey, data.privkey, null, 1);
+      return createAccount(data.npub, data.pubkey, null, 1);
     },
     onSuccess: (data) => {
       queryClient.setQueryData(['currentAccount'], data);
@@ -47,10 +64,12 @@ export function CreateStep1Screen() {
   const submit = () => {
     setLoading(true);
 
+    setPubkey(pubkey);
+    setPrivkey(privkey);
+
     account.mutate({
       npub,
       pubkey,
-      privkey,
       follows: null,
       is_active: 1,
     });
@@ -62,9 +81,7 @@ export function CreateStep1Screen() {
   return (
     <div className="mx-auto w-full max-w-md">
       <div className="mb-8 text-center">
-        <h1 className="text-xl font-semibold text-zinc-100">
-          Lume is auto-generated key for you
-        </h1>
+        <h1 className="text-xl font-semibold text-zinc-100">Save your access key!</h1>
       </div>
       <div className="flex flex-col gap-4">
         <div className="flex flex-col gap-1">
@@ -80,7 +97,7 @@ export function CreateStep1Screen() {
           <div className="relative">
             <input
               readOnly
-              type={type}
+              type={privkeyInput}
               value={nsec}
               className="relative w-full rounded-lg bg-zinc-800 py-3 pl-3.5 pr-11 text-zinc-100 !outline-none placeholder:text-zinc-400"
             />
@@ -89,7 +106,7 @@ export function CreateStep1Screen() {
               onClick={() => showPrivateKey()}
               className="group absolute right-2 top-1/2 -translate-y-1/2 transform rounded p-1 hover:bg-zinc-700"
             >
-              {type === 'password' ? (
+              {privkeyInput === 'password' ? (
                 <EyeOffIcon
                   width={20}
                   height={20}
@@ -104,14 +121,30 @@ export function CreateStep1Screen() {
               )}
             </button>
           </div>
+          <div className="mt-2 text-sm text-zinc-500">
+            <p>
+              Your private key is your password. If you lose this key, you will lose
+              access to your account! Copy it and keep it in a safe place. There is no way
+              to reset your private key.
+            </p>
+          </div>
         </div>
-        <Button preset="large" onClick={() => submit()}>
-          {loading ? (
-            <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
+        <div className="flex flex-col gap-2">
+          <Button preset="large" onClick={() => submit()}>
+            {loading ? (
+              <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
+            ) : (
+              'I have saved my key, continue →'
+            )}
+          </Button>
+          {downloaded ? (
+            <span className="text-sm text-zinc-400">Saved in download folder</span>
           ) : (
-            'Continue →'
+            <Button preset="large-alt" onClick={() => download()}>
+              Download
+            </Button>
           )}
-        </Button>
+        </div>
       </div>
     </div>
   );

src/app/auth/create/step-2.tsx

@@ -1,142 +1,128 @@
 import { useState } from 'react';
-import { useForm } from 'react-hook-form';
+import { Resolver, useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
 
-import { AvatarUploader } from '@shared/avatarUploader';
-import { BannerUploader } from '@shared/bannerUploader';
-import { LoaderIcon } from '@shared/icons';
-import { Image } from '@shared/image';
+import { EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
 
-import { DEFAULT_AVATAR } from '@stores/constants';
 import { useOnboarding } from '@stores/onboarding';
+import { useStronghold } from '@stores/stronghold';
+
+import { useSecureStorage } from '@utils/hooks/useSecureStorage';
+
+type FormValues = {
+  password: string;
+};
+
+const resolver: Resolver<FormValues> = async (values) => {
+  return {
+    values: values.password ? values : {},
+    errors: !values.password
+      ? {
+          password: {
+            type: 'required',
+            message: 'This is required.',
+          },
+        }
+      : {},
+  };
+};
 
 export function CreateStep2Screen() {
   const navigate = useNavigate();
-  const createProfile = useOnboarding((state: any) => state.createProfile);
 
-  const [picture, setPicture] = useState(DEFAULT_AVATAR);
-  const [banner, setBanner] = useState('');
+  const [passwordInput, setPasswordInput] = useState('password');
   const [loading, setLoading] = useState(false);
 
+  const privkey = useStronghold((state) => state.privkey);
+  const pubkey = useOnboarding((state) => state.pubkey);
+
+  const { save } = useSecureStorage();
+
+  // toggle private key
+  const showPassword = () => {
+    if (passwordInput === 'password') {
+      setPasswordInput('text');
+    } else {
+      setPasswordInput('password');
+    }
+  };
+
   const {
     register,
+    setError,
     handleSubmit,
-    formState: { isDirty, isValid },
-  } = useForm();
+    formState: { errors, isDirty, isValid },
+  } = useForm<FormValues>({ resolver });
 
-  const onSubmit = (data: any) => {
+  const onSubmit = async (data: { [x: string]: string }) => {
     setLoading(true);
-    try {
-      const profile = {
-        ...data,
-        username: data.name,
-        display_name: data.name,
-        bio: data.about,
-      };
-      createProfile(profile);
+    if (data.password.length > 3) {
+      // save privkey to secure storage
+      await save(pubkey, privkey, data.password);
+
       // redirect to next step
-      setTimeout(() => navigate('/auth/create/step-3', { replace: true }), 1200);
-    } catch {
-      console.log('error');
+      navigate('/auth/create/step-3', { replace: true });
+    } else {
+      setLoading(false);
+      setError('password', {
+        type: 'custom',
+        message: 'Password is required and must be greater than 3',
+      });
     }
   };
 
   return (
     <div className="mx-auto w-full max-w-md">
       <div className="mb-8 text-center">
-        <h1 className="text-xl font-semibold text-zinc-100">Create your profile</h1>
+        <h1 className="text-xl font-semibold text-zinc-100">
+          Set password to secure your key
+        </h1>
       </div>
-      <div className="w-full overflow-hidden rounded-xl border-t border-zinc-800/50 bg-zinc-900">
-        <form onSubmit={handleSubmit(onSubmit)} className="mb-0 flex flex-col">
-          <input
-            type={'hidden'}
-            {...register('picture')}
-            value={picture}
-            className="shadow-input relative h-10 w-full rounded-lg border border-black/5 px-3 py-2 shadow-black/5 !outline-none placeholder:text-zinc-400 dark:bg-zinc-800 dark:text-zinc-100 dark:shadow-black/10 dark:placeholder:text-zinc-500"
-          />
-          <input
-            type={'hidden'}
-            {...register('banner')}
-            value={banner}
-            className="shadow-input relative h-10 w-full rounded-lg border border-black/5 px-3 py-2 shadow-black/5 !outline-none placeholder:text-zinc-400 dark:bg-zinc-800 dark:text-zinc-100 dark:shadow-black/10 dark:placeholder:text-zinc-500"
-          />
-          <div className="relative">
-            <div className="relative h-44 w-full bg-zinc-800">
-              <Image
-                src={banner}
-                fallback="https://void.cat/d/QY1myro5tkHVs2nY7dy74b.jpg"
-                alt="user's banner"
-                className="h-full w-full object-cover"
+      <div className="flex flex-col gap-4">
+        <form onSubmit={handleSubmit(onSubmit)} className="flex flex-col gap-3">
+          <div className="flex flex-col gap-1">
+            <div className="relative">
+              <input
+                {...register('password', { required: true })}
+                type={passwordInput}
+                className="relative w-full rounded-lg bg-zinc-800 py-3 pl-3.5 pr-11 text-zinc-100 !outline-none placeholder:text-zinc-400"
               />
-              <div className="absolute left-1/2 top-1/2 z-10 h-full w-full -translate-x-1/2 -translate-y-1/2 transform">
-                <BannerUploader setBanner={setBanner} />
-              </div>
+              <button
+                type="button"
+                onClick={() => showPassword()}
+                className="group absolute right-2 top-1/2 -translate-y-1/2 transform rounded p-1 hover:bg-zinc-700"
+              >
+                {passwordInput === 'password' ? (
+                  <EyeOffIcon
+                    width={20}
+                    height={20}
+                    className="text-zinc-500 group-hover:text-zinc-100"
+                  />
+                ) : (
+                  <EyeOnIcon
+                    width={20}
+                    height={20}
+                    className="text-zinc-500 group-hover:text-zinc-100"
+                  />
+                )}
+              </button>
             </div>
-            <div className="mb-5 px-4">
-              <div className="relative z-10 -mt-7 h-14 w-14">
-                <Image
-                  src={picture}
-                  fallback={DEFAULT_AVATAR}
-                  alt="user's avatar"
-                  className="h-14 w-14 rounded-lg object-cover ring-2 ring-zinc-900"
-                />
-                <div className="absolute left-1/2 top-1/2 z-10 h-full w-full -translate-x-1/2 -translate-y-1/2 transform">
-                  <AvatarUploader setPicture={setPicture} />
-                </div>
-              </div>
+            <div className="text-sm text-zinc-500">
+              <p>
+                Password is use to secure your key store in local machine, when you move
+                to other clients, you just need to copy your private key as nsec or
+                hexstring
+              </p>
             </div>
+            <span className="text-sm text-red-400">
+              {errors.password && <p>{errors.password.message}</p>}
+            </span>
           </div>
-          <div className="flex flex-col gap-4 px-4 pb-4">
-            <div className="flex flex-col gap-1">
-              <label
-                htmlFor="name"
-                className="text-sm font-semibold uppercase tracking-wider text-zinc-400"
-              >
-                Name *
-              </label>
-              <input
-                type={'text'}
-                {...register('name', {
-                  required: true,
-                  minLength: 4,
-                })}
-                spellCheck={false}
-                className="relative h-10 w-full rounded-lg bg-zinc-800 px-3 py-2 text-zinc-100 !outline-none placeholder:text-zinc-500"
-              />
-            </div>
-            <div className="flex flex-col gap-1">
-              <label
-                htmlFor="about"
-                className="text-sm font-semibold uppercase tracking-wider text-zinc-400"
-              >
-                Bio
-              </label>
-              <textarea
-                {...register('about')}
-                spellCheck={false}
-                className="relative h-20 w-full resize-none rounded-lg bg-zinc-800 px-3 py-2 text-zinc-100 !outline-none placeholder:text-zinc-500"
-              />
-            </div>
-            <div className="flex flex-col gap-1">
-              <label
-                htmlFor="website"
-                className="text-sm font-semibold uppercase tracking-wider text-zinc-400"
-              >
-                Website
-              </label>
-              <input
-                type={'text'}
-                {...register('website', {
-                  required: false,
-                })}
-                spellCheck={false}
-                className="relative h-10 w-full rounded-lg bg-zinc-800 px-3 py-2 text-zinc-100 !outline-none placeholder:text-zinc-500"
-              />
-            </div>
+          <div className="flex items-center justify-center">
             <button
               type="submit"
               disabled={!isDirty || !isValid}
-              className="inline-flex h-11 w-full items-center justify-center rounded-md bg-fuchsia-500 font-medium text-zinc-100 hover:bg-fuchsia-600"
+              className="inline-flex h-11 w-full items-center justify-center rounded-md bg-fuchsia-500 font-medium text-zinc-100 hover:bg-fuchsia-600 disabled:pointer-events-none disabled:opacity-50"
             >
               {loading ? (
                 <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />

src/app/auth/create/step-3.tsx

@@ -1,97 +1,152 @@
-import { NDKEvent, NDKPrivateKeySigner } from '@nostr-dev-kit/ndk';
-import { Body, fetch } from '@tauri-apps/api/http';
-import { useContext, useState } from 'react';
+import { useState } from 'react';
+import { useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
 
-import { Button } from '@shared/button';
+import { AvatarUploader } from '@shared/avatarUploader';
+import { BannerUploader } from '@shared/bannerUploader';
 import { LoaderIcon } from '@shared/icons';
-import { RelayContext } from '@shared/relayProvider';
+import { Image } from '@shared/image';
 
+import { DEFAULT_AVATAR } from '@stores/constants';
 import { useOnboarding } from '@stores/onboarding';
 
-import { useAccount } from '@utils/hooks/useAccount';
-
 export function CreateStep3Screen() {
-  const ndk = useContext(RelayContext);
-  const profile = useOnboarding((state: any) => state.profile);
   const navigate = useNavigate();
+  const createProfile = useOnboarding((state) => state.createProfile);
 
-  const { account } = useAccount();
-
-  const [username, setUsername] = useState('');
+  const [picture, setPicture] = useState(DEFAULT_AVATAR);
+  const [banner, setBanner] = useState('');
   const [loading, setLoading] = useState(false);
 
-  const createNIP05 = async () => {
+  const {
+    register,
+    handleSubmit,
+    formState: { isDirty, isValid },
+  } = useForm();
+
+  const onSubmit = (data: { name: string; about: string }) => {
+    setLoading(true);
     try {
-      setLoading(true);
-
-      const response = await fetch('https://lume.nu/api/user-create', {
-        method: 'POST',
-        timeout: 30,
-        headers: {
-          'Content-Type': 'application/json; charset=utf-8',
-        },
-        body: Body.json({
-          username: username,
-          pubkey: account.pubkey,
-          lightningAddress: '',
-        }),
-      });
-
-      if (response.ok) {
-        const data = { ...profile, nip05: `${username}@lume.nu` };
-
-        const signer = new NDKPrivateKeySigner(account.privkey);
-        ndk.signer = signer;
-
-        const event = new NDKEvent(ndk);
-        // build event
-        event.content = JSON.stringify(data);
-        event.kind = 0;
-        event.pubkey = account.pubkey;
-        event.tags = [];
-        // publish event
-        event.publish();
-
-        // redirect to step 4
-        navigate('/auth/create/step-4', { replace: true });
-      }
-    } catch (error) {
-      setLoading(false);
-      console.error('Error:', error);
+      const profile = {
+        ...data,
+        username: data.name,
+        name: data.name,
+        display_name: data.name,
+        bio: data.about,
+      };
+      createProfile(profile);
+      // redirect to next step
+      setTimeout(() => navigate('/auth/create/step-4', { replace: true }), 1200);
+    } catch {
+      console.log('error');
     }
   };
 
   return (
     <div className="mx-auto w-full max-w-md">
       <div className="mb-8 text-center">
-        <h1 className="text-xl font-semibold text-zinc-100">Create your Lume ID</h1>
+        <h1 className="text-xl font-semibold text-zinc-100">Create your profile</h1>
       </div>
-      <div className="flex w-full flex-col items-center justify-center gap-4">
-        <div className="inline-flex w-full items-center justify-center gap-2 rounded-lg bg-zinc-800">
+      <div className="w-full overflow-hidden rounded-xl border-t border-zinc-800/50 bg-zinc-900">
+        <form onSubmit={handleSubmit(onSubmit)} className="mb-0 flex flex-col">
           <input
-            type="text"
-            value={username}
-            onChange={(e) => setUsername(e.target.value)}
-            autoCapitalize="false"
-            autoCorrect="none"
-            spellCheck="false"
-            placeholder="satoshi"
-            className="relative w-full bg-transparent py-3 pl-3.5 text-zinc-100 !outline-none placeholder:text-zinc-500"
+            type={'hidden'}
+            {...register('picture')}
+            value={picture}
+            className="shadow-input relative h-10 w-full rounded-lg border border-black/5 px-3 py-2 shadow-black/5 !outline-none placeholder:text-zinc-400 dark:bg-zinc-800 dark:text-zinc-100 dark:shadow-black/10 dark:placeholder:text-zinc-500"
           />
-          <span className="pr-3.5 font-semibold text-fuchsia-500">@lume.nu</span>
-        </div>
-        <Button
-          preset="large"
-          onClick={() => createNIP05()}
-          disabled={username.length === 0}
-        >
-          {loading ? (
-            <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
-          ) : (
-            'Continue →'
-          )}
-        </Button>
+          <input
+            type={'hidden'}
+            {...register('banner')}
+            value={banner}
+            className="shadow-input relative h-10 w-full rounded-lg border border-black/5 px-3 py-2 shadow-black/5 !outline-none placeholder:text-zinc-400 dark:bg-zinc-800 dark:text-zinc-100 dark:shadow-black/10 dark:placeholder:text-zinc-500"
+          />
+          <div className="relative">
+            <div className="relative h-44 w-full bg-zinc-800">
+              <Image
+                src={banner}
+                fallback="https://void.cat/d/QY1myro5tkHVs2nY7dy74b.jpg"
+                alt="user's banner"
+                className="h-full w-full object-cover"
+              />
+              <div className="absolute left-1/2 top-1/2 z-10 h-full w-full -translate-x-1/2 -translate-y-1/2 transform">
+                <BannerUploader setBanner={setBanner} />
+              </div>
+            </div>
+            <div className="mb-5 px-4">
+              <div className="relative z-10 -mt-7 h-14 w-14">
+                <Image
+                  src={picture}
+                  fallback={DEFAULT_AVATAR}
+                  alt="user's avatar"
+                  className="h-14 w-14 rounded-lg object-cover ring-2 ring-zinc-900"
+                />
+                <div className="absolute left-1/2 top-1/2 z-10 h-full w-full -translate-x-1/2 -translate-y-1/2 transform">
+                  <AvatarUploader setPicture={setPicture} />
+                </div>
+              </div>
+            </div>
+          </div>
+          <div className="flex flex-col gap-4 px-4 pb-4">
+            <div className="flex flex-col gap-1">
+              <label
+                htmlFor="name"
+                className="text-sm font-semibold uppercase tracking-wider text-zinc-400"
+              >
+                Name *
+              </label>
+              <input
+                type={'text'}
+                {...register('name', {
+                  required: true,
+                  minLength: 4,
+                })}
+                spellCheck={false}
+                className="relative h-10 w-full rounded-lg bg-zinc-800 px-3 py-2 text-zinc-100 !outline-none placeholder:text-zinc-500"
+              />
+            </div>
+            <div className="flex flex-col gap-1">
+              <label
+                htmlFor="about"
+                className="text-sm font-semibold uppercase tracking-wider text-zinc-400"
+              >
+                Bio
+              </label>
+              <textarea
+                {...register('about')}
+                spellCheck={false}
+                className="relative h-20 w-full resize-none rounded-lg bg-zinc-800 px-3 py-2 text-zinc-100 !outline-none placeholder:text-zinc-500"
+              />
+            </div>
+            <div className="flex flex-col gap-1">
+              <label
+                htmlFor="website"
+                className="text-sm font-semibold uppercase tracking-wider text-zinc-400"
+              >
+                Website
+              </label>
+              <input
+                type={'text'}
+                {...register('website', {
+                  required: false,
+                })}
+                spellCheck={false}
+                className="relative h-10 w-full rounded-lg bg-zinc-800 px-3 py-2 text-zinc-100 !outline-none placeholder:text-zinc-500"
+              />
+            </div>
+            <button
+              type="submit"
+              disabled={!isDirty || !isValid}
+              className="inline-flex h-11 w-full items-center justify-center rounded-md bg-fuchsia-500 font-medium text-zinc-100 hover:bg-fuchsia-600"
+            >
+              {loading ? (
+                <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
+              ) : (
+                'Continue →'
+              )}
+            </button>
+          </div>
+        </form>
       </div>
     </div>
   );

src/app/auth/create/step-4.tsx

@@ -1,234 +1,85 @@
-import { NDKEvent, NDKPrivateKeySigner } from '@nostr-dev-kit/ndk';
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { useContext, useState } from 'react';
+import { Body, fetch } from '@tauri-apps/api/http';
+import { useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import { User } from '@app/auth/components/user';
+import { Button } from '@shared/button';
+import { LoaderIcon } from '@shared/icons';
 
-import { updateAccount } from '@libs/storage';
-
-import { CheckCircleIcon, LoaderIcon } from '@shared/icons';
-import { RelayContext } from '@shared/relayProvider';
+import { useOnboarding } from '@stores/onboarding';
 
 import { useAccount } from '@utils/hooks/useAccount';
-import { arrayToNIP02 } from '@utils/transform';
-
-const INITIAL_LIST = [
-  {
-    pubkey: '82341f882b6eabcd2ba7f1ef90aad961cf074af15b9ef44a09f9d2a8fbfbe6a2',
-  },
-  {
-    pubkey: 'a341f45ff9758f570a21b000c17d4e53a3a497c8397f26c0e6d61e5acffc7a98',
-  },
-  {
-    pubkey: '04c915daefee38317fa734444acee390a8269fe5810b2241e5e6dd343dfbecc9',
-  },
-  {
-    pubkey: 'c4eabae1be3cf657bc1855ee05e69de9f059cb7a059227168b80b89761cbc4e0',
-  },
-  {
-    pubkey: '6e468422dfb74a5738702a8823b9b28168abab8655faacb6853cd0ee15deee93',
-  },
-  {
-    pubkey: 'e88a691e98d9987c964521dff60025f60700378a4879180dcbbb4a5027850411',
-  },
-  {
-    pubkey: '3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d',
-  },
-  {
-    pubkey: 'c49d52a573366792b9a6e4851587c28042fb24fa5625c6d67b8c95c8751aca15',
-  },
-  {
-    pubkey: 'e33fe65f1fde44c6dc17eeb38fdad0fceaf1cae8722084332ed1e32496291d42',
-  },
-  {
-    pubkey: '84dee6e676e5bb67b4ad4e042cf70cbd8681155db535942fcc6a0533858a7240',
-  },
-  {
-    pubkey: '703e26b4f8bc0fa57f99d815dbb75b086012acc24fc557befa310f5aa08d1898',
-  },
-  {
-    pubkey: 'bf2376e17ba4ec269d10fcc996a4746b451152be9031fa48e74553dde5526bce',
-  },
-  {
-    pubkey: '4523be58d395b1b196a9b8c82b038b6895cb02b683d0c253a955068dba1facd0',
-  },
-  {
-    pubkey: 'c9b19ffcd43e6a5f23b3d27106ce19e4ad2df89ba1031dd4617f1b591e108965',
-  },
-  {
-    pubkey: 'c7dccba4fe4426a7b1ea239a5637ba40fab9862c8c86b3330fe65e9f667435f6',
-  },
-  {
-    pubkey: '6e1534f56fc9e937e06237c8ba4b5662bcacc4e1a3cfab9c16d89390bec4fca3',
-  },
-  {
-    pubkey: '50d94fc2d8580c682b071a542f8b1e31a200b0508bab95a33bef0855df281d63',
-  },
-  {
-    pubkey: '3d2e51508699f98f0f2bdbe7a45b673c687fe6420f466dc296d90b908d51d594',
-  },
-  {
-    pubkey: '6e3f51664e19e082df5217fd4492bb96907405a0b27028671dd7f297b688608c',
-  },
-  {
-    pubkey: '2edbcea694d164629854a52583458fd6d965b161e3c48b57d3aff01940558884',
-  },
-  {
-    pubkey: '3f770d65d3a764a9c5cb503ae123e62ec7598ad035d836e2a810f3877a745b24',
-  },
-  {
-    pubkey: 'eab0e756d32b80bcd464f3d844b8040303075a13eabc3599a762c9ac7ab91f4f',
-  },
-  {
-    pubkey: 'be1d89794bf92de5dd64c1e60f6a2c70c140abac9932418fee30c5c637fe9479',
-  },
-  {
-    pubkey: 'a5e93aef8e820cbc7ab7b6205f854b87aed4b48c5f6b30fbbeba5c99e40dcf3f',
-  },
-  {
-    pubkey: '1989034e56b8f606c724f45a12ce84a11841621aaf7182a1f6564380b9c4276b',
-  },
-  {
-    pubkey: 'c48b5cced5ada74db078df6b00fa53fc1139d73bf0ed16de325d52220211dbd5',
-  },
-  {
-    pubkey: '460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c',
-  },
-  {
-    pubkey: '7f3b464b9ff3623630485060cbda3a7790131c5339a7803bde8feb79a5e1b06a',
-  },
-  {
-    pubkey: 'b99dbca0184a32ce55904cb267b22e434823c97f418f36daf5d2dff0dd7b5c27',
-  },
-  {
-    pubkey: 'e9e4276490374a0daf7759fd5f475deff6ffb9b0fc5fa98c902b5f4b2fe3bba2',
-  },
-  {
-    pubkey: 'ea2e3c814d08a378f8a5b8faecb2884d05855975c5ca4b5c25e2d6f936286f14',
-  },
-  {
-    pubkey: 'ff04a0e6cd80c141b0b55825fed127d4532a6eecdb7e743a38a3c28bf9f44609',
-  },
-];
+import { usePublish } from '@utils/hooks/usePublish';
 
 export function CreateStep4Screen() {
-  const ndk = useContext(RelayContext);
-  const queryClient = useQueryClient();
   const navigate = useNavigate();
+  const profile = useOnboarding((state) => state.profile);
 
-  const [loading, setLoading] = useState(false);
-  const [follows, setFollows] = useState([]);
-
+  const { publish } = usePublish();
   const { account } = useAccount();
-  const { status, data } = useQuery(['trending-profiles'], async () => {
-    const res = await fetch('https://api.nostr.band/v0/trending/profiles');
-    if (!res.ok) {
-      throw new Error('Error');
-    }
-    return res.json();
-  });
 
-  // toggle follow state
-  const toggleFollow = (pubkey: string) => {
-    const arr = follows.includes(pubkey)
-      ? follows.filter((i) => i !== pubkey)
-      : [...follows, pubkey];
-    setFollows(arr);
-  };
+  const [username, setUsername] = useState('');
+  const [loading, setLoading] = useState(false);
 
-  const update = useMutation({
-    mutationFn: (follows: any) => {
-      return updateAccount('follows', follows, account.pubkey);
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['currentAccount'] });
-    },
-  });
-
-  // save follows to database then broadcast
-  const submit = async () => {
+  const createNIP05 = async () => {
     try {
       setLoading(true);
 
-      const tags = arrayToNIP02([...follows, account.pubkey]);
-      const signer = new NDKPrivateKeySigner(account.privkey);
-      ndk.signer = signer;
+      const response = await fetch('https://lume.nu/api/user-create', {
+        method: 'POST',
+        timeout: 30,
+        headers: {
+          'Content-Type': 'application/json; charset=utf-8',
+        },
+        body: Body.json({
+          username: username,
+          pubkey: account.pubkey,
+          lightningAddress: '',
+        }),
+      });
 
-      const event = new NDKEvent(ndk);
-      // build event
-      event.content = '';
-      event.kind = 3;
-      event.pubkey = account.pubkey;
-      event.tags = tags;
-      // publish event
-      event.publish();
+      if (response.ok) {
+        const data = { ...profile, nip05: `${username}@lume.nu` };
+        publish({ content: JSON.stringify(data), kind: 0, tags: [] });
 
-      // update
-      update.mutate([...follows, account.pubkey]);
-
-      // redirect to next step
-      setTimeout(() => navigate('/auth/onboarding', { replace: true }), 1200);
-    } catch {
-      console.log('error');
+        // redirect to step 4
+        navigate('/auth/create/step-5', { replace: true });
+      }
+    } catch (error) {
+      setLoading(false);
+      console.error('Error:', error);
     }
   };
 
-  const list = data ? data.profiles.concat(INITIAL_LIST) : [];
-
   return (
     <div className="mx-auto w-full max-w-md">
       <div className="mb-8 text-center">
-        <h1 className="text-xl font-semibold text-zinc-100">
-          Personalized your newsfeed
-        </h1>
+        <h1 className="text-xl font-semibold text-zinc-100">Create your Lume ID</h1>
       </div>
-      <div className="flex flex-col gap-4">
-        <div className="w-full overflow-hidden rounded-xl border-t border-zinc-800/50 bg-zinc-900">
-          <div className="inline-flex h-10 w-full items-center gap-1 border-b border-zinc-800 px-4 text-base font-medium text-zinc-400">
-            Follow at least
-            <span className="font-semibold text-fuchsia-500">
-              {follows.length}/10
-            </span>{' '}
-            plebs
-          </div>
-          {status === 'loading' ? (
-            <div className="inline-flex h-11 w-full items-center justify-center px-4 py-2">
-              <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
-            </div>
-          ) : (
-            <div className="scrollbar-hide flex h-96 flex-col overflow-y-auto py-2">
-              {list.map((item: { pubkey: string; profile: { content: string } }) => (
-                <button
-                  key={item.pubkey}
-                  type="button"
-                  onClick={() => toggleFollow(item.pubkey)}
-                  className="inline-flex transform items-center justify-between bg-zinc-900 px-4 py-2 hover:bg-zinc-800 active:translate-y-1"
-                >
-                  <User pubkey={item.pubkey} fallback={item.profile?.content} />
-                  {follows.includes(item.pubkey) && (
-                    <div>
-                      <CheckCircleIcon className="h-4 w-4 text-green-400" />
-                    </div>
-                  )}
-                </button>
-              ))}
-            </div>
-          )}
+      <div className="flex w-full flex-col items-center justify-center gap-4">
+        <div className="inline-flex w-full items-center justify-center gap-2 rounded-lg bg-zinc-800">
+          <input
+            type="text"
+            value={username}
+            onChange={(e) => setUsername(e.target.value)}
+            autoCapitalize="false"
+            autoCorrect="none"
+            spellCheck="false"
+            placeholder="satoshi"
+            className="relative w-full bg-transparent py-3 pl-3.5 text-zinc-100 !outline-none placeholder:text-zinc-500"
+          />
+          <span className="pr-3.5 font-semibold text-fuchsia-500">@lume.nu</span>
         </div>
-        {follows.length >= 10 && (
-          <button
-            type="button"
-            onClick={() => submit()}
-            className="inline-flex h-11 w-full items-center justify-center rounded-md bg-fuchsia-500 font-medium text-zinc-100 hover:bg-fuchsia-600"
-          >
-            {loading ? (
-              <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
-            ) : (
-              'Finish →'
-            )}
-          </button>
-        )}
+        <Button
+          preset="large"
+          onClick={() => createNIP05()}
+          disabled={username.length === 0}
+        >
+          {loading ? (
+            <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
+          ) : (
+            'Continue →'
+          )}
+        </Button>
       </div>
     </div>
   );

src/app/auth/create/step-5.tsx

@@ -0,0 +1,224 @@
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+
+import { User } from '@app/auth/components/user';
+
+import { updateAccount } from '@libs/storage';
+
+import { CheckCircleIcon, LoaderIcon } from '@shared/icons';
+
+import { useAccount } from '@utils/hooks/useAccount';
+import { usePublish } from '@utils/hooks/usePublish';
+import { arrayToNIP02 } from '@utils/transform';
+
+const INITIAL_LIST = [
+  {
+    pubkey: '82341f882b6eabcd2ba7f1ef90aad961cf074af15b9ef44a09f9d2a8fbfbe6a2',
+  },
+  {
+    pubkey: 'a341f45ff9758f570a21b000c17d4e53a3a497c8397f26c0e6d61e5acffc7a98',
+  },
+  {
+    pubkey: '04c915daefee38317fa734444acee390a8269fe5810b2241e5e6dd343dfbecc9',
+  },
+  {
+    pubkey: 'c4eabae1be3cf657bc1855ee05e69de9f059cb7a059227168b80b89761cbc4e0',
+  },
+  {
+    pubkey: '6e468422dfb74a5738702a8823b9b28168abab8655faacb6853cd0ee15deee93',
+  },
+  {
+    pubkey: 'e88a691e98d9987c964521dff60025f60700378a4879180dcbbb4a5027850411',
+  },
+  {
+    pubkey: '3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d',
+  },
+  {
+    pubkey: 'c49d52a573366792b9a6e4851587c28042fb24fa5625c6d67b8c95c8751aca15',
+  },
+  {
+    pubkey: 'e33fe65f1fde44c6dc17eeb38fdad0fceaf1cae8722084332ed1e32496291d42',
+  },
+  {
+    pubkey: '84dee6e676e5bb67b4ad4e042cf70cbd8681155db535942fcc6a0533858a7240',
+  },
+  {
+    pubkey: '703e26b4f8bc0fa57f99d815dbb75b086012acc24fc557befa310f5aa08d1898',
+  },
+  {
+    pubkey: 'bf2376e17ba4ec269d10fcc996a4746b451152be9031fa48e74553dde5526bce',
+  },
+  {
+    pubkey: '4523be58d395b1b196a9b8c82b038b6895cb02b683d0c253a955068dba1facd0',
+  },
+  {
+    pubkey: 'c9b19ffcd43e6a5f23b3d27106ce19e4ad2df89ba1031dd4617f1b591e108965',
+  },
+  {
+    pubkey: 'c7dccba4fe4426a7b1ea239a5637ba40fab9862c8c86b3330fe65e9f667435f6',
+  },
+  {
+    pubkey: '6e1534f56fc9e937e06237c8ba4b5662bcacc4e1a3cfab9c16d89390bec4fca3',
+  },
+  {
+    pubkey: '50d94fc2d8580c682b071a542f8b1e31a200b0508bab95a33bef0855df281d63',
+  },
+  {
+    pubkey: '3d2e51508699f98f0f2bdbe7a45b673c687fe6420f466dc296d90b908d51d594',
+  },
+  {
+    pubkey: '6e3f51664e19e082df5217fd4492bb96907405a0b27028671dd7f297b688608c',
+  },
+  {
+    pubkey: '2edbcea694d164629854a52583458fd6d965b161e3c48b57d3aff01940558884',
+  },
+  {
+    pubkey: '3f770d65d3a764a9c5cb503ae123e62ec7598ad035d836e2a810f3877a745b24',
+  },
+  {
+    pubkey: 'eab0e756d32b80bcd464f3d844b8040303075a13eabc3599a762c9ac7ab91f4f',
+  },
+  {
+    pubkey: 'be1d89794bf92de5dd64c1e60f6a2c70c140abac9932418fee30c5c637fe9479',
+  },
+  {
+    pubkey: 'a5e93aef8e820cbc7ab7b6205f854b87aed4b48c5f6b30fbbeba5c99e40dcf3f',
+  },
+  {
+    pubkey: '1989034e56b8f606c724f45a12ce84a11841621aaf7182a1f6564380b9c4276b',
+  },
+  {
+    pubkey: 'c48b5cced5ada74db078df6b00fa53fc1139d73bf0ed16de325d52220211dbd5',
+  },
+  {
+    pubkey: '460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c',
+  },
+  {
+    pubkey: '7f3b464b9ff3623630485060cbda3a7790131c5339a7803bde8feb79a5e1b06a',
+  },
+  {
+    pubkey: 'b99dbca0184a32ce55904cb267b22e434823c97f418f36daf5d2dff0dd7b5c27',
+  },
+  {
+    pubkey: 'e9e4276490374a0daf7759fd5f475deff6ffb9b0fc5fa98c902b5f4b2fe3bba2',
+  },
+  {
+    pubkey: 'ea2e3c814d08a378f8a5b8faecb2884d05855975c5ca4b5c25e2d6f936286f14',
+  },
+  {
+    pubkey: 'ff04a0e6cd80c141b0b55825fed127d4532a6eecdb7e743a38a3c28bf9f44609',
+  },
+];
+
+export function CreateStep5Screen() {
+  const queryClient = useQueryClient();
+  const navigate = useNavigate();
+
+  const [loading, setLoading] = useState(false);
+  const [follows, setFollows] = useState([]);
+
+  const { publish } = usePublish();
+  const { account } = useAccount();
+  const { status, data } = useQuery(['trending-profiles'], async () => {
+    const res = await fetch('https://api.nostr.band/v0/trending/profiles');
+    if (!res.ok) {
+      throw new Error('Error');
+    }
+    return res.json();
+  });
+
+  // toggle follow state
+  const toggleFollow = (pubkey: string) => {
+    const arr = follows.includes(pubkey)
+      ? follows.filter((i) => i !== pubkey)
+      : [...follows, pubkey];
+    setFollows(arr);
+  };
+
+  const update = useMutation({
+    mutationFn: (follows: string[]) => {
+      return updateAccount('follows', follows, account.pubkey);
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['currentAccount'] });
+    },
+  });
+
+  // save follows to database then broadcast
+  const submit = async () => {
+    try {
+      setLoading(true);
+
+      const tags = arrayToNIP02([...follows, account.pubkey]);
+      publish({ content: '', kind: 3, tags: tags });
+
+      // update
+      update.mutate([...follows, account.pubkey]);
+
+      // redirect to next step
+      setTimeout(() => navigate('/auth/onboarding', { replace: true }), 1200);
+    } catch {
+      console.log('error');
+    }
+  };
+
+  const list = data ? data.profiles.concat(INITIAL_LIST) : INITIAL_LIST;
+
+  return (
+    <div className="mx-auto w-full max-w-md">
+      <div className="mb-8 text-center">
+        <h1 className="text-xl font-semibold text-zinc-100">
+          Personalized your newsfeed
+        </h1>
+      </div>
+      <div className="flex flex-col gap-4">
+        <div className="w-full overflow-hidden rounded-xl border-t border-zinc-800/50 bg-zinc-900">
+          <div className="inline-flex h-10 w-full items-center gap-1 border-b border-zinc-800 px-4 text-base font-medium text-zinc-400">
+            Follow at least
+            <span className="font-semibold text-fuchsia-500">
+              {follows.length}/10
+            </span>{' '}
+            plebs
+          </div>
+          {status === 'loading' ? (
+            <div className="inline-flex h-11 w-full items-center justify-center px-4 py-2">
+              <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
+            </div>
+          ) : (
+            <div className="scrollbar-hide flex h-96 flex-col overflow-y-auto py-2">
+              {list.map((item: { pubkey: string; profile: { content: string } }) => (
+                <button
+                  key={item.pubkey}
+                  type="button"
+                  onClick={() => toggleFollow(item.pubkey)}
+                  className="inline-flex transform items-center justify-between bg-zinc-900 px-4 py-2 hover:bg-zinc-800 active:translate-y-1"
+                >
+                  <User pubkey={item.pubkey} fallback={item.profile?.content} />
+                  {follows.includes(item.pubkey) && (
+                    <div>
+                      <CheckCircleIcon className="h-4 w-4 text-green-400" />
+                    </div>
+                  )}
+                </button>
+              ))}
+            </div>
+          )}
+        </div>
+        {follows.length >= 10 && (
+          <button
+            type="button"
+            onClick={() => submit()}
+            className="inline-flex h-11 w-full items-center justify-center rounded-md bg-fuchsia-500 font-medium text-zinc-100 hover:bg-fuchsia-600"
+          >
+            {loading ? (
+              <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
+            ) : (
+              'Finish →'
+            )}
+          </button>
+        )}
+      </div>
+    </div>
+  );
+}

src/app/auth/import/step-1.tsx

@@ -8,16 +8,19 @@ import { createAccount } from '@libs/storage';
 
 import { LoaderIcon } from '@shared/icons';
 
+import { useOnboarding } from '@stores/onboarding';
+import { useStronghold } from '@stores/stronghold';
+
 type FormValues = {
-  key: string;
+  privkey: string;
 };
 
 const resolver: Resolver<FormValues> = async (values) => {
   return {
-    values: values.key ? values : {},
-    errors: !values.key
+    values: values.privkey ? values : {},
+    errors: !values.privkey
       ? {
-          key: {
+          privkey: {
             type: 'required',
             message: 'This is required.',
           },
@@ -27,16 +30,23 @@ const resolver: Resolver<FormValues> = async (values) => {
 };
 
 export function ImportStep1Screen() {
-  const navigate = useNavigate();
   const queryClient = useQueryClient();
+  const navigate = useNavigate();
+  const setPrivkey = useStronghold((state) => state.setPrivkey);
+  const setPubkey = useOnboarding((state) => state.setPubkey);
 
   const [loading, setLoading] = useState(false);
 
   const account = useMutation({
-    mutationFn: (data: any) => {
-      return createAccount(data.npub, data.pubkey, data.privkey, null, 1);
+    mutationFn: (data: {
+      npub: string;
+      pubkey: string;
+      follows: null | string[];
+      is_active: number | boolean;
+    }) => {
+      return createAccount(data.npub, data.pubkey, null, 1);
     },
-    onSuccess: (data: any) => {
+    onSuccess: (data) => {
       queryClient.setQueryData(['currentAccount'], data);
     },
   });
@@ -48,24 +58,28 @@ export function ImportStep1Screen() {
     formState: { errors, isDirty, isValid },
   } = useForm<FormValues>({ resolver });
 
-  const onSubmit = async (data: any) => {
+  const onSubmit = async (data: { [x: string]: string }) => {
     try {
       setLoading(true);
 
-      let privkey = data['key'];
+      let privkey = data['privkey'];
       if (privkey.substring(0, 4) === 'nsec') {
-        privkey = nip19.decode(privkey).data;
+        privkey = nip19.decode(privkey).data as string;
       }
 
       if (typeof getPublicKey(privkey) === 'string') {
         const pubkey = getPublicKey(privkey);
         const npub = nip19.npubEncode(pubkey);
 
-        // update
+        // use for onboarding process only
+        setPubkey(pubkey);
+        // add stronghold state
+        setPrivkey(privkey);
+
+        // add account to local database
         account.mutate({
           npub,
           pubkey,
-          privkey,
           follows: null,
           is_active: 1,
         });
@@ -74,7 +88,7 @@ export function ImportStep1Screen() {
         setTimeout(() => navigate('/auth/import/step-2', { replace: true }), 1200);
       }
     } catch (error) {
-      setError('key', {
+      setError('privkey', {
         type: 'custom',
         message: 'Private Key is invalid, please check again',
       });
@@ -88,15 +102,16 @@ export function ImportStep1Screen() {
       </div>
       <div className="flex flex-col gap-4">
         <form onSubmit={handleSubmit(onSubmit)} className="flex flex-col gap-3">
-          <div className="flex flex-col gap-0.5">
+          <div className="flex flex-col gap-1">
+            <span className="text-base font-semibold text-zinc-400">Private key</span>
             <input
-              {...register('key', { required: true, minLength: 32 })}
+              {...register('privkey', { required: true, minLength: 32 })}
               type={'password'}
-              placeholder="Paste private key here..."
+              placeholder="nsec or hexstring"
               className="relative w-full rounded-lg bg-zinc-800 px-3 py-3 text-zinc-100 !outline-none placeholder:text-zinc-500"
             />
-            <span className="text-base text-red-400">
-              {errors.key && <p>{errors.key.message}</p>}
+            <span className="text-sm text-red-400">
+              {errors.privkey && <p>{errors.privkey.message}</p>}
             </span>
           </div>
           <div className="flex items-center justify-center">

src/app/auth/import/step-2.tsx

@@ -1,86 +1,137 @@
-import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { useContext, useState } from 'react';
+import { useState } from 'react';
+import { Resolver, useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
 
-import { User } from '@app/auth/components/user';
+import { EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
 
-import { updateAccount } from '@libs/storage';
+import { useOnboarding } from '@stores/onboarding';
+import { useStronghold } from '@stores/stronghold';
 
-import { Button } from '@shared/button';
-import { LoaderIcon } from '@shared/icons';
-import { RelayContext } from '@shared/relayProvider';
+import { useSecureStorage } from '@utils/hooks/useSecureStorage';
 
-import { useAccount } from '@utils/hooks/useAccount';
-import { setToArray } from '@utils/transform';
+type FormValues = {
+  password: string;
+};
+
+const resolver: Resolver<FormValues> = async (values) => {
+  return {
+    values: values.password ? values : {},
+    errors: !values.password
+      ? {
+          password: {
+            type: 'required',
+            message: 'This is required.',
+          },
+        }
+      : {},
+  };
+};
 
 export function ImportStep2Screen() {
-  const ndk = useContext(RelayContext);
-  const queryClient = useQueryClient();
   const navigate = useNavigate();
 
+  const [passwordInput, setPasswordInput] = useState('password');
   const [loading, setLoading] = useState(false);
-  const { status, account } = useAccount();
 
-  const update = useMutation({
-    mutationFn: (follows: any) => {
-      return updateAccount('follows', follows, account.pubkey);
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['currentAccount'] });
-    },
-  });
+  const privkey = useStronghold((state) => state.privkey);
+  const pubkey = useOnboarding((state) => state.pubkey);
 
-  const submit = async () => {
-    try {
-      // show loading indicator
-      setLoading(true);
+  const { save } = useSecureStorage();
 
-      const user = ndk.getUser({ hexpubkey: account.pubkey });
-      const follows = await user.follows();
+  // toggle private key
+  const showPassword = () => {
+    if (passwordInput === 'password') {
+      setPasswordInput('text');
+    } else {
+      setPasswordInput('password');
+    }
+  };
 
-      // follows as list
-      const followsList = setToArray(follows);
+  const {
+    register,
+    setError,
+    handleSubmit,
+    formState: { errors, isDirty, isValid },
+  } = useForm<FormValues>({ resolver });
 
-      // update
-      update.mutate([...followsList, account.pubkey]);
+  const onSubmit = async (data: { [x: string]: string }) => {
+    setLoading(true);
+    if (data.password.length > 3) {
+      // save privkey to secure storage
+      await save(pubkey, privkey, data.password);
 
       // redirect to next step
-      setTimeout(() => navigate('/auth/onboarding', { replace: true }), 1200);
-    } catch {
-      console.log('error');
+      navigate('/auth/import/step-3', { replace: true });
+    } else {
+      setLoading(false);
+      setError('password', {
+        type: 'custom',
+        message: 'Password is required and must be greater than 3, please check again',
+      });
     }
   };
 
   return (
     <div className="mx-auto w-full max-w-md">
       <div className="mb-8 text-center">
-        <h1 className="text-xl font-semibold">
-          {loading ? 'Creating...' : 'Continue with'}
+        <h1 className="text-xl font-semibold text-zinc-100">
+          Set password to secure your key
         </h1>
       </div>
-      <div className="w-full rounded-xl border-t border-zinc-800/50 bg-zinc-900 p-4">
-        {status === 'loading' ? (
-          <div className="w-full">
-            <div className="flex items-center gap-2">
-              <div className="h-11 w-11 animate-pulse rounded-lg bg-zinc-800" />
-              <div>
-                <div className="mb-1 h-4 w-16 animate-pulse rounded bg-zinc-800" />
-                <div className="h-3 w-36 animate-pulse rounded bg-zinc-800" />
-              </div>
+      <div className="flex flex-col gap-4">
+        <form onSubmit={handleSubmit(onSubmit)} className="flex flex-col gap-3">
+          <div className="flex flex-col gap-1">
+            <div className="relative">
+              <input
+                {...register('password', { required: true })}
+                type={passwordInput}
+                className="relative w-full rounded-lg bg-zinc-800 py-3 pl-3.5 pr-11 text-zinc-100 !outline-none placeholder:text-zinc-400"
+              />
+              <button
+                type="button"
+                onClick={() => showPassword()}
+                className="group absolute right-2 top-1/2 -translate-y-1/2 transform rounded p-1 hover:bg-zinc-700"
+              >
+                {passwordInput === 'password' ? (
+                  <EyeOffIcon
+                    width={20}
+                    height={20}
+                    className="text-zinc-500 group-hover:text-zinc-100"
+                  />
+                ) : (
+                  <EyeOnIcon
+                    width={20}
+                    height={20}
+                    className="text-zinc-500 group-hover:text-zinc-100"
+                  />
+                )}
+              </button>
             </div>
+            <div className="text-sm text-zinc-500">
+              <p>
+                Password is use to unlock app and secure your key store in local machine.
+                When you move to other clients, you just need to copy your private key as
+                nsec or hexstring
+              </p>
+            </div>
+            <span className="text-sm text-red-400">
+              {errors.password && <p>{errors.password.message}</p>}
+            </span>
           </div>
-        ) : (
-          <div className="flex flex-col gap-3">
-            <User pubkey={account.pubkey} />
-            <Button preset="large" onClick={() => submit()}>
+          <div className="flex items-center justify-center">
+            <button
+              type="submit"
+              disabled={!isDirty || !isValid}
+              className="inline-flex h-11 w-full items-center justify-center rounded-md bg-fuchsia-500 font-medium text-zinc-100 hover:bg-fuchsia-600 disabled:pointer-events-none disabled:opacity-50"
+            >
               {loading ? (
                 <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
               ) : (
                 'Continue →'
               )}
-            </Button>
+            </button>
           </div>
-        )}
+        </form>
       </div>
     </div>
   );

src/app/auth/import/step-3.tsx

@@ -0,0 +1,88 @@
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+
+import { User } from '@app/auth/components/user';
+
+import { useNDK } from '@libs/ndk/provider';
+import { updateAccount } from '@libs/storage';
+
+import { Button } from '@shared/button';
+import { LoaderIcon } from '@shared/icons';
+
+import { useAccount } from '@utils/hooks/useAccount';
+import { setToArray } from '@utils/transform';
+
+export function ImportStep3Screen() {
+  const queryClient = useQueryClient();
+  const navigate = useNavigate();
+
+  const [loading, setLoading] = useState(false);
+
+  const { ndk } = useNDK();
+  const { status, account } = useAccount();
+
+  const update = useMutation({
+    mutationFn: (follows: string[]) => {
+      return updateAccount('follows', follows, account.pubkey);
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['currentAccount'] });
+    },
+  });
+
+  const submit = async () => {
+    try {
+      // show loading indicator
+      setLoading(true);
+
+      const user = ndk.getUser({ hexpubkey: account.pubkey });
+      const follows = await user.follows();
+
+      // follows as list
+      const followsList = setToArray(follows);
+
+      // update
+      update.mutate([...followsList, account.pubkey]);
+
+      // redirect to next step
+      setTimeout(() => navigate('/auth/onboarding', { replace: true }), 1200);
+    } catch {
+      console.log('error');
+    }
+  };
+
+  return (
+    <div className="mx-auto w-full max-w-md">
+      <div className="mb-8 text-center">
+        <h1 className="text-xl font-semibold">
+          {loading ? 'Creating...' : 'Continue with'}
+        </h1>
+      </div>
+      <div className="w-full rounded-xl border-t border-zinc-800/50 bg-zinc-900 p-4">
+        {status === 'loading' ? (
+          <div className="w-full">
+            <div className="flex items-center gap-2">
+              <div className="h-11 w-11 animate-pulse rounded-lg bg-zinc-800" />
+              <div>
+                <div className="mb-1 h-4 w-16 animate-pulse rounded bg-zinc-800" />
+                <div className="h-3 w-36 animate-pulse rounded bg-zinc-800" />
+              </div>
+            </div>
+          </div>
+        ) : (
+          <div className="flex flex-col gap-3">
+            <User pubkey={account.pubkey} />
+            <Button preset="large" onClick={() => submit()}>
+              {loading ? (
+                <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
+              ) : (
+                'Continue →'
+              )}
+            </Button>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}

src/app/auth/migrate.tsx

@@ -0,0 +1,172 @@
+import { useQueryClient } from '@tanstack/react-query';
+import { useState } from 'react';
+import { Resolver, useForm } from 'react-hook-form';
+import { useNavigate } from 'react-router-dom';
+
+import { removePrivkey } from '@libs/storage';
+
+import { EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
+
+import { useStronghold } from '@stores/stronghold';
+
+import { useAccount } from '@utils/hooks/useAccount';
+import { useSecureStorage } from '@utils/hooks/useSecureStorage';
+
+type FormValues = {
+  password: string;
+};
+
+const resolver: Resolver<FormValues> = async (values) => {
+  return {
+    values: values.password ? values : {},
+    errors: !values.password
+      ? {
+          password: {
+            type: 'required',
+            message: 'This is required.',
+          },
+        }
+      : {},
+  };
+};
+
+export function MigrateScreen() {
+  const queryClient = useQueryClient();
+  const navigate = useNavigate();
+  const setPrivkey = useStronghold((state) => state.setPrivkey);
+
+  const [passwordInput, setPasswordInput] = useState('password');
+  const [loading, setLoading] = useState(false);
+
+  const { account } = useAccount();
+  const { save } = useSecureStorage();
+
+  // toggle private key
+  const showPassword = () => {
+    if (passwordInput === 'password') {
+      setPasswordInput('text');
+    } else {
+      setPasswordInput('password');
+    }
+  };
+
+  const {
+    register,
+    setError,
+    handleSubmit,
+    formState: { errors, isDirty, isValid },
+  } = useForm<FormValues>({ resolver });
+
+  const onSubmit = async (data: { [x: string]: string }) => {
+    setLoading(true);
+    if (data.password.length > 3) {
+      // load private in secure storage
+      try {
+        // save privkey to secure storage
+        await save(account.pubkey, account.privkey, data.password);
+        // add privkey to state
+        setPrivkey(account.privkey);
+        // remove privkey in db
+        await removePrivkey();
+        // clear cache
+        await queryClient.invalidateQueries(['currentAccount']);
+        // redirect to home
+        navigate('/', { replace: true });
+      } catch {
+        setLoading(false);
+        setError('password', {
+          type: 'custom',
+          message: 'Wrong password',
+        });
+      }
+    } else {
+      setLoading(false);
+      setError('password', {
+        type: 'custom',
+        message: 'Password is required and must be greater than 3',
+      });
+    }
+  };
+
+  return (
+    <div className="flex h-full w-full items-center justify-center">
+      <div className="mx-auto w-full max-w-md">
+        <div className="mb-8 text-center">
+          <h1 className="text-xl font-semibold text-zinc-100">
+            Upgrade security for your account
+          </h1>
+        </div>
+        <div className="w-full rounded-xl border-t border-zinc-800/50 bg-zinc-900 px-3 py-3">
+          <div className="flex flex-col gap-4">
+            <div>
+              <div className="mt-1">
+                <p className="text-sm text-zinc-400">
+                  You&apos;re using old Lume version which store your private key as
+                  plaintext in database, this is huge security risk.
+                </p>
+                <p className="mt-2 text-sm text-zinc-400">
+                  To secure your private key, please set a password and Lume will put your
+                  private key in secure storage.
+                </p>
+                <p className="mt-2 text-sm text-zinc-400">
+                  It is not possible to start the app without applying this step, it is
+                  easy and fast!
+                </p>
+              </div>
+            </div>
+            <form onSubmit={handleSubmit(onSubmit)} className="mb-0">
+              <div className="flex flex-col gap-1">
+                <span className="font-medium text-zinc-200">
+                  Set a password to protect your key
+                </span>
+                <div className="relative">
+                  <input
+                    {...register('password', { required: true })}
+                    type={passwordInput}
+                    placeholder="min. 4 characters"
+                    className="relative w-full rounded-lg bg-zinc-800 py-3 pl-3.5 pr-11 text-zinc-100 !outline-none placeholder:text-zinc-400"
+                  />
+                  <button
+                    type="button"
+                    onClick={() => showPassword()}
+                    className="group absolute right-2 top-1/2 -translate-y-1/2 transform rounded p-1 hover:bg-zinc-700"
+                  >
+                    {passwordInput === 'password' ? (
+                      <EyeOffIcon
+                        width={20}
+                        height={20}
+                        className="text-zinc-500 group-hover:text-zinc-100"
+                      />
+                    ) : (
+                      <EyeOnIcon
+                        width={20}
+                        height={20}
+                        className="text-zinc-500 group-hover:text-zinc-100"
+                      />
+                    )}
+                  </button>
+                </div>
+                <span className="text-sm text-red-400">
+                  {errors.password && <p>{errors.password.message}</p>}
+                </span>
+              </div>
+              <div className="flex items-center justify-center">
+                <button
+                  type="submit"
+                  disabled={!isDirty || !isValid}
+                  className="mt-3 inline-flex h-11 w-full items-center justify-center rounded-md bg-fuchsia-500 font-medium text-zinc-100 hover:bg-fuchsia-600 disabled:pointer-events-none disabled:opacity-50"
+                >
+                  {loading ? (
+                    <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
+                  ) : (
+                    'Continue →'
+                  )}
+                </button>
+              </div>
+            </form>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}

src/app/auth/onboarding.tsx

@@ -1,19 +1,19 @@
 import { useState } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 
-import { usePublish } from '@libs/ndk';
-
 import { LoaderIcon } from '@shared/icons';
 import { ArrowRightCircleIcon } from '@shared/icons/arrowRightCircle';
 import { User } from '@shared/user';
 
 import { useAccount } from '@utils/hooks/useAccount';
+import { usePublish } from '@utils/hooks/usePublish';
 
 export function OnboardingScreen() {
-  const publish = usePublish();
   const navigate = useNavigate();
 
+  const { publish } = usePublish();
   const { status, account } = useAccount();
+
   const [loading, setLoading] = useState(false);
 
   const submit = async () => {
@@ -22,8 +22,7 @@ export function OnboardingScreen() {
 
       // publish event
       publish({
-        content:
-          'Running Lume, fighting for better future, join us here: https://lume.nu',
+        content: 'Running Lume, join with me #nostr #lume : https://lume.nu',
         kind: 1,
         tags: [],
       });
@@ -38,15 +37,16 @@ export function OnboardingScreen() {
   return (
     <div className="flex h-full w-full items-center justify-center">
       <div className="mx-auto w-full max-w-md">
-        <div className="mb-8 text-center">
+        <div className="mb-4 text-center">
           <h1 className="mb-2 text-xl font-semibold text-zinc-100">
             👋 Hello, welcome you to Lume
           </h1>
           <p className="text-sm text-zinc-300">
-            You&apos;re a part of better future that we&apos;re fighting
+            You&apos;re a part of Nostr community now
           </p>
           <p className="text-sm text-zinc-300">
-            If Lume gets your attention, please help us spread via button below
+            If Lume gets your attention, please help us spread it and don&apos;t forget
+            invite your friend join with you, we can have fun togother
           </p>
         </div>
         <div className="w-full rounded-xl border-t border-zinc-800/50 bg-zinc-900">
@@ -55,18 +55,15 @@ export function OnboardingScreen() {
               <User pubkey={account.pubkey} time={Math.floor(Date.now() / 1000)} />
             )}
             <div className="-mt-6 select-text whitespace-pre-line break-words	pl-[49px] text-base text-zinc-100">
-              <p>Running Lume, fighting for better future</p>
-              <p>
-                join us here:{' '}
-                <a
-                  href="https://lume.nu"
-                  className="font-normal text-fuchsia-500 no-underline hover:text-fuchsia-600"
-                  target="_blank"
-                  rel="noreferrer"
-                >
-                  https://lume.nu
-                </a>
-              </p>
+              <p>Running Lume, join with me #nostr #lume</p>
+              <a
+                href="https://lume.nu"
+                className="font-normal text-fuchsia-500 no-underline hover:text-fuchsia-600"
+                target="_blank"
+                rel="noreferrer"
+              >
+                https://lume.nu
+              </a>
             </div>
           </div>
         </div>
@@ -85,16 +82,16 @@ export function OnboardingScreen() {
             ) : (
               <>
                 <span className="w-5" />
-                <span>Publish</span>
+                <span>Spread</span>
                 <ArrowRightCircleIcon className="h-5 w-5" />
               </>
             )}
           </button>
           <Link
             to="/"
-            className="inline-flex h-10 w-full items-center justify-center gap-2 rounded-lg px-6 text-sm font-medium text-zinc-200"
+            className="inline-flex h-12 w-full items-center justify-center gap-2 rounded-lg bg-zinc-800 px-6 font-medium text-zinc-300 hover:bg-zinc-900"
           >
-            Skip for now
+            Skip
           </Link>
         </div>
       </div>

src/app/auth/reset.tsx

@@ -0,0 +1,176 @@
+import { getPublicKey, nip19 } from 'nostr-tools';
+import { useState } from 'react';
+import { Resolver, useForm } from 'react-hook-form';
+import { useNavigate } from 'react-router-dom';
+
+import { EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
+
+import { useStronghold } from '@stores/stronghold';
+
+import { useAccount } from '@utils/hooks/useAccount';
+import { useSecureStorage } from '@utils/hooks/useSecureStorage';
+
+type FormValues = {
+  password: string;
+  privkey: string;
+};
+
+const resolver: Resolver<FormValues> = async (values) => {
+  return {
+    values: values.password ? values : {},
+    errors: !values.password
+      ? {
+          password: {
+            type: 'required',
+            message: 'This is required.',
+          },
+        }
+      : {},
+  };
+};
+
+export function ResetScreen() {
+  const navigate = useNavigate();
+  const setPrivkey = useStronghold((state) => state.setPrivkey);
+
+  const [passwordInput, setPasswordInput] = useState('password');
+  const [loading, setLoading] = useState(false);
+
+  const { account } = useAccount();
+  const { save, reset } = useSecureStorage();
+
+  // toggle private key
+  const showPassword = () => {
+    if (passwordInput === 'password') {
+      setPasswordInput('text');
+    } else {
+      setPasswordInput('password');
+    }
+  };
+
+  const {
+    register,
+    setError,
+    handleSubmit,
+    formState: { errors, isDirty, isValid },
+  } = useForm<FormValues>({ resolver });
+
+  const onSubmit = async (data: { [x: string]: string }) => {
+    setLoading(true);
+    if (data.password.length > 3) {
+      try {
+        let privkey = data.privkey;
+        if (privkey.startsWith('nsec')) {
+          privkey = nip19.decode(privkey).data as string;
+        }
+
+        const tmpPubkey = getPublicKey(privkey);
+
+        if (tmpPubkey !== account.pubkey) {
+          setLoading(false);
+          setError('password', {
+            type: 'custom',
+            message:
+              "Private key don't match current account store in database, please check again",
+          });
+        } else {
+          // remove old stronghold
+          await reset();
+          // save privkey to secure storage
+          await save(account.pubkey, account.privkey, data.password);
+          // add privkey to state
+          setPrivkey(account.privkey);
+          // redirect to home
+          navigate('/auth/unlock', { replace: true });
+        }
+      } catch {
+        setLoading(false);
+        setError('password', {
+          type: 'custom',
+          message: 'Invalid private key',
+        });
+      }
+    } else {
+      setLoading(false);
+      setError('password', {
+        type: 'custom',
+        message: 'Password is required and must be greater than 3',
+      });
+    }
+  };
+
+  return (
+    <div className="flex h-full w-full items-center justify-center">
+      <div className="mx-auto w-full max-w-md">
+        <div className="mb-8 text-center">
+          <h1 className="text-xl font-semibold text-zinc-100">Reset unlock password</h1>
+        </div>
+        <div className="flex flex-col gap-4">
+          <form onSubmit={handleSubmit(onSubmit)} className="mb-0 flex flex-col gap-3">
+            <div className="flex flex-col gap-1">
+              <label htmlFor="privkey" className="font-medium text-zinc-200">
+                Private key
+              </label>
+              <div className="relative">
+                <input
+                  {...register('privkey', { required: true })}
+                  type="text"
+                  placeholder="nsec..."
+                  className="relative w-full rounded-lg bg-zinc-800 px-3.5 py-3 text-zinc-100 !outline-none placeholder:text-zinc-400"
+                />
+              </div>
+            </div>
+            <div className="flex flex-col gap-1">
+              <label htmlFor="password" className="font-medium text-zinc-200">
+                Set a new password to protect your key
+              </label>
+              <div className="relative">
+                <input
+                  {...register('password', { required: true })}
+                  type={passwordInput}
+                  placeholder="min. 4 characters"
+                  className="relative w-full rounded-lg bg-zinc-800 py-3 pl-3.5 pr-11 text-zinc-100 !outline-none placeholder:text-zinc-400"
+                />
+                <button
+                  type="button"
+                  onClick={() => showPassword()}
+                  className="group absolute right-2 top-1/2 -translate-y-1/2 transform rounded p-1 hover:bg-zinc-700"
+                >
+                  {passwordInput === 'password' ? (
+                    <EyeOffIcon
+                      width={20}
+                      height={20}
+                      className="text-zinc-500 group-hover:text-zinc-100"
+                    />
+                  ) : (
+                    <EyeOnIcon
+                      width={20}
+                      height={20}
+                      className="text-zinc-500 group-hover:text-zinc-100"
+                    />
+                  )}
+                </button>
+              </div>
+              <span className="text-sm text-red-400">
+                {errors.password && <p>{errors.password.message}</p>}
+              </span>
+            </div>
+            <div className="flex items-center justify-center">
+              <button
+                type="submit"
+                disabled={!isDirty || !isValid}
+                className="mt-3 inline-flex h-11 w-full items-center justify-center rounded-md bg-fuchsia-500 font-medium text-zinc-100 hover:bg-fuchsia-600 disabled:pointer-events-none disabled:opacity-50"
+              >
+                {loading ? (
+                  <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
+                ) : (
+                  'Continue →'
+                )}
+              </button>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+  );
+}

src/app/auth/unlock.tsx

@@ -0,0 +1,146 @@
+import { useState } from 'react';
+import { Resolver, useForm } from 'react-hook-form';
+import { Link, useNavigate } from 'react-router-dom';
+
+import { EyeOffIcon, EyeOnIcon, LoaderIcon } from '@shared/icons';
+
+import { useStronghold } from '@stores/stronghold';
+
+import { useAccount } from '@utils/hooks/useAccount';
+import { useSecureStorage } from '@utils/hooks/useSecureStorage';
+
+type FormValues = {
+  password: string;
+};
+
+const resolver: Resolver<FormValues> = async (values) => {
+  return {
+    values: values.password ? values : {},
+    errors: !values.password
+      ? {
+          password: {
+            type: 'required',
+            message: 'This is required.',
+          },
+        }
+      : {},
+  };
+};
+
+export function UnlockScreen() {
+  const navigate = useNavigate();
+  const setPrivkey = useStronghold((state) => state.setPrivkey);
+
+  const [passwordInput, setPasswordInput] = useState('password');
+  const [loading, setLoading] = useState(false);
+
+  const { account } = useAccount();
+  const { load } = useSecureStorage();
+
+  // toggle private key
+  const showPassword = () => {
+    if (passwordInput === 'password') {
+      setPasswordInput('text');
+    } else {
+      setPasswordInput('password');
+    }
+  };
+
+  const {
+    register,
+    setError,
+    handleSubmit,
+    formState: { errors, isDirty, isValid },
+  } = useForm<FormValues>({ resolver });
+
+  const onSubmit = async (data: { [x: string]: string }) => {
+    setLoading(true);
+    if (data.password.length > 3) {
+      // load private in secure storage
+      try {
+        const privkey = await load(account.pubkey, data.password);
+        setPrivkey(privkey);
+        // redirect to home
+        navigate('/', { replace: true });
+      } catch {
+        setLoading(false);
+        setError('password', {
+          type: 'custom',
+          message: 'Wrong password',
+        });
+      }
+    } else {
+      setLoading(false);
+      setError('password', {
+        type: 'custom',
+        message: 'Password is required and must be greater than 3',
+      });
+    }
+  };
+
+  return (
+    <div className="flex h-full w-full items-center justify-center">
+      <div className="mx-auto w-full max-w-md">
+        <div className="mb-8 text-center">
+          <h1 className="text-xl font-semibold text-zinc-100">
+            Enter password to unlock
+          </h1>
+        </div>
+        <div className="flex flex-col gap-4">
+          <form onSubmit={handleSubmit(onSubmit)} className="flex flex-col gap-3">
+            <div className="flex flex-col gap-1">
+              <div className="relative">
+                <input
+                  {...register('password', { required: true })}
+                  type={passwordInput}
+                  className="relative w-full rounded-lg bg-zinc-800 py-3 text-center text-zinc-100 !outline-none placeholder:text-zinc-400"
+                />
+                <button
+                  type="button"
+                  onClick={() => showPassword()}
+                  className="group absolute right-2 top-1/2 -translate-y-1/2 transform rounded p-1 hover:bg-zinc-700"
+                >
+                  {passwordInput === 'password' ? (
+                    <EyeOffIcon
+                      width={20}
+                      height={20}
+                      className="text-zinc-500 group-hover:text-zinc-100"
+                    />
+                  ) : (
+                    <EyeOnIcon
+                      width={20}
+                      height={20}
+                      className="text-zinc-500 group-hover:text-zinc-100"
+                    />
+                  )}
+                </button>
+              </div>
+              <span className="text-sm text-red-400">
+                {errors.password && <p>{errors.password.message}</p>}
+              </span>
+            </div>
+            <div className="flex flex-col items-center justify-center">
+              <button
+                type="submit"
+                disabled={!isDirty || !isValid}
+                className="inline-flex h-11 w-full items-center justify-center rounded-md bg-fuchsia-500 font-medium text-zinc-100 hover:bg-fuchsia-600"
+              >
+                {loading ? (
+                  <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
+                ) : (
+                  'Continue →'
+                )}
+              </button>
+              <Link
+                to="/auth/reset"
+                className="inline-flex h-12 items-center justify-center text-center text-sm text-zinc-400"
+              >
+                Reset password
+              </Link>
+            </div>
+          </form>
+        </div>
+      </div>
+    </div>
+  );
+}

src/app/channel/components/createModal.tsx

@@ -5,12 +5,12 @@ import { Fragment, useContext, useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
 
+import { useNDK } from '@libs/ndk/provider';
 import { createChannel } from '@libs/storage';
 
 import { AvatarUploader } from '@shared/avatarUploader';
 import { CancelIcon, LoaderIcon, PlusIcon } from '@shared/icons';
 import { Image } from '@shared/image';
-import { RelayContext } from '@shared/relayProvider';
 
 import { DEFAULT_AVATAR } from '@stores/constants';
 
@@ -18,7 +18,7 @@ import { dateToUnix } from '@utils/date';
 import { useAccount } from '@utils/hooks/useAccount';
 
 export function ChannelCreateModal() {
-  const ndk = useContext(RelayContext);
+  const { ndk } = useNDK();
   const queryClient = useQueryClient();
   const navigate = useNavigate();
 

src/app/channel/components/messages/form.tsx

@@ -3,9 +3,10 @@ import { useContext, useState } from 'react';
 
 import { UserReply } from '@app/channel/components/messages/userReply';
 
+import { useNDK } from '@libs/ndk/provider';
+
 import { CancelIcon, EnterIcon } from '@shared/icons';
 import { MediaUploader } from '@shared/mediaUploader';
-import { RelayContext } from '@shared/relayProvider';
 
 import { useChannelMessages } from '@stores/channels';
 
@@ -13,7 +14,7 @@ import { dateToUnix } from '@utils/date';
 import { useAccount } from '@utils/hooks/useAccount';
 
 export function ChannelMessageForm({ channelID }: { channelID: string }) {
-  const ndk = useContext(RelayContext);
+  const { ndk } = useNDK();
 
   const [value, setValue] = useState('');
   const [replyTo, closeReply] = useChannelMessages((state: any) => [

src/app/channel/components/messages/hideButton.tsx

@@ -1,9 +1,10 @@
 import { Dialog, Transition } from '@headlessui/react';
 import { NDKEvent, NDKPrivateKeySigner } from '@nostr-dev-kit/ndk';
-import { Fragment, useContext, useState } from 'react';
+import { Fragment, useState } from 'react';
+
+import { useNDK } from '@libs/ndk/provider';
 
 import { CancelIcon, HideIcon } from '@shared/icons';
-import { RelayContext } from '@shared/relayProvider';
 
 import { useChannelMessages } from '@stores/channels';
 
@@ -11,7 +12,7 @@ import { dateToUnix } from '@utils/date';
 import { useAccount } from '@utils/hooks/useAccount';
 
 export function MessageHideButton({ id }: { id: string }) {
-  const ndk = useContext(RelayContext);
+  const { ndk } = useNDK();
   const hide = useChannelMessages((state: any) => state.hideMessage);
 
   const [isOpen, setIsOpen] = useState(false);

src/app/channel/components/messages/muteButton.tsx

@@ -2,8 +2,9 @@ import { Dialog, Transition } from '@headlessui/react';
 import { NDKEvent, NDKPrivateKeySigner } from '@nostr-dev-kit/ndk';
 import { Fragment, useContext, useState } from 'react';
 
+import { useNDK } from '@libs/ndk/provider';
+
 import { CancelIcon, MuteIcon } from '@shared/icons';
-import { RelayContext } from '@shared/relayProvider';
 
 import { useChannelMessages } from '@stores/channels';
 
@@ -11,7 +12,7 @@ import { dateToUnix } from '@utils/date';
 import { useAccount } from '@utils/hooks/useAccount';
 
 export function MessageMuteButton({ pubkey }: { pubkey: string }) {
-  const ndk = useContext(RelayContext);
+  const { ndk } = useNDK();
   const mute = useChannelMessages((state: any) => state.muteUser);
 
   const [isOpen, setIsOpen] = useState(false);

src/app/channel/hooks/useChannelProfile.tsx

@@ -1,12 +1,11 @@
 import { useQuery } from '@tanstack/react-query';
-import { useContext, useEffect } from 'react';
+import { useEffect } from 'react';
 
+import { useNDK } from '@libs/ndk/provider';
 import { getChannel, updateChannelMetadata } from '@libs/storage';
 
-import { RelayContext } from '@shared/relayProvider';
-
 export function useChannelProfile(id: string) {
-  const ndk = useContext(RelayContext);
+  const { ndk } = useNDK();
   const { data } = useQuery(['channel-metadata', id], async () => {
     return await getChannel(id);
   });

src/app/channel/index.tsx

@@ -6,7 +6,7 @@ import { ChannelMembers } from '@app/channel/components/members';
 import { ChannelMessageForm } from '@app/channel/components/messages/form';
 import { ChannelMetadata } from '@app/channel/components/metadata';
 
-import { RelayContext } from '@shared/relayProvider';
+import { useNDK } from '@libs/ndk/provider';
 
 import { useChannelMessages } from '@stores/channels';
 
@@ -47,7 +47,7 @@ const Empty = (
 );
 
 export function ChannelScreen() {
-  const ndk = useContext(RelayContext);
+  const { ndk } = useNDK();
   const virtuosoRef = useRef(null);
 
   const { id } = useParams();

src/app/chats/components/item.tsx

@@ -22,7 +22,7 @@ export function ChatsListItem({ data }: { data: any }) {
 
   return (
     <NavLink
-      to={`/app/chat/${data.sender_pubkey}`}
+      to={`/app/chats/${data.sender_pubkey}`}
       preventScrollReset={true}
       className={({ isActive }) =>
         twMerge(
@@ -33,7 +33,7 @@ export function ChatsListItem({ data }: { data: any }) {
     >
       <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded border-t border-zinc-800/50 bg-zinc-900">
         <Image
-          src={user?.image}
+          src={user?.picture || user?.image}
           fallback={DEFAULT_AVATAR}
           alt={data.sender_pubkey}
           className="h-6 w-6 rounded object-cover"

src/app/chats/components/list.tsx

@@ -1,12 +1,15 @@
 import { useQuery } from '@tanstack/react-query';
+import { useCallback } from 'react';
 
-import { ChatsListItem } from '@app/chat/components/item';
-import { NewMessageModal } from '@app/chat/components/modal';
-import { ChatsListSelfItem } from '@app/chat/components/self';
+import { ChatsListItem } from '@app/chats/components/item';
+import { NewMessageModal } from '@app/chats/components/modal';
+import { ChatsListSelfItem } from '@app/chats/components/self';
+import { UnknownsModal } from '@app/chats/components/unknowns';
 
 import { getChats } from '@libs/storage';
 
 import { useAccount } from '@utils/hooks/useAccount';
+import { Chats } from '@utils/types';
 
 export function ChatsList() {
   const { account } = useAccount();
@@ -15,13 +18,18 @@ export function ChatsList() {
     data: chats,
     isFetching,
   } = useQuery(['chats'], async () => {
-    const chats = await getChats();
-    const sorted = chats.sort(
-      (a, b) => parseInt(a.new_messages) - parseInt(b.new_messages)
-    );
-    return sorted;
+    return await getChats();
   });
 
+  const renderItem = useCallback(
+    (item: Chats) => {
+      if (account.pubkey !== item.sender_pubkey) {
+        return <ChatsListItem key={item.sender_pubkey} data={item} />;
+      }
+    },
+    [chats]
+  );
+
   if (status === 'loading') {
     return (
       <div className="flex flex-col">
@@ -39,7 +47,6 @@ export function ChatsList() {
 
   return (
     <div className="flex flex-col">
-      <NewMessageModal />
       {account ? (
         <ChatsListSelfItem data={account} />
       ) : (
@@ -48,11 +55,9 @@ export function ChatsList() {
           <div className="h-3 w-full animate-pulse rounded-sm bg-zinc-800" />
         </div>
       )}
-      {chats.map((item) => {
-        if (account.pubkey !== item.sender_pubkey) {
-          return <ChatsListItem key={item.sender_pubkey} data={item} />;
-        }
-      })}
+      {chats.follows.map((item) => renderItem(item))}
+      {chats.unknowns.length > 0 && <UnknownsModal data={chats.unknowns} />}
+      <NewMessageModal />
       {isFetching && (
         <div className="inline-flex h-9 items-center gap-2.5 rounded-md px-2.5">
           <div className="relative h-6 w-6 shrink-0 animate-pulse rounded bg-zinc-800" />

src/app/chats/components/messages/form.tsx

@@ -1,11 +1,11 @@
 import { nip04 } from 'nostr-tools';
 import { useCallback, useState } from 'react';
 
-import { usePublish } from '@libs/ndk';
-
 import { EnterIcon } from '@shared/icons';
 import { MediaUploader } from '@shared/mediaUploader';
 
+import { usePublish } from '@utils/hooks/usePublish';
+
 export function ChatMessageForm({
   receiverPubkey,
   userPrivkey,
@@ -14,7 +14,7 @@ export function ChatMessageForm({
   userPubkey: string;
   userPrivkey: string;
 }) {
-  const publish = usePublish();
+  const { publish } = usePublish();
   const [value, setValue] = useState('');
 
   const encryptMessage = useCallback(async () => {

src/app/chats/components/messages/item.tsx

@@ -1,4 +1,4 @@
-import { useDecryptMessage } from '@app/chat/hooks/useDecryptMessage';
+import { useDecryptMessage } from '@app/chats/hooks/useDecryptMessage';
 
 import { MentionNote } from '@shared/notes/mentions/note';
 import { ImagePreview } from '@shared/notes/preview/image';

src/app/chats/components/modal.tsx

@@ -13,7 +13,7 @@ export function NewMessageModal() {
   const [isOpen, setIsOpen] = useState(false);
 
   const { status, account } = useAccount();
-  const follows = account ? JSON.parse(account.follows) : [];
+  const follows = account ? JSON.parse(account.follows as string) : [];
 
   const closeModal = () => {
     setIsOpen(false);
@@ -25,7 +25,7 @@ export function NewMessageModal() {
 
   const openChat = (pubkey: string) => {
     closeModal();
-    navigate(`/app/chat/${pubkey}`);
+    navigate(`/app/chats/${pubkey}`);
   };
 
   return (
@@ -36,7 +36,7 @@ export function NewMessageModal() {
         className="inline-flex h-9 items-center gap-2.5 rounded-md px-2.5"
       >
         <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded border-t border-zinc-800/50 bg-zinc-900">
-          <PlusIcon width={12} height={12} className="text-zinc-500" />
+          <PlusIcon className="h-3 w-3 text-zinc-200" />
         </div>
         <div>
           <h5 className="font-medium text-zinc-400">New chat</h5>
@@ -78,9 +78,9 @@ export function NewMessageModal() {
                       <button
                         type="button"
                         onClick={closeModal}
-                        className="inline-flex h-5 w-5 items-center justify-center rounded hover:bg-zinc-900"
+                        className="inline-flex h-5 w-5 items-center justify-center rounded hover:bg-zinc-800"
                       >
-                        <CancelIcon width={20} height={20} className="text-zinc-300" />
+                        <CancelIcon className="h-4 w-4 text-zinc-300" />
                       </button>
                     </div>
                     <Dialog.Description className="text-sm leading-tight text-zinc-400">
@@ -104,7 +104,7 @@ export function NewMessageModal() {
                           <button
                             type="button"
                             onClick={() => openChat(follow)}
-                            className="inline-flex w-max translate-x-20 transform rounded border-t border-zinc-600/50 bg-zinc-700 px-3 py-1.5 text-sm transition-transform duration-150 ease-in-out hover:bg-fuchsia-500 group-hover:translate-x-0"
+                            className="hidden w-max rounded-md bg-zinc-700 px-3 py-1 text-sm font-medium hover:bg-fuchsia-500 group-hover:inline-flex"
                           >
                             Chat
                           </button>

src/app/chats/components/self.tsx

@@ -8,7 +8,7 @@ import { DEFAULT_AVATAR } from '@stores/constants';
 import { useProfile } from '@utils/hooks/useProfile';
 import { shortenKey } from '@utils/shortenKey';
 
-export function ChatsListSelfItem({ data }: { data: any }) {
+export function ChatsListSelfItem({ data }: { data: { pubkey: string } }) {
   const { status, user } = useProfile(data.pubkey);
 
   if (status === 'loading') {
@@ -24,7 +24,7 @@ export function ChatsListSelfItem({ data }: { data: any }) {
 
   return (
     <NavLink
-      to={`/app/chat/${data.pubkey}`}
+      to={`/app/chats/${data.pubkey}`}
       preventScrollReset={true}
       className={({ isActive }) =>
         twMerge(
@@ -35,7 +35,7 @@ export function ChatsListSelfItem({ data }: { data: any }) {
     >
       <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded border-t border-zinc-800/50 bg-zinc-900">
         <Image
-          src={user?.image}
+          src={user?.picture || user?.image}
           fallback={DEFAULT_AVATAR}
           alt={data.pubkey}
           className="h-6 w-6 rounded bg-white object-cover"

src/app/chats/components/sidebar.tsx

@@ -15,7 +15,7 @@ export function ChatSidebar({ pubkey }: { pubkey: string }) {
       <div className="flex flex-col gap-3">
         <div className="relative h-11 w-11 shrink rounded-md">
           <Image
-            src={user?.image}
+            src={user?.picture || user?.image}
             fallback={DEFAULT_AVATAR}
             alt={pubkey}
             className="h-11 w-11 rounded-md object-cover"
@@ -33,7 +33,7 @@ export function ChatSidebar({ pubkey }: { pubkey: string }) {
           <div>
             <p className="leading-tight">{user?.bio || user?.about}</p>
             <Link
-              to={`/app/user/${pubkey}`}
+              to={`/app/users/${pubkey}`}
               className="mt-3 inline-flex h-10 w-full items-center justify-center rounded-md bg-zinc-900 text-sm font-medium text-zinc-300 hover:bg-zinc-800 hover:text-zinc-100"
             >
               View full profile

src/app/chats/components/unknowns.tsx

@@ -0,0 +1,117 @@
+import { Dialog, Transition } from '@headlessui/react';
+import { Fragment, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+
+import { User } from '@app/auth/components/user';
+
+import { CancelIcon, StrangersIcon } from '@shared/icons';
+
+import { compactNumber } from '@utils/number';
+import { Chats } from '@utils/types';
+
+export function UnknownsModal({ data }: { data: Chats[] }) {
+  const navigate = useNavigate();
+  const [isOpen, setIsOpen] = useState(false);
+
+  const closeModal = () => {
+    setIsOpen(false);
+  };
+
+  const openModal = () => {
+    setIsOpen(true);
+  };
+
+  const openChat = (pubkey: string) => {
+    closeModal();
+    navigate(`/app/chats/${pubkey}`);
+  };
+
+  return (
+    <>
+      <button
+        type="button"
+        onClick={() => openModal()}
+        className="inline-flex h-9 items-center gap-2.5 rounded-md px-2.5"
+      >
+        <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded border-t border-zinc-800/50 bg-zinc-900">
+          <StrangersIcon className="h-3 w-3 text-zinc-200" />
+        </div>
+        <div>
+          <h5 className="font-medium text-zinc-400">
+            {compactNumber.format(data.length)} unknowns
+          </h5>
+        </div>
+      </button>
+      <Transition appear show={isOpen} as={Fragment}>
+        <Dialog as="div" className="relative z-10" onClose={closeModal}>
+          <Transition.Child
+            as={Fragment}
+            enter="ease-out duration-300"
+            enterFrom="opacity-0"
+            enterTo="opacity-100"
+            leave="ease-in duration-200"
+            leaveFrom="opacity-100"
+            leaveTo="opacity-0"
+          >
+            <div className="fixed inset-0 z-50 bg-black bg-opacity-30 backdrop-blur-md" />
+          </Transition.Child>
+          <div className="fixed inset-0 z-50 flex min-h-full items-center justify-center">
+            <Transition.Child
+              as={Fragment}
+              enter="ease-out duration-300"
+              enterFrom="opacity-0 scale-95"
+              enterTo="opacity-100 scale-100"
+              leave="ease-in duration-200"
+              leaveFrom="opacity-100 scale-100"
+              leaveTo="opacity-0 scale-95"
+            >
+              <Dialog.Panel className="relative flex h-min w-full max-w-lg flex-col gap-2 rounded-lg border-t border-zinc-800/50 bg-zinc-900">
+                <div className="h-min w-full shrink-0 border-b border-zinc-800 px-5 py-5">
+                  <div className="flex flex-col gap-1">
+                    <div className="flex items-center justify-between">
+                      <Dialog.Title
+                        as="h3"
+                        className="text-lg font-semibold leading-none text-zinc-100"
+                      >
+                        {data.length} unknowns
+                      </Dialog.Title>
+                      <button
+                        type="button"
+                        onClick={closeModal}
+                        className="inline-flex h-5 w-5 items-center justify-center rounded hover:bg-zinc-800"
+                      >
+                        <CancelIcon className="h-4 w-4 text-zinc-300" />
+                      </button>
+                    </div>
+                    <Dialog.Description className="text-sm leading-tight text-zinc-400">
+                      All messages from people you not follow
+                    </Dialog.Description>
+                  </div>
+                </div>
+                <div className="flex h-[500px] flex-col overflow-y-auto overflow-x-hidden pb-5">
+                  {data.map((user) => (
+                    <div
+                      key={user.sender_pubkey}
+                      className="group flex items-center justify-between px-4 py-3 hover:bg-zinc-800"
+                    >
+                      <User pubkey={user.sender_pubkey} />
+                      <div>
+                        <button
+                          type="button"
+                          onClick={() => openChat(user.sender_pubkey)}
+                          className="hidden w-max rounded-md bg-zinc-700 px-3 py-1 text-sm font-medium hover:bg-fuchsia-500 group-hover:inline-flex"
+                        >
+                          Chat
+                        </button>
+                      </div>
+                    </div>
+                  ))}
+                </div>
+              </Dialog.Panel>
+            </Transition.Child>
+          </div>
+        </Dialog>
+      </Transition>
+    </>
+  );
+}

src/app/chats/index.tsx

@@ -1,24 +1,25 @@
 import { NDKSubscription } from '@nostr-dev-kit/ndk';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { useCallback, useContext, useEffect, useRef } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
 import { useParams } from 'react-router-dom';
 import { Virtuoso } from 'react-virtuoso';
 
-import { ChatMessageForm } from '@app/chat/components/messages/form';
-import { ChatMessageItem } from '@app/chat/components/messages/item';
-import { ChatSidebar } from '@app/chat/components/sidebar';
+import { ChatMessageForm } from '@app/chats/components/messages/form';
+import { ChatMessageItem } from '@app/chats/components/messages/item';
+import { ChatSidebar } from '@app/chats/components/sidebar';
 
+import { useNDK } from '@libs/ndk/provider';
 import { createChat, getChatMessages } from '@libs/storage';
 
-import { RelayContext } from '@shared/relayProvider';
+import { useStronghold } from '@stores/stronghold';
 
 import { useAccount } from '@utils/hooks/useAccount';
 
 export function ChatScreen() {
-  const ndk = useContext(RelayContext);
   const queryClient = useQueryClient();
   const virtuosoRef = useRef(null);
 
+  const { ndk } = useNDK();
   const { pubkey } = useParams();
   const { account } = useAccount();
   const { status, data } = useQuery(
@@ -31,13 +32,15 @@ export function ChatScreen() {
     }
   );
 
+  const userPrivkey = useStronghold((state) => state.privkey);
+
   const itemContent: any = useCallback(
     (index: string | number) => {
       return (
         <ChatMessageItem
           data={data[index]}
           userPubkey={account.pubkey}
-          userPrivkey={account.privkey}
+          userPrivkey={userPrivkey}
         />
       );
     },
@@ -132,7 +135,7 @@ export function ChatScreen() {
               <ChatMessageForm
                 receiverPubkey={pubkey}
                 userPubkey={account.pubkey}
-                userPrivkey={account.privkey}
+                userPrivkey={userPrivkey}
               />
             </div>
           </div>

src/app/note/index.tsx

@@ -1,12 +1,7 @@
-import { useQuery } from '@tanstack/react-query';
 import { useParams } from 'react-router-dom';
 
 import { useLiveThread } from '@app/space/hooks/useLiveThread';
 
-import { getNoteByID } from '@libs/storage';
-
-import { Kind1 } from '@shared/notes/contents/kind1';
-import { Kind1063 } from '@shared/notes/contents/kind1063';
 import { NoteMetadata } from '@shared/notes/metadata';
 import { NoteReplyForm } from '@shared/notes/replies/form';
 import { RepliesList } from '@shared/notes/replies/list';
@@ -14,16 +9,12 @@ import { NoteSkeleton } from '@shared/notes/skeleton';
 import { User } from '@shared/user';
 
 import { useAccount } from '@utils/hooks/useAccount';
-import { parser } from '@utils/parser';
+import { useEvent } from '@utils/hooks/useEvent';
 
 export function NoteScreen() {
   const { id } = useParams();
   const { account } = useAccount();
-  const { status, data } = useQuery(['thread', id], async () => {
-    const res = await getNoteByID(id);
-    res['content'] = parser(res);
-    return res;
-  });
+  const { status, data } = useEvent(id);
 
   useLiveThread(id);
 
@@ -41,9 +32,7 @@ export function NoteScreen() {
             <div className="rounded-md bg-zinc-900 px-5 pt-5">
               <User pubkey={data.pubkey} time={data.created_at} />
               <div className="mt-3">
-                {data.kind === 1 && <Kind1 content={data.content} />}
-                {data.kind === 1063 && <Kind1063 metadata={data.tags} />}
-                <NoteMetadata id={data.event_id || id} eventPubkey={data.pubkey} />
+                <NoteMetadata id={data.event_id || id} />
               </div>
             </div>
             <div className="mt-3 rounded-md bg-zinc-900">
@@ -52,7 +41,7 @@ export function NoteScreen() {
           </div>
         )}
         <div className="px-3">
-          <RepliesList parent_id={id} />
+          <RepliesList id={id} />
         </div>
       </div>
     </div>

src/app/root.tsx

@@ -1,59 +1,76 @@
-import { NDKFilter } from '@nostr-dev-kit/ndk';
-import { useContext, useEffect, useRef } from 'react';
+import { NDKUser } from '@nostr-dev-kit/ndk';
+import { nip19 } from 'nostr-tools';
+import { useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import { prefetchEvents } from '@libs/ndk';
+import { useNDK } from '@libs/ndk/provider';
 import {
   countTotalNotes,
   createChat,
   createNote,
   getLastLogin,
+  updateAccount,
   updateLastLogin,
 } from '@libs/storage';
 
-import { LoaderIcon, LumeIcon } from '@shared/icons';
-import { RelayContext } from '@shared/relayProvider';
+import { LoaderIcon } from '@shared/icons';
 
-import { dateToUnix, getHourAgo } from '@utils/date';
+import { nHoursAgo } from '@utils/date';
 import { useAccount } from '@utils/hooks/useAccount';
 
 const totalNotes = await countTotalNotes();
 const lastLogin = await getLastLogin();
 
 export function Root() {
-  const ndk = useContext(RelayContext);
-  const now = useRef(new Date());
   const navigate = useNavigate();
 
+  const { ndk, relayUrls, fetcher } = useNDK();
   const { status, account } = useAccount();
 
+  async function getFollows() {
+    const authors: string[] = [];
+
+    const user = ndk.getUser({ hexpubkey: account.pubkey });
+    const follows = await user.follows();
+
+    follows.forEach((follow: NDKUser) => {
+      authors.push(nip19.decode(follow.npub).data as string);
+    });
+
+    // update follows in db
+    await updateAccount('follows', authors, account.pubkey);
+
+    return authors;
+  }
+
   async function fetchNotes() {
     try {
-      const follows = JSON.parse(account.follows);
-      let since: number;
+      const follows = await getFollows();
 
-      if (totalNotes === 0 || lastLogin === 0) {
-        since = dateToUnix(getHourAgo(48, now.current));
-      } else {
-        since = lastLogin;
-      }
+      if (follows.length > 0) {
+        let since: number;
+        if (totalNotes === 0 || lastLogin === 0) {
+          since = nHoursAgo(48);
+        } else {
+          since = lastLogin;
+        }
 
-      const filter: NDKFilter = {
-        kinds: [1, 6],
-        authors: follows,
-        since: since,
-      };
-
-      const events = await prefetchEvents(ndk, filter);
-      for (const event of events) {
-        await createNote(
-          event.id,
-          event.pubkey,
-          event.kind,
-          event.tags,
-          event.content,
-          event.created_at
+        const events = fetcher.allEventsIterator(
+          relayUrls,
+          { kinds: [1], authors: follows },
+          { since: since },
+          { skipVerification: true }
         );
+        for await (const event of events) {
+          await createNote(
+            event.id,
+            event.pubkey,
+            event.kind,
+            event.tags,
+            event.content,
+            event.created_at
+          );
+        }
       }
 
       return true;
@@ -64,19 +81,23 @@ export function Root() {
 
   async function fetchChats() {
     try {
-      const sendFilter: NDKFilter = {
-        kinds: [4],
-        authors: [account.pubkey],
-        since: lastLogin,
-      };
-      const receiveFilter: NDKFilter = {
-        kinds: [4],
-        '#p': [account.pubkey],
-        since: lastLogin,
-      };
+      const sendMessages = await fetcher.fetchAllEvents(
+        relayUrls,
+        {
+          kinds: [4],
+          authors: [account.pubkey],
+        },
+        { since: lastLogin }
+      );
 
-      const sendMessages = await prefetchEvents(ndk, sendFilter);
-      const receiveMessages = await prefetchEvents(ndk, receiveFilter);
+      const receiveMessages = await fetcher.fetchAllEvents(
+        relayUrls,
+        {
+          kinds: [4],
+          '#p': [account.pubkey],
+        },
+        { since: lastLogin }
+      );
 
       const events = [...sendMessages, ...receiveMessages];
       for (const event of events) {
@@ -154,27 +175,24 @@ export function Root() {
   }, [status]);
 
   return (
-    <div className="h-screen w-screen bg-zinc-50 text-zinc-900 dark:bg-black dark:text-zinc-100">
-      <div className="relative h-full overflow-hidden">
+    <div className="h-screen w-screen bg-zinc-50 text-zinc-900 dark:bg-zinc-950 dark:text-zinc-100">
+      <div className="flex h-screen w-full flex-col">
         <div
           data-tauri-drag-region
-          className="absolute left-0 top-0 z-20 h-16 w-full bg-transparent"
+          className="relative h-11 shrink-0 border border-zinc-100 bg-white dark:border-zinc-900 dark:bg-black"
         />
-        <div className="relative flex h-full flex-col items-center justify-center">
-          <div className="flex flex-col items-center gap-2">
-            <LumeIcon className="h-16 w-16 text-black dark:text-zinc-100" />
+        <div className="relative flex min-h-0 w-full flex-1 items-center justify-center">
+          <div className="flex flex-col items-center justify-center gap-4">
+            <LoaderIcon className="h-6 w-6 animate-spin text-zinc-100" />
             <div className="text-center">
-              <h3 className="text-lg font-semibold leading-tight text-zinc-900 dark:text-zinc-100">
-                Here&apos;s an interesting fact:
+              <h3 className="text-lg font-semibold leading-tight text-zinc-100">
+                Prefetching data...
               </h3>
-              <p className="font-medium text-zinc-300 dark:text-zinc-600">
-                Bitcoin and Nostr can be used by anyone, and no one can stop you!
+              <p className="text-zinc-600">
+                This may take a few seconds, please don&apos;t close app.
               </p>
             </div>
           </div>
-          <div className="absolute bottom-16 left-1/2 -translate-x-1/2 transform">
-            <LoaderIcon className="h-5 w-5 animate-spin text-black dark:text-zinc-100" />
-          </div>
         </div>
       </div>
     </div>

src/app/settings/account.tsx

@@ -2,12 +2,16 @@ import { useState } from 'react';
 
 import { EyeOffIcon, EyeOnIcon } from '@shared/icons';
 
+import { useStronghold } from '@stores/stronghold';
+
 import { useAccount } from '@utils/hooks/useAccount';
 
 export function AccountSettingsScreen() {
   const { status, account } = useAccount();
   const [type, setType] = useState('password');
 
+  const privkey = useStronghold((state) => state.privkey);
+
   const showPrivateKey = () => {
     if (type === 'password') {
       setType('text');
@@ -56,7 +60,7 @@ export function AccountSettingsScreen() {
                   <input
                     readOnly
                     type={type}
-                    value={account.privkey}
+                    value={privkey}
                     className="relative w-full rounded-lg bg-zinc-800 py-3 pl-3.5 pr-11 text-zinc-100 !outline-none placeholder:text-zinc-400"
                   />
                   <button

src/app/space/components/add.tsx

@@ -1,4 +1,5 @@
 import { AddFeedBlock } from '@app/space/components/addFeed';
+import { AddHashTagBlock } from '@app/space/components/addHashtag';
 import { AddImageBlock } from '@app/space/components/addImage';
 
 export function AddBlock() {
@@ -6,6 +7,7 @@ export function AddBlock() {
     <div className="flex flex-col gap-1">
       <AddImageBlock />
       <AddFeedBlock />
+      <AddHashTagBlock />
     </div>
   );
 }

src/app/space/components/addFeed.tsx

@@ -12,7 +12,7 @@ import { createBlock } from '@libs/storage';
 
 import { CancelIcon, CheckCircleIcon, CommandIcon, LoaderIcon } from '@shared/icons';
 
-import { DEFAULT_AVATAR } from '@stores/constants';
+import { BLOCK_KINDS, DEFAULT_AVATAR } from '@stores/constants';
 import { ADD_FEEDBLOCK_SHORTCUT } from '@stores/shortcuts';
 
 import { useAccount } from '@utils/hooks/useAccount';
@@ -38,7 +38,7 @@ export function AddFeedBlock() {
   useHotkeys(ADD_FEEDBLOCK_SHORTCUT, () => openModal());
 
   const block = useMutation({
-    mutationFn: (data: any) => {
+    mutationFn: (data: { kind: number; title: string; content: string }) => {
       return createBlock(data.kind, data.title, data.content);
     },
     onSuccess: () => {
@@ -53,7 +53,7 @@ export function AddFeedBlock() {
     formState: { isDirty, isValid },
   } = useForm();
 
-  const onSubmit = (data: any) => {
+  const onSubmit = (data: { kind: number; title: string; content: string }) => {
     setLoading(true);
 
     selected.forEach((item, index) => {
@@ -64,7 +64,7 @@ export function AddFeedBlock() {
 
     // insert to database
     block.mutate({
-      kind: 1,
+      kind: BLOCK_KINDS.feed,
       title: data.title,
       content: JSON.stringify(selected),
     });
@@ -81,7 +81,7 @@ export function AddFeedBlock() {
       <button
         type="button"
         onClick={() => openModal()}
-        className="inline-flex h-9 w-56 items-center justify-start gap-2.5 rounded-md px-2.5"
+        className="inline-flex h-9 w-72 items-center justify-start gap-2.5 rounded-md px-2.5"
       >
         <div className="flex items-center gap-2">
           <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded border-t border-zinc-800/50 bg-zinc-900">
@@ -205,7 +205,7 @@ export function AddFeedBlock() {
                               {status === 'loading' ? (
                                 <p>Loading...</p>
                               ) : (
-                                JSON.parse(account.follows).map((follow) => (
+                                JSON.parse(account.follows as string).map((follow) => (
                                   <Combobox.Option
                                     key={follow}
                                     value={follow}

src/app/space/components/addHashtag.tsx

@@ -0,0 +1,174 @@
+import { Dialog, Transition } from '@headlessui/react';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { Fragment, useState } from 'react';
+import { useForm } from 'react-hook-form';
+import { useHotkeys } from 'react-hotkeys-hook';
+
+import { createBlock } from '@libs/storage';
+
+import { CancelIcon, CommandIcon, LoaderIcon } from '@shared/icons';
+
+import { BLOCK_KINDS } from '@stores/constants';
+import { ADD_HASHTAGBLOCK_SHORTCUT } from '@stores/shortcuts';
+
+export function AddHashTagBlock() {
+  const queryClient = useQueryClient();
+
+  const [loading, setLoading] = useState(false);
+  const [isOpen, setIsOpen] = useState(false);
+
+  const openModal = () => {
+    setIsOpen(true);
+  };
+
+  const closeModal = () => {
+    setIsOpen(false);
+  };
+
+  useHotkeys(ADD_HASHTAGBLOCK_SHORTCUT, () => openModal());
+
+  const {
+    register,
+    handleSubmit,
+    reset,
+    formState: { isDirty, isValid },
+  } = useForm();
+
+  const block = useMutation({
+    mutationFn: (data: { kind: number; title: string; content: string }) => {
+      return createBlock(data.kind, data.title, data.content);
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['blocks'] });
+    },
+  });
+
+  const onSubmit = async (data: { hashtag: string }) => {
+    setLoading(true);
+
+    // mutate
+    block.mutate({
+      kind: BLOCK_KINDS.hashtag,
+      title: data.hashtag,
+      content: data.hashtag.replace('#', ''),
+    });
+
+    setLoading(false);
+    // reset form
+    reset();
+    // close modal
+    closeModal();
+  };
+
+  return (
+    <>
+      <button
+        type="button"
+        onClick={() => openModal()}
+        className="inline-flex h-9 w-72 items-center justify-start gap-2.5 rounded-md px-2.5"
+      >
+        <div className="flex items-center gap-2">
+          <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded border-t border-zinc-800/50 bg-zinc-900">
+            <CommandIcon width={12} height={12} className="text-zinc-500" />
+          </div>
+          <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded border-t border-zinc-800/50 bg-zinc-900">
+            <span className="text-sm leading-none text-zinc-500">T</span>
+          </div>
+        </div>
+        <div>
+          <h5 className="font-medium text-zinc-400">New hashtag block</h5>
+        </div>
+      </button>
+      <Transition appear show={isOpen} as={Fragment}>
+        <Dialog as="div" className="relative z-50" onClose={closeModal}>
+          <Transition.Child
+            as={Fragment}
+            enter="ease-out duration-300"
+            enterFrom="opacity-0"
+            enterTo="opacity-100"
+            leave="ease-in duration-200"
+            leaveFrom="opacity-100"
+            leaveTo="opacity-0"
+          >
+            <div className="fixed inset-0 z-50 bg-black bg-opacity-30 backdrop-blur-md" />
+          </Transition.Child>
+          <div className="fixed inset-0 z-50 flex min-h-full items-center justify-center">
+            <Transition.Child
+              as={Fragment}
+              enter="ease-out duration-300"
+              enterFrom="opacity-0 scale-95"
+              enterTo="opacity-100 scale-100"
+              leave="ease-in duration-200"
+              leaveFrom="opacity-100 scale-100"
+              leaveTo="opacity-0 scale-95"
+            >
+              <Dialog.Panel className="relative flex h-min w-full max-w-lg flex-col gap-2 rounded-xl border-t border-zinc-800/50 bg-zinc-900">
+                <div className="h-min w-full shrink-0 border-b border-zinc-800 px-5 py-5">
+                  <div className="flex flex-col gap-1">
+                    <div className="flex items-center justify-between">
+                      <Dialog.Title
+                        as="h3"
+                        className="text-lg font-semibold leading-none text-zinc-100"
+                      >
+                        Create hashtag block
+                      </Dialog.Title>
+                      <button
+                        type="button"
+                        onClick={closeModal}
+                        className="inline-flex h-5 w-5 items-center justify-center rounded hover:bg-zinc-900"
+                      >
+                        <CancelIcon width={14} height={14} className="text-zinc-300" />
+                      </button>
+                    </div>
+                    <Dialog.Description className="text-sm leading-tight text-zinc-400">
+                      Pin the hashtag you want to keep follow up
+                    </Dialog.Description>
+                  </div>
+                </div>
+                <div className="flex h-full w-full flex-col overflow-y-auto px-5 pb-5 pt-3">
+                  <form
+                    onSubmit={handleSubmit(onSubmit)}
+                    className="mb-0 flex h-full w-full flex-col gap-4"
+                  >
+                    <div className="flex flex-col gap-1">
+                      <label
+                        htmlFor="title"
+                        className="text-sm font-medium uppercase tracking-wider text-zinc-400"
+                      >
+                        Hashtag *
+                      </label>
+                      <div className="after:shadow-highlight relative w-full shrink-0 overflow-hidden before:pointer-events-none before:absolute before:-inset-1 before:rounded-[6px] before:border before:border-fuchsia-500 before:opacity-0 before:ring-2 before:ring-fuchsia-500/20 before:transition after:pointer-events-none after:absolute after:inset-px after:rounded-[6px] after:shadow-white/5 after:transition focus-within:before:opacity-100 focus-within:after:shadow-fuchsia-500/100 dark:focus-within:after:shadow-fuchsia-500/20">
+                        <input
+                          type={'text'}
+                          {...register('hashtag', {
+                            required: true,
+                          })}
+                          spellCheck={false}
+                          placeholder="#"
+                          className="shadow-input relative h-10 w-full rounded-md border border-black/5 px-3 py-2 shadow-black/5 !outline-none placeholder:text-zinc-400 dark:bg-zinc-800 dark:text-zinc-100 dark:shadow-black/10 dark:placeholder:text-zinc-500"
+                        />
+                      </div>
+                    </div>
+                    <div>
+                      <button
+                        type="submit"
+                        disabled={!isDirty || !isValid}
+                        className="shadow-button inline-flex h-11 w-full transform items-center justify-center rounded-lg bg-fuchsia-500 font-medium text-zinc-100 active:translate-y-1 disabled:cursor-not-allowed disabled:opacity-30"
+                      >
+                        {loading ? (
+                          <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
+                        ) : (
+                          'Confirm'
+                        )}
+                      </button>
+                    </div>
+                  </form>
+                </div>
+              </Dialog.Panel>
+            </Transition.Child>
+          </div>
+        </Dialog>
+      </Transition>
+    </>
+  );
+}

src/app/space/components/addImage.tsx

@@ -1,35 +1,30 @@
 import { Dialog, Transition } from '@headlessui/react';
-import { NDKEvent, NDKPrivateKeySigner } from '@nostr-dev-kit/ndk';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { open } from '@tauri-apps/api/dialog';
-import { Body, fetch } from '@tauri-apps/api/http';
-import { Fragment, useContext, useEffect, useRef, useState } from 'react';
+import { Fragment, useEffect, useRef, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useHotkeys } from 'react-hotkeys-hook';
 
 import { createBlock } from '@libs/storage';
 
-import { CancelIcon, CommandIcon } from '@shared/icons';
+import { CancelIcon, CommandIcon, LoaderIcon } from '@shared/icons';
 import { Image } from '@shared/image';
-import { RelayContext } from '@shared/relayProvider';
 
-import { DEFAULT_AVATAR } from '@stores/constants';
+import { BLOCK_KINDS, DEFAULT_AVATAR } from '@stores/constants';
 import { ADD_IMAGEBLOCK_SHORTCUT } from '@stores/shortcuts';
 
-import { createBlobFromFile } from '@utils/createBlobFromFile';
-import { dateToUnix } from '@utils/date';
-import { useAccount } from '@utils/hooks/useAccount';
+import { usePublish } from '@utils/hooks/usePublish';
+import { useImageUploader } from '@utils/hooks/useUploader';
 
 export function AddImageBlock() {
-  const ndk = useContext(RelayContext);
   const queryClient = useQueryClient();
+  const upload = useImageUploader();
+
+  const { publish } = usePublish();
 
   const [loading, setLoading] = useState(false);
   const [isOpen, setIsOpen] = useState(false);
   const [image, setImage] = useState('');
 
-  const { account } = useAccount();
-
   const tags = useRef(null);
 
   const openModal = () => {
@@ -50,56 +45,8 @@ export function AddImageBlock() {
     formState: { isDirty, isValid },
   } = useForm();
 
-  const openFileDialog = async () => {
-    const selected: any = await open({
-      multiple: false,
-      filters: [
-        {
-          name: 'Image',
-          extensions: ['png', 'jpeg', 'jpg'],
-        },
-      ],
-    });
-
-    if (Array.isArray(selected)) {
-      // user selected multiple files
-    } else if (selected === null) {
-      // user cancelled the selection
-    } else {
-      const filename = selected.split('/').pop();
-      const file = await createBlobFromFile(selected);
-      const buf = await file.arrayBuffer();
-
-      const res: any = await fetch('https://void.cat/upload?cli=false', {
-        method: 'POST',
-        timeout: 5,
-        headers: {
-          accept: '*/*',
-          'Content-Type': 'application/octet-stream',
-          'V-Filename': filename,
-          'V-Description': 'Upload from https://lume.nu',
-          'V-Strip-Metadata': 'true',
-        },
-        body: Body.bytes(buf),
-      });
-
-      if (res.ok) {
-        const imageURL = `https://void.cat/d/${res.data.file.id}.webp`;
-        tags.current = [
-          ['url', imageURL],
-          ['m', res.data.file.metadata.mimeType],
-          ['x', res.data.file.metadata.digest],
-          ['size', res.data.file.metadata.size],
-          ['magnet', res.data.file.metadata.magnetLink],
-        ];
-
-        setImage(imageURL);
-      }
-    }
-  };
-
   const block = useMutation({
-    mutationFn: (data: any) => {
+    mutationFn: (data: { kind: number; title: string; content: string }) => {
       return createBlock(data.kind, data.title, data.content);
     },
     onSuccess: () => {
@@ -107,25 +54,21 @@ export function AddImageBlock() {
     },
   });
 
-  const onSubmit = (data: any) => {
+  const uploadImage = async () => {
+    const image = await upload(null);
+    if (image.url) {
+      setImage(image.url);
+    }
+  };
+
+  const onSubmit = async (data: { kind: number; title: string; content: string }) => {
     setLoading(true);
 
-    const signer = new NDKPrivateKeySigner(account.privkey);
-    ndk.signer = signer;
-
-    const event = new NDKEvent(ndk);
-    // build event
-    event.content = data.title;
-    event.kind = 1063;
-    event.created_at = dateToUnix();
-    event.pubkey = account.pubkey;
-    event.tags = tags.current;
-
-    // publish event
-    event.publish();
+    // publish file metedata
+    await publish({ content: data.title, kind: 1063, tags: tags.current });
 
     // mutate
-    block.mutate({ kind: 0, title: data.title, content: data.content });
+    block.mutate({ kind: BLOCK_KINDS.image, title: data.title, content: data.content });
 
     setLoading(false);
     // reset form
@@ -143,7 +86,7 @@ export function AddImageBlock() {
       <button
         type="button"
         onClick={() => openModal()}
-        className="inline-flex h-9 w-56 items-center justify-start gap-2.5 rounded-md px-2.5"
+        className="inline-flex h-9 w-72 items-center justify-start gap-2.5 rounded-md px-2.5"
       >
         <div className="flex items-center gap-2">
           <div className="inline-flex h-6 w-6 shrink-0 items-center justify-center rounded border-t border-zinc-800/50 bg-zinc-900">
@@ -249,7 +192,7 @@ export function AddImageBlock() {
                         />
                         <div className="absolute bottom-3 right-3 z-10">
                           <button
-                            onClick={() => openFileDialog()}
+                            onClick={() => uploadImage()}
                             type="button"
                             className="inline-flex h-6 items-center justify-center rounded bg-zinc-900 px-3 text-sm font-medium text-zinc-300 ring-1 ring-zinc-800 hover:bg-zinc-800"
                           >
@@ -265,27 +208,7 @@ export function AddImageBlock() {
                         className="shadow-button inline-flex h-11 w-full transform items-center justify-center rounded-lg bg-fuchsia-500 font-medium text-zinc-100 active:translate-y-1 disabled:cursor-not-allowed disabled:opacity-30"
                       >
                         {loading ? (
-                          <svg
-                            className="h-4 w-4 animate-spin text-black dark:text-zinc-100"
-                            xmlns="http://www.w3.org/2000/svg"
-                            fill="none"
-                            viewBox="0 0 24 24"
-                          >
-                            <title id="loading">Loading</title>
-                            <circle
-                              className="opacity-25"
-                              cx="12"
-                              cy="12"
-                              r="10"
-                              stroke="currentColor"
-                              strokeWidth="4"
-                            />
-                            <path
-                              className="opacity-75"
-                              fill="currentColor"
-                              d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
-                            />
-                          </svg>
+                          <LoaderIcon className="h-4 w-4 animate-spin text-black dark:text-zinc-100" />
                         ) : (
                           'Confirm'
                         )}

src/app/space/components/blocks/feed.tsx

@@ -1,17 +1,19 @@
-import { useInfiniteQuery, useMutation, useQueryClient } from '@tanstack/react-query';
+import { useInfiniteQuery } from '@tanstack/react-query';
 import { useVirtualizer } from '@tanstack/react-virtual';
-import { useEffect, useRef } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
 
-import { getNotesByAuthors, removeBlock } from '@libs/storage';
+import { getNotesByAuthors } from '@libs/storage';
 
-import { Note } from '@shared/notes/note';
+import { NoteKind_1, NoteKind_1063, NoteThread, Repost } from '@shared/notes';
+import { NoteKindUnsupport } from '@shared/notes/kinds/unsupport';
 import { NoteSkeleton } from '@shared/notes/skeleton';
 import { TitleBar } from '@shared/titleBar';
 
+import { Block, LumeEvent } from '@utils/types';
+
 const ITEM_PER_PAGE = 10;
 
-export function FeedBlock({ params }: { params: any }) {
-  const queryClient = useQueryClient();
+export function FeedBlock({ params }: { params: Block }) {
   const { status, data, fetchNextPage, hasNextPage, isFetchingNextPage } =
     useInfiniteQuery({
       queryKey: ['newsfeed', params.content],
@@ -21,9 +23,9 @@ export function FeedBlock({ params }: { params: any }) {
       getNextPageParam: (lastPage) => lastPage.nextCursor,
     });
 
-  const notes = data ? data.pages.flatMap((d: { data: any }) => d.data) : [];
-  const parentRef = useRef();
+  const notes = data ? data.pages.flatMap((d: { data: LumeEvent[] }) => d.data) : [];
 
+  const parentRef = useRef();
   const rowVirtualizer = useVirtualizer({
     count: hasNextPage ? notes.length + 1 : notes.length,
     getScrollElement: () => parentRef.current,
@@ -45,29 +47,74 @@ export function FeedBlock({ params }: { params: any }) {
     }
   }, [notes.length, fetchNextPage, rowVirtualizer.getVirtualItems()]);
 
-  const block = useMutation({
-    mutationFn: (id: string) => {
-      return removeBlock(id);
+  const renderItem = useCallback(
+    (index: string | number) => {
+      const note: LumeEvent = notes[index];
+      if (!note) return;
+      switch (note.kind) {
+        case 1: {
+          const root = note.tags.find((el) => el[3] === 'root')?.[1];
+          const reply = note.tags.find((el) => el[3] === 'reply')?.[1];
+          if (root || reply) {
+            return (
+              <div
+                key={note.event_id || note.id}
+                data-index={index}
+                ref={rowVirtualizer.measureElement}
+              >
+                <NoteThread event={note} root={root} reply={reply} />
+              </div>
+            );
+          } else {
+            return (
+              <div
+                key={note.event_id || note.id}
+                data-index={index}
+                ref={rowVirtualizer.measureElement}
+              >
+                <NoteKind_1 event={note} skipMetadata={false} />
+              </div>
+            );
+          }
+        }
+        case 6:
+          return (
+            <div
+              key={note.event_id || note.id}
+              data-index={index}
+              ref={rowVirtualizer.measureElement}
+            >
+              <Repost key={note.event_id} event={note} />
+            </div>
+          );
+        case 1063:
+          return (
+            <div
+              key={note.event_id || note.id}
+              data-index={index}
+              ref={rowVirtualizer.measureElement}
+            >
+              <NoteKind_1063 key={note.event_id} event={note} />
+            </div>
+          );
+        default:
+          return (
+            <div
+              key={note.event_id || note.id}
+              data-index={index}
+              ref={rowVirtualizer.measureElement}
+            >
+              <NoteKindUnsupport key={note.event_id} event={note} />
+            </div>
+          );
+      }
     },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['blocks'] });
-    },
-  });
-
-  const renderItem = (index: string | number) => {
-    const note = notes[index];
-
-    if (!note) return;
-    return (
-      <div key={index} data-index={index} ref={rowVirtualizer.measureElement}>
-        <Note event={note} />
-      </div>
-    );
-  };
+    [notes]
+  );
 
   return (
     <div className="w-[400px] shrink-0 border-r border-zinc-900">
-      <TitleBar title={params.title} onClick={() => block.mutate(params.id)} />
+      <TitleBar id={params.id} title={params.title} />
       <div
         ref={parentRef}
         className="scrollbar-hide flex h-full w-full flex-col justify-between gap-1.5 overflow-y-auto pb-20 pt-1.5"
@@ -79,6 +126,16 @@ export function FeedBlock({ params }: { params: any }) {
               <NoteSkeleton />
             </div>
           </div>
+        ) : itemsVirtualizer.length === 0 ? (
+          <div className="px-3 py-1.5">
+            <div className="rounded-xl border-t border-zinc-800/50 bg-zinc-900 px-3 py-6">
+              <div className="flex flex-col items-center gap-4">
+                <p className="text-center text-sm text-zinc-300">
+                  Not found any posts from last 48 hours
+                </p>
+              </div>
+            </div>
+          </div>
         ) : (
           <div
             className="relative w-full"
@@ -94,9 +151,7 @@ export function FeedBlock({ params }: { params: any }) {
                 }px)`,
               }}
             >
-              {rowVirtualizer
-                .getVirtualItems()
-                .map((virtualRow) => renderItem(virtualRow.index))}
+              {itemsVirtualizer.map((virtualRow) => renderItem(virtualRow.index))}
             </div>
           </div>
         )}

src/app/space/components/blocks/following.tsx

@@ -1,29 +1,26 @@
 import { useInfiniteQuery } from '@tanstack/react-query';
 import { useVirtualizer } from '@tanstack/react-virtual';
-import { useEffect, useRef } from 'react';
+import { useCallback, useEffect, useRef } from 'react';
+import { Link } from 'react-router-dom';
 
 import { useNewsfeed } from '@app/space/hooks/useNewsfeed';
 
 import { getNotes } from '@libs/storage';
 
-import { Note } from '@shared/notes/note';
+import { NoteKind_1, NoteKind_1063, NoteThread, Repost } from '@shared/notes';
+import { NoteKindUnsupport } from '@shared/notes/kinds/unsupport';
 import { NoteSkeleton } from '@shared/notes/skeleton';
 import { TitleBar } from '@shared/titleBar';
 
-import { useNote } from '@stores/note';
+import { LumeEvent } from '@utils/types';
 
 const ITEM_PER_PAGE = 10;
 
 export function FollowingBlock() {
   // subscribe for live update
   useNewsfeed();
-  // notify user that new note is arrive
-  const [hasNewNote, toggleHasNewNote] = useNote((state) => [
-    state.hasNewNote,
-    state.toggleHasNewNote,
-  ]);
 
-  const { status, data, fetchNextPage, hasNextPage, isFetchingNextPage, refetch } =
+  const { status, data, fetchNextPage, hasNextPage, isFetchingNextPage } =
     useInfiniteQuery({
       queryKey: ['newsfeed-circle'],
       queryFn: async ({ pageParam = 0 }) => {
@@ -32,7 +29,7 @@ export function FollowingBlock() {
       getNextPageParam: (lastPage) => lastPage.nextCursor,
     });
 
-  const notes = data ? data.pages.flatMap((d: { data: any }) => d.data) : [];
+  const notes = data ? data.pages.flatMap((d: { data: LumeEvent[] }) => d.data) : [];
   const parentRef = useRef();
 
   const rowVirtualizer = useVirtualizer({
@@ -56,43 +53,80 @@ export function FollowingBlock() {
     }
   }, [notes.length, fetchNextPage, rowVirtualizer.getVirtualItems()]);
 
-  const refreshFirstPage = () => {
-    // refetch
-    refetch({ refetchPage: (_, index: number) => index === 0 });
-    // scroll to top
-    rowVirtualizer.scrollToIndex(1);
-    // stop notify
-    toggleHasNewNote(false);
-  };
-
-  const renderItem = (index: string | number) => {
-    const note = notes[index];
-    if (!note) return;
-    return (
-      <div
-        key={note.event_id || note.id}
-        data-index={index}
-        ref={rowVirtualizer.measureElement}
-      >
-        <Note event={note} />
-      </div>
-    );
-  };
+  const renderItem = useCallback(
+    (index: string | number) => {
+      const note: LumeEvent = notes[index];
+      if (!note) return;
+      switch (note.kind) {
+        case 1: {
+          let root: string;
+          let reply: string;
+          if (note.tags?.[0]?.[0] === 'e' && !note.tags?.[0]?.[3]) {
+            root = note.tags[0][1];
+          } else {
+            root = note.tags.find((el) => el[3] === 'root')?.[1];
+            reply = note.tags.find((el) => el[3] === 'reply')?.[1];
+          }
+          if (root || reply) {
+            return (
+              <div
+                key={(root || reply) + (note.event_id || note.id) + index}
+                data-index={index}
+                ref={rowVirtualizer.measureElement}
+              >
+                <NoteThread event={note} root={root} reply={reply} />
+              </div>
+            );
+          } else {
+            return (
+              <div
+                key={(note.event_id || note.id) + index}
+                data-index={index}
+                ref={rowVirtualizer.measureElement}
+              >
+                <NoteKind_1 event={note} skipMetadata={false} />
+              </div>
+            );
+          }
+        }
+        case 6:
+          return (
+            <div
+              key={(note.event_id || note.id) + index}
+              data-index={index}
+              ref={rowVirtualizer.measureElement}
+            >
+              <Repost key={note.event_id} event={note} />
+            </div>
+          );
+        case 1063:
+          return (
+            <div
+              key={(note.event_id || note.id) + index}
+              data-index={index}
+              ref={rowVirtualizer.measureElement}
+            >
+              <NoteKind_1063 key={note.event_id} event={note} />
+            </div>
+          );
+        default:
+          return (
+            <div
+              key={(note.event_id || note.id) + index}
+              data-index={index}
+              ref={rowVirtualizer.measureElement}
+            >
+              <NoteKindUnsupport key={note.event_id} event={note} />
+            </div>
+          );
+      }
+    },
+    [notes]
+  );
 
   return (
     <div className="relative w-[400px] shrink-0 border-r border-zinc-900">
       <TitleBar title="Your Circle" />
-      {hasNewNote && (
-        <div className="absolute left-1/2 top-12 z-50 -translate-x-1/2 transform">
-          <button
-            type="button"
-            onClick={() => refreshFirstPage()}
-            className="inline-flex w-min items-center justify-center rounded-full border border-fuchsia-800/50 bg-fuchsia-500 px-3.5 py-1.5 text-sm hover:bg-fuchsia-600"
-          >
-            Newest
-          </button>
-        </div>
-      )}
       <div
         ref={parentRef}
         className="scrollbar-hide flex h-full w-full flex-col justify-between gap-1.5 overflow-y-auto pb-20 pt-1.5"
@@ -104,6 +138,24 @@ export function FollowingBlock() {
               <NoteSkeleton />
             </div>
           </div>
+        ) : itemsVirtualizer.length === 0 ? (
+          <div className="px-3 py-1.5">
+            <div className="rounded-xl border-t border-zinc-800/50 bg-zinc-900 px-3 py-6">
+              <div className="flex flex-col items-center gap-4">
+                <p className="text-center text-sm text-zinc-300">
+                  You not have any posts to see yet
+                  <br />
+                  Follow more people to have more fun.
+                </p>
+                <Link
+                  to="/app/trending"
+                  className="inline-flex w-max rounded bg-fuchsia-500 px-2.5 py-1.5 text-sm hover:bg-fuchsia-600"
+                >
+                  Trending
+                </Link>
+              </div>
+            </div>
+          </div>
         ) : (
           <div
             className="relative w-full"
@@ -119,9 +171,7 @@ export function FollowingBlock() {
                 }px)`,
               }}
             >
-              {rowVirtualizer
-                .getVirtualItems()
-                .map((virtualRow) => renderItem(virtualRow.index))}
+              {itemsVirtualizer.map((virtualRow) => renderItem(virtualRow.index))}
             </div>
           </div>
         )}

src/app/space/components/blocks/hashtag.tsx

@@ -0,0 +1,87 @@
+import { useQuery } from '@tanstack/react-query';
+import { useVirtualizer } from '@tanstack/react-virtual';
+import { useRef } from 'react';
+
+import { useNDK } from '@libs/ndk/provider';
+
+import { NoteKind_1, NoteSkeleton } from '@shared/notes';
+import { TitleBar } from '@shared/titleBar';
+
+import { nHoursAgo } from '@utils/date';
+import { Block, LumeEvent } from '@utils/types';
+
+export function HashtagBlock({ params }: { params: Block }) {
+  const { relayUrls, fetcher } = useNDK();
+  const { status, data } = useQuery(['hashtag', params.content], async () => {
+    const events = (await fetcher.fetchAllEvents(
+      relayUrls,
+      { kinds: [1], '#t': [params.content] },
+      { since: nHoursAgo(48) }
+    )) as unknown as LumeEvent[];
+    return events;
+  });
+
+  const parentRef = useRef();
+  const rowVirtualizer = useVirtualizer({
+    count: data ? data.length : 0,
+    getScrollElement: () => parentRef.current,
+    estimateSize: () => 400,
+  });
+
+  const itemsVirtualizer = rowVirtualizer.getVirtualItems();
+
+  return (
+    <div className="w-[400px] shrink-0 border-r border-zinc-900">
+      <TitleBar id={params.id} title={params.title + ' in 48 hours ago'} />
+      <div
+        ref={parentRef}
+        className="scrollbar-hide flex h-full w-full flex-col justify-between gap-1.5 overflow-y-auto pb-20 pt-1.5"
+        style={{ contain: 'strict' }}
+      >
+        {status === 'loading' ? (
+          <div className="px-3 py-1.5">
+            <div className="rounded-xl border-t border-zinc-800/50 bg-zinc-900 px-3 pt-3">
+              <NoteSkeleton />
+            </div>
+          </div>
+        ) : itemsVirtualizer.length === 0 ? (
+          <div className="px-3 py-1.5">
+            <div className="rounded-xl border-t border-zinc-800/50 bg-zinc-900 px-3 py-6">
+              <div className="flex flex-col items-center gap-4">
+                <p className="text-center text-sm text-zinc-300">
+                  No new posts about this hashtag in 48 hours ago
+                </p>
+              </div>
+            </div>
+          </div>
+        ) : (
+          <div
+            className="relative w-full"
+            style={{
+              height: `${rowVirtualizer.getTotalSize()}px`,
+            }}
+          >
+            <div
+              className="absolute left-0 top-0 w-full"
+              style={{
+                transform: `translateY(${
+                  itemsVirtualizer[0].start - rowVirtualizer.options.scrollMargin
+                }px)`,
+              }}
+            >
+              {itemsVirtualizer.map((virtualRow) => (
+                <div
+                  key={virtualRow.key}
+                  data-index={virtualRow.index}
+                  ref={rowVirtualizer.measureElement}
+                >
+                  <NoteKind_1 event={data[virtualRow.index]} />
+                </div>
+              ))}
+            </div>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}

src/app/space/components/blocks/image.tsx

@@ -1,23 +1,13 @@
-import { useMutation, useQueryClient } from '@tanstack/react-query';
-
-import { removeBlock } from '@libs/storage';
-
 import { CancelIcon } from '@shared/icons';
 import { Image } from '@shared/image';
 
 import { DEFAULT_AVATAR } from '@stores/constants';
 
-export function ImageBlock({ params }: { params: any }) {
-  const queryClient = useQueryClient();
+import { useBlock } from '@utils/hooks/useBlock';
+import { Block } from '@utils/types';
 
-  const block = useMutation({
-    mutationFn: (id: string) => {
-      return removeBlock(id);
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['blocks'] });
-    },
-  });
+export function ImageBlock({ params }: { params: Block }) {
+  const { remove } = useBlock();
 
   return (
     <div className="flex h-full w-[350px] shrink-0 flex-col justify-between border-r border-zinc-900">
@@ -27,7 +17,7 @@ export function ImageBlock({ params }: { params: any }) {
             <h3 className="font-medium text-white drop-shadow-lg">{params.title}</h3>
             <button
               type="button"
-              onClick={() => block.mutate(params.id)}
+              onClick={() => remove.mutate(params.id)}
               className="inline-flex h-7 w-7 items-center justify-center rounded-md bg-white/30 backdrop-blur-lg"
             >
               <CancelIcon width={16} height={16} className="text-white" />

src/app/space/components/blocks/thread.tsx

@@ -1,76 +1,53 @@
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { Link } from 'react-router-dom';
-
-import { useLiveThread } from '@app/space/hooks/useLiveThread';
-
-import { getNoteByID, removeBlock } from '@libs/storage';
-
-import { Kind1 } from '@shared/notes/contents/kind1';
-import { Kind1063 } from '@shared/notes/contents/kind1063';
-import { NoteMetadata } from '@shared/notes/metadata';
-import { NoteReplyForm } from '@shared/notes/replies/form';
+// import { useLiveThread } from '@app/space/hooks/useLiveThread';
+import {
+  NoteActions,
+  NoteContent,
+  NoteReplyForm,
+  NoteStats,
+  ThreadUser,
+} from '@shared/notes';
 import { RepliesList } from '@shared/notes/replies/list';
 import { NoteSkeleton } from '@shared/notes/skeleton';
 import { TitleBar } from '@shared/titleBar';
-import { User } from '@shared/user';
 
 import { useAccount } from '@utils/hooks/useAccount';
-import { parser } from '@utils/parser';
-
-export function ThreadBlock({ params }: { params: any }) {
-  useLiveThread(params.content);
-
-  const queryClient = useQueryClient();
+import { useEvent } from '@utils/hooks/useEvent';
+import { Block } from '@utils/types';
 
+export function ThreadBlock({ params }: { params: Block }) {
+  const { status, data } = useEvent(params.content);
   const { account } = useAccount();
-  const { status, data } = useQuery(['thread', params.content], async () => {
-    const res = await getNoteByID(params.content);
-    res['content'] = parser(res);
-    return res;
-  });
 
-  const block = useMutation({
-    mutationFn: (id: string) => {
-      return removeBlock(id);
-    },
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['blocks'] });
-    },
-  });
+  // subscribe to live reply
+  // useLiveThread(params.content);
 
   return (
     <div className="w-[400px] shrink-0 border-r border-zinc-900">
-      <TitleBar title={params.title} onClick={() => block.mutate(params.id)} />
-      <div className="scrollbar-hide flex h-full w-full flex-col gap-1.5 overflow-y-auto pb-20 pt-1.5">
+      <TitleBar id={params.id} title={params.title} />
+      <div className="scrollbar-hide flex h-full w-full flex-col gap-3 overflow-y-auto pb-20 pt-1.5">
         {status === 'loading' ? (
           <div className="px-3 py-1.5">
-            <div className="shadow-input rounded-md bg-zinc-900 px-3 py-3 shadow-black/20">
+            <div className="rounded-xl border-t border-zinc-800/50 bg-zinc-900 px-3 py-3">
               <NoteSkeleton />
             </div>
           </div>
         ) : (
-          <div className="h-min w-full px-3 py-1.5">
-            <div className="rounded-md bg-zinc-900 px-5 pt-5">
-              <User pubkey={data.pubkey} time={data.created_at} />
-              <div className="mt-3">
-                {data.kind === 1 && <Kind1 content={data.content} />}
-                {data.kind === 1063 && <Kind1063 metadata={data.tags} />}
-                <NoteMetadata
-                  id={data.event_id || params.content}
-                  eventPubkey={data.pubkey}
-                />
-                <Link to={`/app/note/${params.content}`}>Focus</Link>
+          <div className="h-min w-full px-3 pt-1.5">
+            <div className="rounded-xl border-t border-zinc-800/50 bg-zinc-900 px-3 pt-3">
+              <ThreadUser pubkey={data.pubkey} time={data.created_at} />
+              <div className="mt-2">
+                <NoteContent content={data.content} />
+              </div>
+              <div>
+                <NoteActions id={data.id} pubkey={data.pubkey} noOpenThread={true} />
+                <NoteStats id={data.id} />
               </div>
-            </div>
-            <div className="mt-3 rounded-md bg-zinc-900">
-              {account && (
-                <NoteReplyForm rootID={params.content} userPubkey={account.pubkey} />
-              )}
             </div>
           </div>
         )}
         <div className="px-3">
-          <RepliesList parent_id={params.content} />
+          <NoteReplyForm id={params.content} pubkey={account.pubkey} />
+          <RepliesList id={params.content} />
         </div>
       </div>
     </div>

src/app/space/components/blocks/user.tsx

@@ -0,0 +1,101 @@
+import { useQuery } from '@tanstack/react-query';
+import { useVirtualizer } from '@tanstack/react-virtual';
+import { useRef } from 'react';
+
+import { useNDK } from '@libs/ndk/provider';
+
+import { NoteKind_1, NoteSkeleton } from '@shared/notes';
+import { TitleBar } from '@shared/titleBar';
+import { UserProfile } from '@shared/userProfile';
+
+import { nHoursAgo } from '@utils/date';
+import { Block, LumeEvent } from '@utils/types';
+
+export function UserBlock({ params }: { params: Block }) {
+  const parentRef = useRef<HTMLDivElement>(null);
+
+  const { fetcher, relayUrls } = useNDK();
+  const { status, data } = useQuery(['user-feed', params.content], async () => {
+    const events = await fetcher.fetchAllEvents(
+      relayUrls,
+      { kinds: [1], authors: [params.content] },
+      { since: nHoursAgo(48) },
+      { sort: true }
+    );
+    return events as unknown as LumeEvent[];
+  });
+
+  const rowVirtualizer = useVirtualizer({
+    count: data ? data.length : 0,
+    getScrollElement: () => parentRef.current,
+    estimateSize: () => 400,
+    overscan: 2,
+  });
+
+  const itemsVirtualizer = rowVirtualizer.getVirtualItems();
+
+  return (
+    <div className="h-full w-[400px] shrink-0 border-r border-zinc-900">
+      <TitleBar id={params.id} title={params.title} />
+      <div
+        ref={parentRef}
+        className="scrollbar-hide flex h-full flex-1 flex-col gap-1.5 overflow-y-auto pt-1.5"
+      >
+        <div className="px-3 pt-1.5">
+          <UserProfile pubkey={params.content} />
+        </div>
+        <div>
+          <h3 className="mt-2 px-3 text-lg font-semibold text-zinc-300">
+            Latest activities
+          </h3>
+          <div className="flex h-full w-full flex-col justify-between gap-1.5 pb-10">
+            {status === 'loading' ? (
+              <div className="px-3 py-1.5">
+                <div className="shadow-input rounded-md bg-zinc-900 px-3 py-3 shadow-black/20">
+                  <NoteSkeleton />
+                </div>
+              </div>
+            ) : itemsVirtualizer.length === 0 ? (
+              <div className="px-3 py-1.5">
+                <div className="rounded-xl border-t border-zinc-800/50 bg-zinc-900 px-3 py-6">
+                  <div className="flex flex-col items-center gap-4">
+                    <p className="text-center text-sm text-zinc-300">
+                      No new posts about this hashtag in 48 hours ago
+                    </p>
+                  </div>
+                </div>
+              </div>
+            ) : (
+              <div
+                className="relative w-full"
+                style={{
+                  height: `${rowVirtualizer.getTotalSize()}px`,
+                }}
+              >
+                <div
+                  className="absolute left-0 top-0 w-full"
+                  style={{
+                    transform: `translateY(${
+                      itemsVirtualizer[0].start - rowVirtualizer.options.scrollMargin
+                    }px)`,
+                  }}
+                >
+                  {itemsVirtualizer.map((virtualRow) => (
+                    <div
+                      key={virtualRow.key}
+                      data-index={virtualRow.index}
+                      ref={rowVirtualizer.measureElement}
+                    >
+                      <NoteKind_1 event={data[virtualRow.index]} />
+                    </div>
+                  ))}
+                  <div className="h-20" />
+                </div>
+              </div>
+            )}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}

src/app/space/hooks/useLiveThread.tsx

@@ -1,16 +1,16 @@
 import { NDKEvent, NDKFilter } from '@nostr-dev-kit/ndk';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import { useContext, useEffect, useRef } from 'react';
+import { useEffect, useRef } from 'react';
 
+import { useNDK } from '@libs/ndk/provider';
 import { createReplyNote } from '@libs/storage';
 
-import { RelayContext } from '@shared/relayProvider';
-
 export function useLiveThread(id: string) {
-  const ndk = useContext(RelayContext);
   const queryClient = useQueryClient();
   const now = useRef(Math.floor(Date.now() / 1000));
 
+  const { ndk } = useNDK();
+
   const thread = useMutation({
     mutationFn: (data: NDKEvent) => {
       return createReplyNote(

src/app/space/hooks/useNewsfeed.tsx

@@ -1,25 +1,25 @@
 import { NDKEvent, NDKFilter } from '@nostr-dev-kit/ndk';
-import { useContext, useEffect, useRef } from 'react';
+import { useEffect, useRef } from 'react';
 
+import { useNDK } from '@libs/ndk/provider';
 import { createNote } from '@libs/storage';
 
-import { RelayContext } from '@shared/relayProvider';
-
 import { useNote } from '@stores/note';
 
 import { useAccount } from '@utils/hooks/useAccount';
 
 export function useNewsfeed() {
-  const ndk = useContext(RelayContext);
   const sub = useRef(null);
   const now = useRef(Math.floor(Date.now() / 1000));
-  const toggleHasNewNote = useNote((state) => state.toggleHasNewNote);
 
+  const { ndk } = useNDK();
   const { status, account } = useAccount();
 
+  const toggleHasNewNote = useNote((state) => state.toggleHasNewNote);
+
   useEffect(() => {
     if (status === 'success' && account) {
-      const follows = account ? JSON.parse(account.follows) : [];
+      const follows = account ? JSON.parse(account.follows as string) : [];
 
       const filter: NDKFilter = {
         kinds: [1, 6],
@@ -30,7 +30,6 @@ export function useNewsfeed() {
       sub.current = ndk.subscribe(filter, { closeOnEose: false });
 
       sub.current.addListener('event', (event: NDKEvent) => {
-        console.log('new note: ', event);
         // add to db
         createNote(
           event.id,
@@ -46,7 +45,9 @@ export function useNewsfeed() {
     }
 
     return () => {
-      sub.current.stop();
+      if (sub.current) {
+        sub.current.stop();
+      }
     };
   }, [status]);
 }

src/app/space/index.tsx

@@ -1,15 +1,20 @@
 import { useQuery } from '@tanstack/react-query';
+import { useCallback } from 'react';
 
 import { AddBlock } from '@app/space/components/add';
 import { FeedBlock } from '@app/space/components/blocks/feed';
 import { FollowingBlock } from '@app/space/components/blocks/following';
+import { HashtagBlock } from '@app/space/components/blocks/hashtag';
 import { ImageBlock } from '@app/space/components/blocks/image';
 import { ThreadBlock } from '@app/space/components/blocks/thread';
+import { UserBlock } from '@app/space/components/blocks/user';
 
 import { getBlocks } from '@libs/storage';
 
 import { LoaderIcon } from '@shared/icons';
 
+import { Block } from '@utils/types';
+
 export function SpaceScreen() {
   const {
     status,
@@ -28,6 +33,26 @@ export function SpaceScreen() {
     }
   );
 
+  const renderBlock = useCallback(
+    (block: Block) => {
+      switch (block.kind) {
+        case 0:
+          return <ImageBlock key={block.id} params={block} />;
+        case 1:
+          return <FeedBlock key={block.id} params={block} />;
+        case 2:
+          return <ThreadBlock key={block.id} params={block} />;
+        case 3:
+          return <HashtagBlock key={block.id} params={block} />;
+        case 5:
+          return <UserBlock key={block.id} params={block} />;
+        default:
+          break;
+      }
+    },
+    [blocks]
+  );
+
   return (
     <div className="scrollbar-hide flex h-full w-full flex-nowrap overflow-x-auto overflow-y-hidden">
       <FollowingBlock />
@@ -43,18 +68,7 @@ export function SpaceScreen() {
           </div>
         </div>
       ) : (
-        blocks.map((block: { kind: number; id: string }) => {
-          switch (block.kind) {
-            case 0:
-              return <ImageBlock key={block.id} params={block} />;
-            case 1:
-              return <FeedBlock key={block.id} params={block} />;
-            case 2:
-              return <ThreadBlock key={block.id} params={block} />;
-            default:
-              break;
-          }
-        })
+        blocks.map((block: Block) => renderBlock(block))
       )}
       {isFetching && (
         <div className="flex w-[350px] shrink-0 flex-col border-r border-zinc-900">

src/app/trending/components/trendingNotes.tsx

@@ -1,6 +1,6 @@
 import { useQuery } from '@tanstack/react-query';
 
-import { Note } from '@shared/notes/note';
+import { NoteKind_1 } from '@shared/notes';
 import { NoteSkeleton } from '@shared/notes/skeleton';
 import { TitleBar } from '@shared/titleBar';
 
@@ -27,7 +27,7 @@ export function TrendingNotes() {
         ) : (
           <div className="relative flex w-full flex-col pt-1.5">
             {data.notes.map((item) => (
-              <Note key={item.id} event={item.event} />
+              <NoteKind_1 key={item.id} event={item.event} skipMetadata={true} />
             ))}
           </div>
         )}

src/app/user/components/feed.tsx

@@ -1,35 +0,0 @@
-import { NDKFilter } from '@nostr-dev-kit/ndk';
-import { useQuery } from '@tanstack/react-query';
-import { useContext } from 'react';
-
-import { Note } from '@shared/notes/note';
-import { RelayContext } from '@shared/relayProvider';
-
-import { dateToUnix, getHourAgo } from '@utils/date';
-import { LumeEvent } from '@utils/types';
-
-export function UserFeed({ pubkey }: { pubkey: string }) {
-  const ndk = useContext(RelayContext);
-  const { status, data } = useQuery(['user-feed', pubkey], async () => {
-    const now = new Date();
-    const filter: NDKFilter = {
-      kinds: [1],
-      authors: [pubkey],
-      since: dateToUnix(getHourAgo(48, now)),
-    };
-    const events = await ndk.fetchEvents(filter);
-    return [...events];
-  });
-
-  return (
-    <div className="w-full max-w-[400px] px-2 pb-10">
-      {status === 'loading' ? (
-        <div className="px-3">
-          <p>Loading...</p>
-        </div>
-      ) : (
-        data.map((note: LumeEvent) => <Note key={note.id} event={note} />)
-      )}
-    </div>
-  );
-}

src/app/user/index.tsx

@@ -1,172 +0,0 @@
-import { Tab } from '@headlessui/react';
-import { Fragment, useEffect, useState } from 'react';
-import { Link, useParams } from 'react-router-dom';
-
-import { UserFeed } from '@app/user/components/feed';
-import { UserMetadata } from '@app/user/components/metadata';
-
-import { EditProfileModal } from '@shared/editProfileModal';
-import { ThreadsIcon, ZapIcon } from '@shared/icons';
-import { Image } from '@shared/image';
-
-import { DEFAULT_AVATAR } from '@stores/constants';
-
-import { useAccount } from '@utils/hooks/useAccount';
-import { useProfile } from '@utils/hooks/useProfile';
-import { useSocial } from '@utils/hooks/useSocial';
-import { shortenKey } from '@utils/shortenKey';
-
-export function UserScreen() {
-  const { pubkey } = useParams();
-  const { user } = useProfile(pubkey);
-  const { account } = useAccount();
-  const { status, userFollows, follow, unfollow } = useSocial();
-
-  const [followed, setFollowed] = useState(false);
-
-  const followUser = (pubkey: string) => {
-    try {
-      follow(pubkey);
-
-      // update state
-      setFollowed(true);
-    } catch (error) {
-      console.log(error);
-    }
-  };
-
-  const unfollowUser = (pubkey: string) => {
-    try {
-      unfollow(pubkey);
-
-      // update state
-      setFollowed(false);
-    } catch (error) {
-      console.log(error);
-    }
-  };
-
-  useEffect(() => {
-    if (status === 'success' && userFollows) {
-      if (userFollows.includes(pubkey)) {
-        setFollowed(true);
-      }
-    }
-  }, [status]);
-
-  return (
-    <div className="h-full w-full overflow-y-auto">
-      <div
-        data-tauri-drag-region
-        className="flex h-11 w-full items-center border-b border-zinc-900 px-3"
-      />
-      <div className="h-56 w-full bg-zinc-100">
-        <Image
-          src={user?.banner}
-          fallback="https://void.cat/d/QY1myro5tkHVs2nY7dy74b.jpg"
-          alt={'banner'}
-          className="h-full w-full object-cover"
-        />
-      </div>
-      <div className="-mt-7 w-full">
-        <div className="px-5">
-          <Image
-            src={user?.image}
-            fallback={DEFAULT_AVATAR}
-            alt={pubkey}
-            className="h-14 w-14 rounded-md ring-2 ring-black"
-          />
-          <div className="mt-2 flex flex-1 flex-col gap-4">
-            <div className="flex items-center gap-16">
-              <div className="inline-flex flex-col gap-1.5">
-                <h5 className="text-lg font-semibold leading-none">
-                  {user?.displayName || user?.name || 'No name'}
-                </h5>
-                <span className="max-w-[15rem] truncate text-sm leading-none text-zinc-500">
-                  {user?.nip05 || shortenKey(pubkey)}
-                </span>
-              </div>
-              <div className="inline-flex items-center gap-2">
-                {status === 'loading' ? (
-                  <button
-                    type="button"
-                    className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-fuchsia-500"
-                  >
-                    Loading...
-                  </button>
-                ) : followed ? (
-                  <button
-                    type="button"
-                    onClick={() => unfollowUser(pubkey)}
-                    className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-fuchsia-500"
-                  >
-                    Unfollow
-                  </button>
-                ) : (
-                  <button
-                    type="button"
-                    onClick={() => followUser(pubkey)}
-                    className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-fuchsia-500"
-                  >
-                    Follow
-                  </button>
-                )}
-                <Link
-                  to={`/app/chat/${pubkey}`}
-                  className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-fuchsia-500"
-                >
-                  Message
-                </Link>
-                <button
-                  type="button"
-                  className="group inline-flex h-10 w-10 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-orange-500"
-                >
-                  <ZapIcon className="h-5 w-5" />
-                </button>
-                <span className="mx-2 inline-flex h-4 w-px bg-zinc-900" />
-                {account && account.pubkey === pubkey && <EditProfileModal />}
-              </div>
-            </div>
-            <div className="flex flex-col gap-8">
-              <p className="mt-2 max-w-[500px] select-text break-words text-zinc-100">
-                {user?.about}
-              </p>
-              <UserMetadata pubkey={pubkey} />
-            </div>
-          </div>
-        </div>
-        <div className="mt-8 w-full border-t border-zinc-900">
-          <Tab.Group>
-            <Tab.List className="mb-2 px-5">
-              <Tab as={Fragment}>
-                {({ selected }) => (
-                  <button
-                    type="button"
-                    className={`${
-                      selected ? 'border-fuchsia-500' : 'border-transparent'
-                    } inline-flex h-16 items-start gap-2 border-t pt-4 font-medium`}
-                  >
-                    <ThreadsIcon className="h-3.5 w-3.5" />
-                    <div className="flex flex-col justify-start gap-0.5 text-start">
-                      <p className="text-sm font-medium leading-none text-zinc-200">
-                        Activities
-                      </p>
-                      <span className="text-sm leading-none text-zinc-500">
-                        48 hours ago
-                      </span>
-                    </div>
-                  </button>
-                )}
-              </Tab>
-            </Tab.List>
-            <Tab.Panels>
-              <Tab.Panel>
-                <UserFeed pubkey={pubkey} />
-              </Tab.Panel>
-            </Tab.Panels>
-          </Tab.Group>
-        </div>
-      </div>
-    </div>
-  );
-}

src/app/users/components/feed.tsx

@@ -0,0 +1,85 @@
+import { useQuery } from '@tanstack/react-query';
+import { useVirtualizer } from '@tanstack/react-virtual';
+import { useRef } from 'react';
+
+import { useNDK } from '@libs/ndk/provider';
+
+import { NoteKind_1, NoteSkeleton } from '@shared/notes';
+
+import { nHoursAgo } from '@utils/date';
+import { LumeEvent } from '@utils/types';
+
+export function UserFeed({ pubkey }: { pubkey: string }) {
+  const parentRef = useRef();
+
+  const { fetcher, relayUrls } = useNDK();
+  const { status, data } = useQuery(['user-feed', pubkey], async () => {
+    const events = await fetcher.fetchAllEvents(
+      relayUrls,
+      { kinds: [1], authors: [pubkey] },
+      { since: nHoursAgo(48) },
+      { sort: true }
+    );
+    return events as unknown as LumeEvent[];
+  });
+
+  const rowVirtualizer = useVirtualizer({
+    count: data ? data.length : 0,
+    getScrollElement: () => parentRef.current,
+    estimateSize: () => 400,
+  });
+
+  const itemsVirtualizer = rowVirtualizer.getVirtualItems();
+
+  return (
+    <div
+      ref={parentRef}
+      className="scrollbar-hide flex h-full w-full flex-col justify-between gap-1.5 overflow-y-auto pb-20 pt-1.5"
+      style={{ contain: 'strict' }}
+    >
+      {status === 'loading' ? (
+        <div className="px-3 py-1.5">
+          <div className="shadow-input rounded-md bg-zinc-900 px-3 py-3 shadow-black/20">
+            <NoteSkeleton />
+          </div>
+        </div>
+      ) : itemsVirtualizer.length === 0 ? (
+        <div className="px-3 py-1.5">
+          <div className="rounded-xl border-t border-zinc-800/50 bg-zinc-900 px-3 py-6">
+            <div className="flex flex-col items-center gap-4">
+              <p className="text-center text-sm text-zinc-300">
+                No new posts about this hashtag in 48 hours ago
+              </p>
+            </div>
+          </div>
+        </div>
+      ) : (
+        <div
+          className="relative w-full"
+          style={{
+            height: `${rowVirtualizer.getTotalSize()}px`,
+          }}
+        >
+          <div
+            className="absolute left-0 top-0 w-full"
+            style={{
+              transform: `translateY(${
+                itemsVirtualizer[0].start - rowVirtualizer.options.scrollMargin
+              }px)`,
+            }}
+          >
+            {itemsVirtualizer.map((virtualRow) => (
+              <div
+                key={virtualRow.key}
+                data-index={virtualRow.index}
+                ref={rowVirtualizer.measureElement}
+              >
+                <NoteKind_1 event={data[virtualRow.index]} />
+              </div>
+            ))}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}

src/app/users/components/metadata.tsx

@@ -19,13 +19,13 @@ export function UserMetadata({ pubkey }: { pubkey: string }) {
     <div className="flex w-full items-center gap-10">
       <div className="inline-flex flex-col gap-1">
         <span className="font-semibold leading-none text-zinc-100">
-          {data.stats[pubkey].followers_pubkey_count ?? 0}
+          {compactNumber.format(data.stats[pubkey].followers_pubkey_count) ?? 0}
         </span>
         <span className="text-sm leading-none text-zinc-400">Followers</span>
       </div>
       <div className="inline-flex flex-col gap-1">
         <span className="font-semibold leading-none text-zinc-100">
-          {data.stats[pubkey].pub_following_pubkey_count ?? 0}
+          {compactNumber.format(data.stats[pubkey].pub_following_pubkey_count) ?? 0}
         </span>
         <span className="text-sm leading-none text-zinc-400">Following</span>
       </div>

src/app/users/components/profile.tsx

@@ -0,0 +1,125 @@
+import { useEffect, useState } from 'react';
+import { Link } from 'react-router-dom';
+
+import { UserMetadata } from '@app/users/components/metadata';
+
+import { EditProfileModal } from '@shared/editProfileModal';
+import { Image } from '@shared/image';
+
+import { DEFAULT_AVATAR } from '@stores/constants';
+
+import { useAccount } from '@utils/hooks/useAccount';
+import { useProfile } from '@utils/hooks/useProfile';
+import { useSocial } from '@utils/hooks/useSocial';
+import { shortenKey } from '@utils/shortenKey';
+
+export function UserProfile({ pubkey }: { pubkey: string }) {
+  const { user } = useProfile(pubkey);
+  const { account } = useAccount();
+  const { status, userFollows, follow, unfollow } = useSocial();
+
+  const [followed, setFollowed] = useState(false);
+
+  const followUser = (pubkey: string) => {
+    try {
+      follow(pubkey);
+
+      // update state
+      setFollowed(true);
+    } catch (error) {
+      console.log(error);
+    }
+  };
+
+  const unfollowUser = (pubkey: string) => {
+    try {
+      unfollow(pubkey);
+
+      // update state
+      setFollowed(false);
+    } catch (error) {
+      console.log(error);
+    }
+  };
+
+  useEffect(() => {
+    if (status === 'success' && userFollows) {
+      if (userFollows.includes(pubkey)) {
+        setFollowed(true);
+      }
+    }
+  }, [status]);
+
+  return (
+    <>
+      <div className="h-56 w-full bg-zinc-100">
+        <Image
+          src={user?.banner}
+          fallback="https://void.cat/d/QY1myro5tkHVs2nY7dy74b.jpg"
+          alt={'banner'}
+          className="h-full w-full object-cover"
+        />
+      </div>
+      <div className="-mt-7 w-full px-5">
+        <Image
+          src={user?.picture || user?.image}
+          fallback={DEFAULT_AVATAR}
+          alt={pubkey}
+          className="h-14 w-14 rounded-md ring-2 ring-black"
+        />
+        <div className="mt-2 flex flex-1 flex-col gap-4">
+          <div className="flex items-center gap-16">
+            <div className="inline-flex flex-col gap-1.5">
+              <h5 className="text-lg font-semibold leading-none">
+                {user?.displayName || user?.name || 'No name'}
+              </h5>
+              <span className="max-w-[15rem] truncate text-sm leading-none text-zinc-500">
+                {user?.nip05 || shortenKey(pubkey)}
+              </span>
+            </div>
+            <div className="inline-flex items-center gap-2">
+              {status === 'loading' ? (
+                <button
+                  type="button"
+                  className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-fuchsia-500"
+                >
+                  Loading...
+                </button>
+              ) : followed ? (
+                <button
+                  type="button"
+                  onClick={() => unfollowUser(pubkey)}
+                  className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-fuchsia-500"
+                >
+                  Unfollow
+                </button>
+              ) : (
+                <button
+                  type="button"
+                  onClick={() => followUser(pubkey)}
+                  className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-fuchsia-500"
+                >
+                  Follow
+                </button>
+              )}
+              <Link
+                to={`/app/chats/${pubkey}`}
+                className="inline-flex h-10 w-36 items-center justify-center rounded-md bg-zinc-900 text-sm font-medium hover:bg-fuchsia-500"
+              >
+                Message
+              </Link>
+              <span className="mx-2 inline-flex h-4 w-px bg-zinc-900" />
+              {account && account.pubkey === pubkey && <EditProfileModal />}
+            </div>
+          </div>
+          <div className="flex flex-col gap-8">
+            <p className="mt-2 max-w-[500px] select-text break-words text-zinc-100">
+              {user?.about || user?.bio}
+            </p>
+            <UserMetadata pubkey={pubkey} />
+          </div>
+        </div>
+      </div>
+    </>
+  );
+}

src/app/users/index.tsx

@@ -0,0 +1,99 @@
+import { useQuery } from '@tanstack/react-query';
+import { useVirtualizer } from '@tanstack/react-virtual';
+import { useRef } from 'react';
+import { useParams } from 'react-router-dom';
+
+import { useNDK } from '@libs/ndk/provider';
+
+import { NoteKind_1, NoteSkeleton } from '@shared/notes';
+
+import { nHoursAgo } from '@utils/date';
+import { LumeEvent } from '@utils/types';
+
+import { UserProfile } from './components/profile';
+
+export function UserScreen() {
+  const parentRef = useRef();
+
+  const { pubkey } = useParams();
+  const { fetcher, relayUrls } = useNDK();
+  const { status, data } = useQuery(['user-feed', pubkey], async () => {
+    const events = await fetcher.fetchAllEvents(
+      relayUrls,
+      { kinds: [1], authors: [pubkey] },
+      { since: nHoursAgo(48) },
+      { sort: true }
+    );
+    return events as unknown as LumeEvent[];
+  });
+
+  const rowVirtualizer = useVirtualizer({
+    count: data ? data.length : 0,
+    getScrollElement: () => parentRef.current,
+    estimateSize: () => 400,
+  });
+
+  const itemsVirtualizer = rowVirtualizer.getVirtualItems();
+
+  return (
+    <div ref={parentRef} className="scrollbar-hide h-full w-full overflow-y-auto">
+      <div
+        data-tauri-drag-region
+        className="flex h-11 w-full items-center border-b border-zinc-900 px-3"
+      />
+      <UserProfile pubkey={pubkey} />
+      <div className="mt-8 h-full w-full border-t border-zinc-900">
+        <div className="flex flex-col justify-start gap-1 px-3 pt-4 text-start">
+          <p className="text-lg font-semibold leading-none text-zinc-200">Latest posts</p>
+          <span className="text-sm leading-none text-zinc-500">48 hours ago</span>
+        </div>
+        <div className="flex h-full max-w-[400px] flex-col justify-between gap-1.5 pb-4 pt-1.5">
+          {status === 'loading' ? (
+            <div className="px-3 py-1.5">
+              <div className="shadow-input rounded-md bg-zinc-900 px-3 py-3 shadow-black/20">
+                <NoteSkeleton />
+              </div>
+            </div>
+          ) : itemsVirtualizer.length === 0 ? (
+            <div className="px-3 py-1.5">
+              <div className="rounded-xl border-t border-zinc-800/50 bg-zinc-900 px-3 py-6">
+                <div className="flex flex-col items-center gap-4">
+                  <p className="text-center text-sm text-zinc-300">
+                    No new posts about this hashtag in 48 hours ago
+                  </p>
+                </div>
+              </div>
+            </div>
+          ) : (
+            <div
+              className="relative w-full"
+              style={{
+                height: `${rowVirtualizer.getTotalSize()}px`,
+              }}
+            >
+              <div
+                className="absolute left-0 top-0 w-full"
+                style={{
+                  transform: `translateY(${
+                    itemsVirtualizer[0].start - rowVirtualizer.options.scrollMargin
+                  }px)`,
+                }}
+              >
+                {itemsVirtualizer.map((virtualRow) => (
+                  <div
+                    key={virtualRow.key}
+                    data-index={virtualRow.index}
+                    ref={rowVirtualizer.measureElement}
+                  >
+                    <NoteKind_1 event={data[virtualRow.index]} />
+                  </div>
+                ))}
+                <div className="h-10" />
+              </div>
+            </div>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}

src/index.css

@@ -15,7 +15,23 @@ button {
 }
 
 .markdown {
-  @apply prose prose-zinc max-w-none select-text break-words dark:prose-invert prose-p:mb-2 prose-p:mt-0 prose-p:leading-tight prose-p:last:mb-0 prose-a:font-normal prose-a:leading-tight prose-a:text-fuchsia-500 hover:prose-a:text-fuchsia-600 prose-blockquote:m-0 prose-ol:m-0 prose-ol:mb-1 prose-ul:mb-1 prose-li:leading-tight prose-hr:mx-0 prose-hr:my-2;
+  @apply prose prose-zinc max-w-none select-text hyphens-auto dark:prose-invert prose-p:mb-2 prose-p:mt-0 prose-p:break-words prose-p:[word-break:break-word] prose-p:last:mb-0 prose-a:break-words prose-a:break-all prose-a:font-normal prose-a:leading-tight prose-a:text-fuchsia-400 prose-a:after:content-['_↗'] hover:prose-a:text-fuchsia-500 prose-blockquote:m-0 prose-pre:whitespace-pre-wrap prose-pre:break-words prose-pre:break-all prose-ol:m-0 prose-ol:mb-1 prose-ul:mb-1 prose-li:leading-tight prose-img:mb-2 prose-img:mt-3 prose-hr:mx-0 prose-hr:my-2;
+}
+
+.ProseMirror p.is-empty::before {
+  @apply text-zinc-500;
+  content: attr(data-placeholder);
+  float: left;
+  height: 0;
+  pointer-events: none;
+}
+
+.ProseMirror img.ProseMirror-selectednode {
+  @apply outline-fuchsia-500;
+}
+
+iframe {
+  height: auto !important;
 }
 
 /* For Webkit-based browsers (Chrome, Safari and Opera) */

src/libs/ndk.tsx

@@ -1,79 +0,0 @@
-import NDK, {
-  NDKConstructorParams,
-  NDKEvent,
-  NDKFilter,
-  NDKKind,
-  NDKPrivateKeySigner,
-} from '@nostr-dev-kit/ndk';
-import { useContext } from 'react';
-
-import { RelayContext } from '@shared/relayProvider';
-
-import { FULL_RELAYS } from '@stores/constants';
-
-import { useAccount } from '@utils/hooks/useAccount';
-
-export async function initNDK(relays?: string[]): Promise<NDK> {
-  const opts: NDKConstructorParams = {};
-  const defaultRelays = new Set(relays || FULL_RELAYS);
-
-  opts.explicitRelayUrls = [...defaultRelays];
-
-  const ndk = new NDK(opts);
-  await ndk.connect(500);
-
-  return ndk;
-}
-
-export async function prefetchEvents(
-  ndk: NDK,
-  filter: NDKFilter
-): Promise<Set<NDKEvent>> {
-  return new Promise((resolve) => {
-    const events: Map<string, NDKEvent> = new Map();
-
-    const relaySetSubscription = ndk.subscribe(filter, {
-      closeOnEose: true,
-    });
-
-    relaySetSubscription.on('event', (event: NDKEvent) => {
-      event.ndk = ndk;
-      events.set(event.tagId(), event);
-    });
-
-    relaySetSubscription.on('eose', () => {
-      setTimeout(() => resolve(new Set(events.values())), 3000);
-    });
-  });
-}
-
-export function usePublish() {
-  const ndk = useContext(RelayContext);
-  const { account } = useAccount();
-
-  const publish = async ({
-    content,
-    kind,
-    tags,
-  }: {
-    content: string;
-    kind: NDKKind;
-    tags: string[][];
-  }): Promise<NDKEvent> => {
-    const event = new NDKEvent(ndk);
-    const signer = new NDKPrivateKeySigner(account.privkey);
-
-    event.content = content;
-    event.kind = kind;
-    event.created_at = Math.floor(Date.now() / 1000);
-    event.pubkey = account.pubkey;
-    event.tags = tags;
-
-    await event.sign(signer);
-    await event.publish();
-
-    return event;
-  };
-
-  return publish;
-}

src/libs/ndk/instance.ts

@@ -0,0 +1,41 @@
+// source: https://github.com/nostr-dev-kit/ndk-react/
+import NDK from '@nostr-dev-kit/ndk';
+import { ndkAdapter } from '@nostr-fetch/adapter-ndk';
+import { NostrFetcher, normalizeRelayUrlSet } from 'nostr-fetch';
+import { useEffect, useState } from 'react';
+
+import { getSetting } from '@libs/storage';
+
+const setting = await getSetting('relays');
+const relays = normalizeRelayUrlSet(JSON.parse(setting));
+
+export const NDKInstance = () => {
+  const [ndk, setNDK] = useState<NDK | undefined>(undefined);
+  const [relayUrls, setRelayUrls] = useState<string[]>(relays);
+  const [fetcher, setFetcher] = useState<NostrFetcher>(undefined);
+
+  useEffect(() => {
+    loadNdk(relays);
+  }, []);
+
+  async function loadNdk(explicitRelayUrls: string[]) {
+    const ndkInstance = new NDK({ explicitRelayUrls });
+
+    try {
+      await ndkInstance.connect();
+    } catch (error) {
+      console.error('ERROR loading NDK NDKInstance', error);
+    }
+
+    setNDK(ndkInstance);
+    setRelayUrls(explicitRelayUrls);
+    setFetcher(NostrFetcher.withCustomPool(ndkAdapter(ndkInstance)));
+  }
+
+  return {
+    ndk,
+    relayUrls,
+    fetcher,
+    loadNdk,
+  };
+};

src/libs/ndk/provider.tsx

@@ -0,0 +1,48 @@
+// source: https://github.com/nostr-dev-kit/ndk-react/
+import NDK from '@nostr-dev-kit/ndk';
+import { NostrFetcher } from 'nostr-fetch';
+import { PropsWithChildren, createContext, useContext } from 'react';
+
+import { NDKInstance } from '@libs/ndk/instance';
+
+interface NDKContext {
+  ndk: NDK;
+  relayUrls: string[];
+  fetcher: NostrFetcher;
+  loadNdk: (_: string[]) => void;
+}
+
+const NDKContext = createContext<NDKContext>({
+  ndk: new NDK({}),
+  relayUrls: [],
+  fetcher: undefined,
+  loadNdk: undefined,
+});
+
+const NDKProvider = ({ children }: PropsWithChildren<object>) => {
+  const { ndk, relayUrls, fetcher, loadNdk } = NDKInstance();
+
+  if (ndk)
+    return (
+      <NDKContext.Provider
+        value={{
+          ndk,
+          relayUrls,
+          fetcher,
+          loadNdk,
+        }}
+      >
+        {children}
+      </NDKContext.Provider>
+    );
+};
+
+const useNDK = () => {
+  const context = useContext(NDKContext);
+  if (context === undefined) {
+    throw new Error('import NDKProvider to use useNDK');
+  }
+  return context;
+};
+
+export { NDKProvider, useNDK };

src/libs/storage.tsx

@@ -1,7 +1,9 @@
-import { NDKUserProfile } from '@nostr-dev-kit/ndk';
+import destr from 'destr';
 import Database from 'tauri-plugin-sql-api';
 
+import { parser } from '@utils/parser';
 import { getParentID } from '@utils/transform';
+import { Account, Block, Chats, LumeEvent, Profile, Settings } from '@utils/types';
 
 let db: null | Database = null;
 
@@ -18,7 +20,9 @@ export async function connect(): Promise<Database> {
 // get active account
 export async function getActiveAccount() {
   const db = await connect();
-  const result: any = await db.select('SELECT * FROM accounts WHERE is_active = 1;');
+  const result: Array<Account> = await db.select(
+    'SELECT * FROM accounts WHERE is_active = 1;'
+  );
   if (result.length > 0) {
     return result[0];
   } else {
@@ -29,29 +33,29 @@ export async function getActiveAccount() {
 // get all accounts
 export async function getAccounts() {
   const db = await connect();
-  return await db.select(
+  const result: Array<Account> = await db.select(
     'SELECT * FROM accounts WHERE is_active = 0 ORDER BY created_at DESC;'
   );
+  return result;
 }
 
 // create account
 export async function createAccount(
   npub: string,
   pubkey: string,
-  privkey: string,
   follows?: string[][],
   is_active?: number
 ) {
   const db = await connect();
   const res = await db.execute(
     'INSERT OR IGNORE INTO accounts (npub, pubkey, privkey, follows, is_active) VALUES (?, ?, ?, ?, ?);',
-    [npub, pubkey, privkey, follows || '', is_active || 0]
+    [npub, pubkey, 'privkey is stored in secure storage', follows || '', is_active || 0]
   );
   if (res) {
     await createBlock(
       0,
-      'Preserve your freedom',
-      'https://void.cat/d/949GNg7ZjSLHm2eTR3jZqv'
+      'Have fun together!',
+      'https://void.cat/d/N5KUHEQCVg7SywXUPiJ7yq.jpg'
     );
   }
   const getAccount = await getActiveAccount();
@@ -81,7 +85,7 @@ export async function countTotalChannels() {
 // count total notes
 export async function countTotalNotes() {
   const db = await connect();
-  const result = await db.select(
+  const result: Array<{ total: string }> = await db.select(
     'SELECT COUNT(*) AS "total" FROM notes WHERE kind IN (1, 6);'
   );
   return parseInt(result[0].total);
@@ -93,11 +97,19 @@ export async function getNotes(limit: number, offset: number) {
   const totalNotes = await countTotalNotes();
   const nextCursor = offset + limit;
 
-  const notes: any = { data: null, nextCursor: 0 };
-  const query: any = await db.select(
+  const notes: { data: LumeEvent[] | null; nextCursor: number } = {
+    data: null,
+    nextCursor: 0,
+  };
+
+  const query: LumeEvent[] = await db.select(
     `SELECT * FROM notes WHERE kind IN (1, 6, 1063) GROUP BY parent_id ORDER BY created_at DESC LIMIT "${limit}" OFFSET "${offset}";`
   );
 
+  query.forEach(
+    (el) => (el.tags = typeof el.tags === 'string' ? destr(el.tags) : el.tags)
+  );
+
   notes['data'] = query;
   notes['nextCursor'] = Math.round(totalNotes / nextCursor) > 1 ? nextCursor : undefined;
 
@@ -107,11 +119,16 @@ export async function getNotes(limit: number, offset: number) {
 // get all notes by pubkey
 export async function getNotesByPubkey(pubkey: string) {
   const db = await connect();
-  const res: any = await db.select(
+
+  const query: LumeEvent[] = await db.select(
     `SELECT * FROM notes WHERE pubkey == "${pubkey}" AND kind IN (1, 6, 1063) GROUP BY parent_id ORDER BY created_at DESC;`
   );
 
-  return res;
+  query.forEach(
+    (el) => (el.tags = typeof el.tags === 'string' ? destr(el.tags) : el.tags)
+  );
+
+  return query;
 }
 
 // get all notes by authors
@@ -122,11 +139,19 @@ export async function getNotesByAuthors(authors: string, limit: number, offset:
   const array = JSON.parse(authors);
   const finalArray = `'${array.join("','")}'`;
 
-  const notes: any = { data: null, nextCursor: 0 };
-  const query: any = await db.select(
+  const notes: { data: LumeEvent[] | null; nextCursor: number } = {
+    data: null,
+    nextCursor: 0,
+  };
+
+  const query: LumeEvent[] = await db.select(
     `SELECT * FROM notes WHERE pubkey IN (${finalArray}) AND kind IN (1, 6, 1063) GROUP BY parent_id ORDER BY created_at DESC LIMIT "${limit}" OFFSET "${offset}";`
   );
 
+  query.forEach(
+    (el) => (el.tags = typeof el.tags === 'string' ? destr(el.tags) : el.tags)
+  );
+
   notes['data'] = query;
   notes['nextCursor'] = Math.round(totalNotes / nextCursor) > 1 ? nextCursor : undefined;
 
@@ -136,8 +161,15 @@ export async function getNotesByAuthors(authors: string, limit: number, offset:
 // get note by id
 export async function getNoteByID(event_id: string) {
   const db = await connect();
-  const result = await db.select(`SELECT * FROM notes WHERE event_id = "${event_id}";`);
-  return result[0];
+  const result: LumeEvent[] = await db.select(
+    `SELECT * FROM notes WHERE event_id = "${event_id}";`
+  );
+  if (result[0]) {
+    if (result[0].kind === 1) result[0]['content'] = parser(result[0]);
+    return result[0];
+  } else {
+    return null;
+  }
 }
 
 // create note
@@ -145,7 +177,7 @@ export async function createNote(
   event_id: string,
   pubkey: string,
   kind: number,
-  tags: any,
+  tags: string[][],
   content: string,
   created_at: number
 ) {
@@ -162,7 +194,7 @@ export async function createNote(
 // get note replies
 export async function getReplies(parent_id: string) {
   const db = await connect();
-  const result: any = await db.select(
+  const result: Array<LumeEvent> = await db.select(
     `SELECT * FROM replies WHERE parent_id = "${parent_id}" ORDER BY created_at DESC;`
   );
   return result;
@@ -174,7 +206,7 @@ export async function createReplyNote(
   event_id: string,
   pubkey: string,
   kind: number,
-  tags: any,
+  tags: string[][],
   content: string,
   created_at: number
 ) {
@@ -273,11 +305,32 @@ export async function getChannelUsers(channel_id: string) {
 export async function getChats() {
   const db = await connect();
   const account = await getActiveAccount();
-  const result: any = await db.select(
+  const follows =
+    typeof account.follows === 'string' ? JSON.parse(account.follows) : account.follows;
+
+  const chats: { follows: Array<Chats> | null; unknowns: Array<Chats> | null } = {
+    follows: [],
+    unknowns: [],
+  };
+
+  let result: Array<Chats> = await db.select(
     `SELECT DISTINCT sender_pubkey FROM chats WHERE receiver_pubkey = "${account.pubkey}" ORDER BY created_at DESC;`
   );
-  const newArr: any = result.map((v) => ({ ...v, new_messages: 0 }));
-  return newArr;
+
+  result = result.map((v) => ({ ...v, new_messages: 0 }));
+  result = result.sort((a, b) => a.new_messages - b.new_messages);
+
+  chats.follows = result.filter((el) => {
+    return follows.some((i) => {
+      return i === el.sender_pubkey;
+    });
+  });
+
+  chats.unknowns = result.filter(
+    (el) => !chats.follows.includes(el) && el.sender_pubkey !== account.pubkey
+  );
+
+  return chats;
 }
 
 // get chat messages
@@ -285,7 +338,7 @@ export async function getChatMessages(receiver_pubkey: string, sender_pubkey: st
   const db = await connect();
   let receiver = [];
 
-  const sender: any = await db.select(
+  const sender: Array<Chats> = await db.select(
     `SELECT * FROM chats WHERE sender_pubkey = "${sender_pubkey}" AND receiver_pubkey = "${receiver_pubkey}";`
   );
 
@@ -322,7 +375,9 @@ export async function createChat(
 // get setting
 export async function getSetting(key: string) {
   const db = await connect();
-  const result = await db.select(`SELECT value FROM settings WHERE key = "${key}";`);
+  const result: Array<Settings> = await db.select(
+    `SELECT value FROM settings WHERE key = "${key}";`
+  );
   return result[0]?.value;
 }
 
@@ -335,7 +390,9 @@ export async function updateSetting(key: string, value: string | number) {
 // get last login
 export async function getLastLogin() {
   const db = await connect();
-  const result = await db.select(`SELECT value FROM settings WHERE key = "last_login";`);
+  const result: Array<Settings> = await db.select(
+    `SELECT value FROM settings WHERE key = "last_login";`
+  );
   if (result[0]) {
     return parseInt(result[0].value);
   } else {
@@ -351,56 +408,22 @@ export async function updateLastLogin(value: number) {
   );
 }
 
-// get blacklist by kind and account id
-export async function getBlacklist(account_id: number, kind: number) {
-  const db = await connect();
-  return await db.select(
-    `SELECT * FROM blacklist WHERE account_id = "${account_id}" AND kind = "${kind}";`
-  );
-}
-
-// get active blacklist by kind and account id
-export async function getActiveBlacklist(account_id: number, kind: number) {
-  const db = await connect();
-  return await db.select(
-    `SELECT content FROM blacklist WHERE account_id = "${account_id}" AND kind = "${kind}" AND status = 1;`
-  );
-}
-
-// add to blacklist
-export async function addToBlacklist(
-  account_id: number,
-  content: string,
-  kind: number,
-  status?: number
-) {
-  const db = await connect();
-  return await db.execute(
-    'INSERT OR IGNORE INTO blacklist (account_id, content, kind, status) VALUES (?, ?, ?, ?);',
-    [account_id, content, kind, status || 1]
-  );
-}
-
-// update item in blacklist
-export async function updateItemInBlacklist(content: string, status: number) {
-  const db = await connect();
-  return await db.execute(
-    `UPDATE blacklist SET status = "${status}" WHERE content = "${content}";`
-  );
-}
-
 // get all blocks
 export async function getBlocks() {
   const db = await connect();
-  const activeAccount = await getActiveAccount();
-  const result: any = await db.select(
-    `SELECT * FROM blocks WHERE account_id = "${activeAccount.id}" ORDER BY created_at DESC;`
+  const account = await getActiveAccount();
+  const result: Array<Block> = await db.select(
+    `SELECT * FROM blocks WHERE account_id = "${account.id}" ORDER BY created_at DESC;`
   );
   return result;
 }
 
 // create block
-export async function createBlock(kind: number, title: string, content: any) {
+export async function createBlock(
+  kind: number,
+  title: string,
+  content: string | string[]
+) {
   const db = await connect();
   const activeAccount = await getActiveAccount();
   return await db.execute(
@@ -438,13 +461,39 @@ export async function createMetadata(id: string, pubkey: string, content: string
   );
 }
 
-// get metadata
+export async function getAllMetadata() {
+  const db = await connect();
+  const result: LumeEvent[] = await db.select(`SELECT * FROM metadata;`);
+  const users: Profile[] = result.map((el) => {
+    const profile: Profile = destr(el.content);
+    return {
+      pubkey: el.pubkey,
+      ident: profile.name || profile.display_name || profile.username || 'anon',
+      picture:
+        profile.picture ||
+        profile.image ||
+        'https://void.cat/d/5VKmKyuHyxrNMf9bWSVPih.jpg',
+    };
+  });
+  return users;
+}
+
+// get user metadata
 export async function getUserMetadata(pubkey: string) {
   const db = await connect();
-  const result = await db.select(`SELECT content FROM metadata WHERE id = "${pubkey}";`);
+  const result = await db.select(`SELECT * FROM metadata WHERE pubkey = "${pubkey}";`);
   if (result[0]) {
-    return JSON.parse(result[0].content);
+    return { ...result[0], ...JSON.parse(result[0].content) } as Profile;
   } else {
     return null;
   }
 }
+
+// delete privkey
+export async function removePrivkey() {
+  const db = await connect();
+  const activeAccount = await getActiveAccount();
+  return await db.execute(
+    `UPDATE accounts SET privkey = "privkey is stored in secure storage" WHERE id = "${activeAccount.id}";`
+  );
+}

src/main.tsx

@@ -1,11 +1,9 @@
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
 import { createRoot } from 'react-dom/client';
 
+import { NDKProvider } from '@libs/ndk/provider';
 import { getSetting } from '@libs/storage';
 
-import { RelayProvider } from '@shared/relayProvider';
-
 import App from './app';
 
 const cacheTime = await getSetting('cache_time');
@@ -23,9 +21,8 @@ const root = createRoot(container);
 
 root.render(
   <QueryClientProvider client={queryClient}>
-    <RelayProvider>
+    <NDKProvider>
       <App />
-    </RelayProvider>
-    <ReactQueryDevtools initialIsOpen={false} position="top-right" />
+    </NDKProvider>
   </QueryClientProvider>
 );

src/shared/accounts/active.tsx

@@ -1,13 +1,13 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { produce } from 'immer';
-import { useContext, useEffect } from 'react';
+import { useEffect } from 'react';
 import { Link } from 'react-router-dom';
 
+import { useNDK } from '@libs/ndk/provider';
 import { createChat, getLastLogin } from '@libs/storage';
 
 import { Image } from '@shared/image';
 import { NetworkStatusIndicator } from '@shared/networkStatusIndicator';
-import { RelayContext } from '@shared/relayProvider';
 
 import { DEFAULT_AVATAR } from '@stores/constants';
 
@@ -17,9 +17,9 @@ import { sendNativeNotification } from '@utils/notification';
 const lastLogin = await getLastLogin();
 
 export function ActiveAccount({ data }: { data: any }) {
-  const ndk = useContext(RelayContext);
   const queryClient = useQueryClient();
 
+  const { ndk } = useNDK();
   const { status, user } = useProfile(data.pubkey);
 
   const chat = useMutation({
@@ -92,9 +92,9 @@ export function ActiveAccount({ data }: { data: any }) {
   }
 
   return (
-    <Link to={`/app/user/${data.pubkey}`} className="relative inline-block h-9 w-9">
+    <Link to={`/app/users/${data.pubkey}`} className="relative inline-block h-9 w-9">
       <Image
-        src={user.image}
+        src={user?.picture || user?.image}
         fallback={DEFAULT_AVATAR}
         alt={data.npub}
         className="h-9 w-9 rounded-md object-cover"

src/shared/avatarUploader.tsx

@@ -1,54 +1,18 @@
-import { open } from '@tauri-apps/api/dialog';
-import { Body, fetch } from '@tauri-apps/api/http';
 import { useState } from 'react';
 
 import { LoaderIcon, PlusIcon } from '@shared/icons';
 
-import { createBlobFromFile } from '@utils/createBlobFromFile';
+import { useImageUploader } from '@utils/hooks/useUploader';
 
 export function AvatarUploader({ setPicture }: { setPicture: any }) {
+  const upload = useImageUploader();
   const [loading, setLoading] = useState(false);
 
-  const openFileDialog = async () => {
-    const selected: any = await open({
-      multiple: false,
-      filters: [
-        {
-          name: 'Image',
-          extensions: ['png', 'jpeg', 'jpg', 'gif'],
-        },
-      ],
-    });
-    if (Array.isArray(selected)) {
-      // user selected multiple files
-    } else if (selected === null) {
-      // user cancelled the selection
-    } else {
-      setLoading(true);
-
-      const filename = selected.split('/').pop();
-      const file = await createBlobFromFile(selected);
-      const buf = await file.arrayBuffer();
-
-      const res: { data: { file: { id: string } } } = await fetch(
-        'https://void.cat/upload?cli=false',
-        {
-          method: 'POST',
-          timeout: 5,
-          headers: {
-            accept: '*/*',
-            'Content-Type': 'application/octet-stream',
-            'V-Filename': filename,
-            'V-Description': 'Upload from https://lume.nu',
-            'V-Strip-Metadata': 'true',
-          },
-          body: Body.bytes(buf),
-        }
-      );
-      const image = `https://void.cat/d/${res.data.file.id}.jpg`;
-
+  const uploadAvatar = async () => {
+    const image = await upload(null);
+    if (image.url) {
       // update parent state
-      setPicture(image);
+      setPicture(image.url);
 
       // disable loader
       setLoading(false);
@@ -58,7 +22,7 @@ export function AvatarUploader({ setPicture }: { setPicture: any }) {
   return (
     <button
       type="button"
-      onClick={() => openFileDialog()}
+      onClick={() => uploadAvatar()}
       className="inline-flex h-full w-full items-center justify-center bg-zinc-900/40"
     >
       {loading ? (

src/shared/bannerUploader.tsx

@@ -1,52 +1,16 @@
-import { open } from '@tauri-apps/api/dialog';
-import { Body, fetch } from '@tauri-apps/api/http';
 import { useState } from 'react';
 
 import { LoaderIcon, PlusIcon } from '@shared/icons';
 
-import { createBlobFromFile } from '@utils/createBlobFromFile';
+import { useImageUploader } from '@utils/hooks/useUploader';
 
 export function BannerUploader({ setBanner }: { setBanner: any }) {
+  const upload = useImageUploader();
   const [loading, setLoading] = useState(false);
 
-  const openFileDialog = async () => {
-    const selected: any = await open({
-      multiple: false,
-      filters: [
-        {
-          name: 'Image',
-          extensions: ['png', 'jpeg', 'jpg', 'gif'],
-        },
-      ],
-    });
-    if (Array.isArray(selected)) {
-      // user selected multiple files
-    } else if (selected === null) {
-      // user cancelled the selection
-    } else {
-      setLoading(true);
-
-      const filename = selected.split('/').pop();
-      const file = await createBlobFromFile(selected);
-      const buf = await file.arrayBuffer();
-
-      const res: { data: { file: { id: string } } } = await fetch(
-        'https://void.cat/upload?cli=false',
-        {
-          method: 'POST',
-          timeout: 5,
-          headers: {
-            accept: '*/*',
-            'Content-Type': 'application/octet-stream',
-            'V-Filename': filename,
-            'V-Description': 'Upload from https://lume.nu',
-            'V-Strip-Metadata': 'true',
-          },
-          body: Body.bytes(buf),
-        }
-      );
-      const image = `https://void.cat/d/${res.data.file.id}.jpg`;
-
+  const uploadBanner = async () => {
+    const image = await upload(null);
+    if (image.url) {
       // update parent state
       setBanner(image);
 
@@ -58,7 +22,7 @@ export function BannerUploader({ setBanner }: { setBanner: any }) {
   return (
     <button
       type="button"
-      onClick={() => openFileDialog()}
+      onClick={() => uploadBanner()}
       className="inline-flex h-full w-full items-center justify-center bg-zinc-900/40"
     >
       {loading ? (

src/shared/button.tsx

@@ -7,7 +7,7 @@ export function Button({
   disabled = false,
   onClick = undefined,
 }: {
-  preset: 'small' | 'publish' | 'large';
+  preset: 'small' | 'publish' | 'large' | 'large-alt';
   children: ReactNode;
   disabled?: boolean;
   onClick?: () => void;
@@ -26,6 +26,10 @@ export function Button({
       preClass =
         'h-11 w-full bg-fuchsia-500 rounded-md font-medium text-zinc-100 hover:bg-fuchsia-600';
       break;
+    case 'large-alt':
+      preClass =
+        'h-11 w-full bg-zinc-800 rounded-md font-medium text-zinc-300 border-t border-zinc-700/50 hover:bg-zinc-900';
+      break;
     default:
       break;
   }

src/shared/composer/composer.tsx

@@ -0,0 +1,176 @@
+import Image from '@tiptap/extension-image';
+import Mention from '@tiptap/extension-mention';
+import Placeholder from '@tiptap/extension-placeholder';
+import { EditorContent, useEditor } from '@tiptap/react';
+import StarterKit from '@tiptap/starter-kit';
+import { convert } from 'html-to-text';
+import { nip19 } from 'nostr-tools';
+import { useState } from 'react';
+import { twMerge } from 'tailwind-merge';
+
+import { Button } from '@shared/button';
+import { Suggestion } from '@shared/composer';
+import { CancelIcon, LoaderIcon, PlusCircleIcon } from '@shared/icons';
+import { MentionNote } from '@shared/notes';
+
+import { useComposer } from '@stores/composer';
+import { FULL_RELAYS } from '@stores/constants';
+
+import { usePublish } from '@utils/hooks/usePublish';
+import { useImageUploader } from '@utils/hooks/useUploader';
+import { sendNativeNotification } from '@utils/notification';
+
+export function Composer() {
+  const { publish } = usePublish();
+
+  const [status, setStatus] = useState<null | 'loading' | 'done'>(null);
+  const [reply, clearReply] = useComposer((state) => [state.reply, state.clearReply]);
+
+  const upload = useImageUploader();
+
+  const editor = useEditor({
+    extensions: [
+      StarterKit.configure({
+        dropcursor: {
+          color: '#fff',
+        },
+      }),
+      Placeholder.configure({ placeholder: 'Type something...' }),
+      Mention.configure({
+        suggestion: Suggestion,
+        renderLabel({ node }) {
+          return `nostr:${nip19.npubEncode(node.attrs.id.pubkey)} `;
+        },
+      }),
+      Image.configure({
+        HTMLAttributes: {
+          class:
+            'rounded-lg w-2/3 h-auto border border-zinc-800 outline outline-2 outline-offset-0 outline-zinc-700 ml-1',
+        },
+      }),
+    ],
+    content: '',
+    editorProps: {
+      attributes: {
+        class: twMerge(
+          'scrollbar-hide markdown break-all max-h-[500px] overflow-y-auto outline-none pr-2',
+          `${reply.id ? '!min-h-42' : '!min-h-[100px]'}`
+        ),
+      },
+    },
+  });
+
+  const uploadImage = async (file?: string) => {
+    const image = await upload(file);
+    if (image.url) {
+      editor.commands.setImage({ src: image.url });
+      editor.commands.createParagraphNear();
+    }
+  };
+
+  const submit = async () => {
+    setStatus('loading');
+
+    try {
+      // get plaintext content
+      const html = editor.getHTML();
+      const serializedContent = convert(html, {
+        selectors: [
+          { selector: 'a', options: { linkBrackets: false } },
+          { selector: 'img', options: { linkBrackets: false } },
+        ],
+      });
+
+      // define tags
+      let tags: string[][] = [];
+
+      // add reply to tags if present
+      if (reply.id && reply.pubkey) {
+        if (reply.root && reply.root.length > 1) {
+          tags = [
+            ['e', reply.root, FULL_RELAYS[0], 'root'],
+            ['e', reply.id, FULL_RELAYS[0], 'reply'],
+            ['p', reply.pubkey],
+          ];
+        } else {
+          tags = [
+            ['e', reply.id, FULL_RELAYS[0], 'reply'],
+            ['p', reply.pubkey],
+          ];
+        }
+      }
+
+      // add hashtag to tags if present
+      const hashtags = serializedContent
+        .split(/\s/gm)
+        .filter((s: string) => s.startsWith('#'));
+      hashtags?.forEach((tag: string) => {
+        tags.push(['t', tag.replace('#', '')]);
+      });
+
+      // publish message
+      await publish({ content: serializedContent, kind: 1, tags });
+
+      // send native notifiation
+      await sendNativeNotification('Publish post successfully');
+
+      // update state
+      setStatus('done');
+      // reset editor
+      editor.commands.clearContent();
+      if (reply.id) {
+        clearReply();
+      }
+    } catch {
+      setStatus(null);
+      console.log('failed to publish');
+    }
+  };
+
+  return (
+    <div className="flex h-full flex-col px-4 pb-4">
+      <div className="flex h-full w-full gap-3">
+        <div className="flex w-8 shrink-0 items-center justify-center">
+          <div className="h-full w-[2px] bg-zinc-800" />
+        </div>
+        <div className="w-full">
+          <EditorContent
+            editor={editor}
+            spellCheck="false"
+            autoComplete="off"
+            autoCorrect="off"
+            autoCapitalize="off"
+          />
+          {reply.id && (
+            <div className="relative">
+              <MentionNote id={reply.id} />
+              <button
+                type="button"
+                onClick={() => clearReply()}
+                className="absolute right-3 top-3 inline-flex h-6 w-6 items-center justify-center gap-2 rounded bg-zinc-800 px-2 hover:bg-zinc-700"
+              >
+                <CancelIcon className="h-4 w-4 text-zinc-100" />
+              </button>
+            </div>
+          )}
+        </div>
+      </div>
+      <div className="mt-4 flex items-center justify-between">
+        <button
+          type="button"
+          onClick={() => uploadImage()}
+          className="inline-flex h-8 w-8 items-center justify-center rounded-md hover:bg-zinc-800"
+        >
+          <PlusCircleIcon className="h-5 w-5 text-zinc-500" />
+        </button>
+        <Button onClick={() => submit()} preset="publish">
+          {status === 'loading' ? (
+            <LoaderIcon className="h-4 w-4 animate-spin text-zinc-100" />
+          ) : (
+            'Publish'
+          )}
+        </Button>
+      </div>
+    </div>
+  );
+}

src/shared/composer/imageUploader.tsx

@@ -1,134 +0,0 @@
-import { open } from '@tauri-apps/api/dialog';
-import { listen } from '@tauri-apps/api/event';
-import { Body, fetch } from '@tauri-apps/api/http';
-import { useCallback, useEffect, useState } from 'react';
-import { Transforms } from 'slate';
-import { useSlateStatic } from 'slate-react';
-
-import { PlusCircleIcon } from '@shared/icons';
-
-import { createBlobFromFile } from '@utils/createBlobFromFile';
-
-export function ImageUploader() {
-  const editor = useSlateStatic();
-  const [loading, setLoading] = useState(false);
-
-  const insertImage = (editor, url) => {
-    const image = { type: 'image', url, children: [{ text: url }] };
-    Transforms.insertNodes(editor, image);
-  };
-
-  const uploadToVoidCat = useCallback(
-    async (filepath) => {
-      const filename = filepath.split('/').pop();
-      const file = await createBlobFromFile(filepath);
-      const buf = await file.arrayBuffer();
-
-      try {
-        const res: { data: { file: { id: string } } } = await fetch(
-          'https://void.cat/upload?cli=false',
-          {
-            method: 'POST',
-            timeout: 5,
-            headers: {
-              accept: '*/*',
-              'Content-Type': 'application/octet-stream',
-              'V-Filename': filename,
-              'V-Description': 'Uploaded from https://lume.nu',
-              'V-Strip-Metadata': 'true',
-            },
-            body: Body.bytes(buf),
-          }
-        );
-        const image = `https://void.cat/d/${res.data.file.id}.webp`;
-        // update parent state
-        insertImage(editor, image);
-        // reset loading state
-        setLoading(false);
-      } catch (error) {
-        // reset loading state
-        setLoading(false);
-        // handle error
-        if (error instanceof SyntaxError) {
-          // Unexpected token < in JSON
-          console.log('There was a SyntaxError', error);
-        } else {
-          console.log('There was an error', error);
-        }
-      }
-    },
-    [editor]
-  );
-
-  const openFileDialog = async () => {
-    const selected: any = await open({
-      multiple: false,
-      filters: [
-        {
-          name: 'Image',
-          extensions: ['png', 'jpeg', 'jpg', 'gif'],
-        },
-      ],
-    });
-    if (Array.isArray(selected)) {
-      // user selected multiple files
-    } else if (selected === null) {
-      // user cancelled the selection
-    } else {
-      setLoading(true);
-      // upload file
-      uploadToVoidCat(selected);
-    }
-  };
-
-  useEffect(() => {
-    async function initFileDrop() {
-      const unlisten = await listen('tauri://file-drop', (event) => {
-        // set loading state
-        setLoading(true);
-        // upload file
-        uploadToVoidCat(event.payload[0]);
-      });
-
-      return () => {
-        unlisten();
-      };
-    }
-
-    initFileDrop();
-  }, [uploadToVoidCat]);
-
-  return (
-    <button
-      type="button"
-      onClick={() => openFileDialog()}
-      className="inline-flex h-8 w-8 items-center justify-center rounded hover:bg-zinc-800"
-    >
-      {loading ? (
-        <svg
-          className="h-4 w-4 animate-spin text-black dark:text-zinc-100"
-          xmlns="http://www.w3.org/2000/svg"
-          fill="none"
-          viewBox="0 0 24 24"
-        >
-          <title id="loading">Loading</title>
-          <circle
-            className="opacity-25"
-            cx="12"
-            cy="12"
-            r="10"
-            stroke="currentColor"
-            strokeWidth="4"
-          />
-          <path
-            className="opacity-75"
-            fill="currentColor"
-            d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
-          />
-        </svg>
-      ) : (
-        <PlusCircleIcon width={20} height={20} className="text-zinc-500" />
-      )}
-    </button>
-  );
-}

src/shared/composer/index.tsx

@@ -0,0 +1,6 @@
+export * from './user';
+export * from './modal';
+export * from './composer';
+export * from './mention/list';
+export * from './mention/item';
+export * from './mention/suggestion';

src/shared/composer/mention/item.tsx

@@ -0,0 +1,31 @@
+import { Image } from '@shared/image';
+
+import { DEFAULT_AVATAR } from '@stores/constants';
+
+import { displayNpub } from '@utils/shortenKey';
+import { Profile } from '@utils/types';
+
+export function MentionItem({ profile }: { profile: Profile }) {
+  return (
+    <div className="flex items-center gap-2">
+      <div className="h-8 w-8 shrink-0 overflow-hidden rounded-md bg-zinc-900">
+        <Image
+          src={profile.picture || profile.image}
+          fallback={DEFAULT_AVATAR}
+          alt={profile.pubkey}
+          className="h-8 w-8 object-cover"
+        />
+      </div>
+      <div className="flex flex-col gap-px">
+        <h5 className="max-w-[15rem] text-sm font-medium leading-none text-zinc-100">
+          {profile.ident || (
+            <div className="h-3 w-20 animate-pulse rounded-sm bg-zinc-700" />
+          )}
+        </h5>
+        <span className="text-sm leading-none text-zinc-400">
+          {displayNpub(profile.pubkey, 16)}
+        </span>
+      </div>
+    </div>
+  );
+}

src/shared/composer/mention/list.tsx

@@ -0,0 +1,75 @@
+import { NDKUserProfile } from '@nostr-dev-kit/ndk';
+import { forwardRef, useEffect, useImperativeHandle, useState } from 'react';
+import { twMerge } from 'tailwind-merge';
+
+import { MentionItem } from '@shared/composer';
+
+export const MentionList = forwardRef((props: any, ref: any) => {
+  const [selectedIndex, setSelectedIndex] = useState(0);
+
+  const selectItem = (index) => {
+    const item = props.items[index];
+
+    if (item) {
+      props.command({ id: item });
+    }
+  };
+
+  const upHandler = () => {
+    setSelectedIndex((selectedIndex + props.items.length - 1) % props.items.length);
+  };
+
+  const downHandler = () => {
+    setSelectedIndex((selectedIndex + 1) % props.items.length);
+  };
+
+  const enterHandler = () => {
+    selectItem(selectedIndex);
+  };
+
+  useEffect(() => setSelectedIndex(0), [props.items]);
+
+  useImperativeHandle(ref, () => ({
+    onKeyDown: ({ event }) => {
+      if (event.key === 'ArrowUp') {
+        upHandler();
+        return true;
+      }
+
+      if (event.key === 'ArrowDown') {
+        downHandler();
+        return true;
+      }
+
+      if (event.key === 'Enter') {
+        enterHandler();
+        return true;
+      }
+
+      return false;
+    },
+  }));
+
+  return (
+    <div className="flex w-[250px] flex-col rounded-xl border-t border-zinc-700/50 bg-zinc-800 px-3 py-3">
+      {props.items.length ? (
+        props.items.map((item: NDKUserProfile, index: number) => (
+          <button
+            className={twMerge(
+              'h-11 w-full rounded-lg px-2 text-start text-sm font-medium hover:bg-zinc-700',
+              `${index === selectedIndex ? 'is-selected' : ''}`
+            )}
+            key={index}
+            onClick={() => selectItem(index)}
+          >
+            <MentionItem profile={item} />
+          </button>
+        ))
+      ) : (
+        <div>No result</div>
+      )}
+    </div>
+  );
+});
+
+MentionList.displayName = 'MentionList';

src/shared/composer/mention/suggestion.tsx

@@ -0,0 +1,70 @@
+import { ReactRenderer } from '@tiptap/react';
+import tippy from 'tippy.js';
+
+import { getAllMetadata } from '@libs/storage';
+
+import { MentionList } from '@shared/composer';
+
+export const Suggestion = {
+  items: async ({ query }) => {
+    const users = await getAllMetadata();
+    return users
+      .filter((item) => item.ident.toLowerCase().startsWith(query.toLowerCase()))
+      .slice(0, 5);
+  },
+
+  render: () => {
+    let component;
+    let popup;
+
+    return {
+      onStart: (props) => {
+        component = new ReactRenderer(MentionList, {
+          props,
+          editor: props.editor,
+        });
+
+        if (!props.clientRect) {
+          return;
+        }
+
+        popup = tippy('body', {
+          getReferenceClientRect: props.clientRect,
+          appendTo: () => document.body,
+          content: component.element,
+          showOnCreate: true,
+          interactive: true,
+          trigger: 'manual',
+          placement: 'bottom-start',
+        });
+      },
+
+      onUpdate(props) {
+        component.updateProps(props);
+
+        if (!props.clientRect) {
+          return;
+        }
+
+        popup[0].setProps({
+          getReferenceClientRect: props.clientRect,
+        });
+      },
+
+      onKeyDown(props) {
+        if (props.event.key === 'Escape') {
+          popup[0].hide();
+
+          return true;
+        }
+
+        return component.ref?.onKeyDown(props);
+      },
+
+      onExit() {
+        popup[0].destroy();
+        component.destroy();
+      },
+    };
+  },
+};

src/shared/composer/modal.tsx

@@ -3,8 +3,7 @@ import { Fragment } from 'react';
 import { useHotkeys } from 'react-hotkeys-hook';
 
 import { Button } from '@shared/button';
-import { Post } from '@shared/composer/types/post';
-import { User } from '@shared/composer/user';
+import { Composer, ComposerUser } from '@shared/composer';
 import {
   CancelIcon,
   ChevronDownIcon,
@@ -17,9 +16,8 @@ import { COMPOSE_SHORTCUT } from '@stores/shortcuts';
 
 import { useAccount } from '@utils/hooks/useAccount';
 
-export function Composer() {
+export function ComposerModal() {
   const { account } = useAccount();
-
   const [toggle, open] = useComposer((state) => [state.toggleModal, state.open]);
 
   const closeModal = () => {
@@ -31,7 +29,7 @@ export function Composer() {
   return (
     <>
       <Button onClick={() => toggle(true)} preset="small">
-        <ComposeIcon width={14} height={14} />
+        <ComposeIcon className="h-4 w-4" />
         Compose
       </Button>
       <Transition appear show={open} as={Fragment}>
@@ -60,7 +58,7 @@ export function Composer() {
               <Dialog.Panel className="relative h-min w-full max-w-xl rounded-xl border-t border-zinc-800/50 bg-zinc-900">
                 <div className="flex items-center justify-between px-4 py-4">
                   <div className="flex items-center gap-2">
-                    <div>{account && <User pubkey={account.pubkey} />}</div>
+                    {account && <ComposerUser pubkey={account.pubkey} />}
                     <span>
                       <ChevronRightIcon
                         width={14}
@@ -70,20 +68,18 @@ export function Composer() {
                     </span>
                     <div className="inline-flex h-7 w-max items-center justify-center gap-0.5 rounded bg-zinc-800 pl-3 pr-1.5 text-sm font-medium text-zinc-400">
                       New Post
-                      <ChevronDownIcon width={14} height={14} />
+                      <ChevronDownIcon className="h-4 w-4" />
                     </div>
                   </div>
-                  <div
+                  <button
                     onClick={closeModal}
-                    onKeyDown={closeModal}
-                    role="button"
-                    tabIndex={0}
+                    type="button"
                     className="inline-flex h-5 w-5 items-center justify-center rounded hover:bg-zinc-800"
                   >
                     <CancelIcon width={16} height={16} className="text-zinc-500" />
-                  </div>
+                  </button>
                 </div>
-                {account && <Post />}
+                <Composer />
               </Dialog.Panel>
             </Transition.Child>
           </div>

src/shared/composer/types/post.tsx

@@ -1,171 +0,0 @@
-import { useCallback, useMemo, useState } from 'react';
-import { Node, Transforms, createEditor } from 'slate';
-import { withHistory } from 'slate-history';
-import { Editable, ReactEditor, Slate, useSlateStatic, withReact } from 'slate-react';
-
-import { usePublish } from '@libs/ndk';
-
-import { Button } from '@shared/button';
-import { ImageUploader } from '@shared/composer/imageUploader';
-import { TrashIcon } from '@shared/icons';
-import { MentionNote } from '@shared/notes/mentions/note';
-
-import { useComposer } from '@stores/composer';
-import { FULL_RELAYS } from '@stores/constants';
-
-const withImages = (editor) => {
-  const { isVoid } = editor;
-
-  editor.isVoid = (element) => {
-    return element.type === 'image' ? true : isVoid(element);
-  };
-
-  return editor;
-};
-
-const ImagePreview = ({
-  attributes,
-  children,
-  element,
-}: {
-  attributes: any;
-  children: any;
-  element: any;
-}) => {
-  const editor: any = useSlateStatic();
-  const path = ReactEditor.findPath(editor, element);
-
-  return (
-    <figure {...attributes} className="m-0 mt-3">
-      {children}
-      <div contentEditable={false} className="relative">
-        <img
-          alt={element.url}
-          src={element.url}
-          className="m-0 h-auto max-h-[300px] w-full rounded-md object-cover"
-        />
-        <button
-          type="button"
-          onClick={() => Transforms.removeNodes(editor, { at: path })}
-          className="shadow-mini-button absolute right-2 top-2 inline-flex h-7 w-7 items-center justify-center gap-0.5 rounded bg-zinc-800 text-base font-medium text-zinc-400 hover:bg-zinc-700"
-        >
-          <TrashIcon width={14} height={14} className="text-zinc-100" />
-        </button>
-      </div>
-    </figure>
-  );
-};
-
-export function Post() {
-  const publish = usePublish();
-  const editor = useMemo(() => withReact(withImages(withHistory(createEditor()))), []);
-
-  const [repost, reply, toggle] = useComposer((state) => [
-    state.repost,
-    state.reply,
-    state.toggleModal,
-  ]);
-  const [content, setContent] = useState<Node[]>([
-    {
-      children: [
-        {
-          text: '',
-        },
-      ],
-    },
-  ]);
-
-  const serialize = useCallback((nodes: Node[]) => {
-    return nodes.map((n) => Node.string(n)).join('\n');
-  }, []);
-
-  const getRef = () => {
-    if (repost.id) {
-      return repost.id;
-    } else if (reply.id) {
-      return reply.id;
-    } else {
-      return null;
-    }
-  };
-
-  const refID = getRef();
-
-  const submit = async () => {
-    let tags: string[][] = [];
-    let kind: number;
-
-    if (repost.id && repost.pubkey) {
-      kind = 6;
-      tags = [
-        ['e', repost.id, FULL_RELAYS[0], 'root'],
-        ['p', repost.pubkey],
-      ];
-    } else if (reply.id && reply.pubkey) {
-      kind = 1;
-      if (reply.root && reply.root !== reply.id) {
-        tags = [
-          ['e', reply.id, FULL_RELAYS[0], 'root'],
-          ['e', reply.root, FULL_RELAYS[0], 'reply'],
-          ['p', reply.pubkey],
-        ];
-      } else {
-        tags = [
-          ['e', reply.id, FULL_RELAYS[0], 'root'],
-          ['p', reply.pubkey],
-        ];
-      }
-    } else {
-      kind = 1;
-      tags = [];
-    }
-
-    // serialize content
-    const serializedContent = serialize(content);
-
-    // publish message
-    await publish({ content: serializedContent, kind, tags });
-
-    // close modal
-    toggle(false);
-  };
-
-  const renderElement = useCallback((props: any) => {
-    switch (props.element.type) {
-      case 'image':
-        if (props.element.url) {
-          return <ImagePreview {...props} />;
-        }
-        break;
-      default:
-        return <p {...props.attributes}>{props.children}</p>;
-    }
-  }, []);
-
-  return (
-    <Slate editor={editor} value={content} onChange={setContent}>
-      <div className="flex h-full flex-col px-4 pb-4">
-        <div className="flex h-full w-full gap-2">
-          <div className="flex w-8 shrink-0 items-center justify-center">
-            <div className="h-full w-[2px] bg-zinc-800" />
-          </div>
-          <div className="w-full">
-            <Editable
-              placeholder={refID ? 'Share your thoughts on it' : "What's on your mind?"}
-              spellCheck="false"
-              className={`${refID ? '!min-h-42' : '!min-h-[86px]'} markdown`}
-              renderElement={renderElement}
-            />
-            {refID && <MentionNote id={refID} />}
-          </div>
-        </div>
-        <div className="mt-4 flex items-center justify-between">
-          <ImageUploader />
-          <Button onClick={() => submit()} preset="publish">
-            Publish
-          </Button>
-        </div>
-      </div>
-    </Slate>
-  );
-}

src/shared/composer/user.tsx

@@ -4,14 +4,14 @@ import { DEFAULT_AVATAR } from '@stores/constants';
 
 import { useProfile } from '@utils/hooks/useProfile';
 
-export function User({ pubkey }: { pubkey: string }) {
+export function ComposerUser({ pubkey }: { pubkey: string }) {
   const { user } = useProfile(pubkey);
 
   return (
-    <div className="flex items-center gap-2">
-      <div className="h-8 w-8 shrink-0 overflow-hidden rounded bg-zinc-900">
+    <div className="flex items-center gap-3">
+      <div className="h-8 w-8 shrink-0 overflow-hidden rounded-md bg-zinc-900">
         <Image
-          src={user?.image}
+          src={user?.picture || user?.image}
           fallback={DEFAULT_AVATAR}
           alt={pubkey}
           className="h-8 w-8 object-cover"