Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: move nostr key to accounts #1964

Merged
merged 32 commits into from
Feb 1, 2023
Merged

feat: move nostr key to accounts #1964

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
338e003
feat: add nostr key field in account
im-adithya Jan 11, 2023
987f0ef
feat: change nostr methods to use key from account
im-adithya Jan 11, 2023
aff9889
feat: add migration for users with global nostr key
im-adithya Jan 11, 2023
a9896f7
feat: add get account by id action
im-adithya Jan 12, 2023
f0b7c7b
feat: add account screen
im-adithya Jan 12, 2023
bd1199a
chore: remove nostr from settings
im-adithya Jan 12, 2023
ca15dea
chore: change getbyid and nostr
im-adithya Jan 13, 2023
9612732
fix: typing changes
im-adithya Jan 16, 2023
6293e8a
fix: unit test
im-adithya Jan 16, 2023
3d5a6a2
fix: add i18n strings
im-adithya Jan 16, 2023
689eb47
fix: unit tests
im-adithya Jan 16, 2023
0b3283b
Merge branch 'master' into task-nostr-account
im-adithya Jan 19, 2023
0ee4e90
feat: improve nostr section
im-adithya Jan 20, 2023
ed4973b
Update src/extension/background-script/actions/accounts/select.ts
bumi Jan 29, 2023
2eab3c5
Merge branch 'master' into task-nostr-account
bumi Jan 29, 2023
a84a039
chore: add accounts to user menu
bumi Jan 29, 2023
3f3ffb3
feat(nostr): display pubkey as npub
bumi Jan 29, 2023
ba2586d
feat(Account): unify headline formatting
bumi Jan 29, 2023
579b3bd
chore: add test for get account action
im-adithya Jan 23, 2023
45f055a
feat: use avvvatars for account screen
im-adithya Jan 30, 2023
f2ae9d8
chore: align screens
im-adithya Jan 31, 2023
76482cc
chore: text
bumi Jan 31, 2023
2efc9a7
chore: modify ui in show account screen
im-adithya Jan 31, 2023
f9a8665
chore: use useeffect hook on private key change
im-adithya Jan 31, 2023
33f21d6
chore: keep old setting private key as backup during the migration
bumi Jan 31, 2023
bd9604e
chore: add test for nostr
im-adithya Jan 31, 2023
188a35f
chore: add copy icon to button
im-adithya Feb 1, 2023
a0a15cc
fix: use own private key
im-adithya Feb 1, 2023
e46bb98
fix: private key issues and styling
im-adithya Feb 1, 2023
349fd7a
fix: use form element
im-adithya Feb 1, 2023
a6203fc
fix: final changes
im-adithya Feb 1, 2023
64a9851
fix: add type guard
im-adithya Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/app/components/AccountMenu/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,20 @@ const defaultProps = {
};

const mockAccounts: Accounts = {
"1": { id: "1", connector: "lnd", config: "", name: "LND account" },
"2": { id: "2", connector: "galoy", config: "", name: "Galoy account" },
"1": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In another PR these could be moved to, right?:
https://github.com/getAlby/lightning-browser-extension/tree/task-nostr-account/tests/fixtures

Also these should be moved there, not sure why these neded up in src:
https://github.com/getAlby/lightning-browser-extension/tree/task-nostr-account/src/fixtures

id: "1",
connector: "lnd",
config: "",
name: "LND account",
nostrPrivateKey: "",
},
"2": {
id: "2",
connector: "galoy",
config: "",
name: "Galoy account",
nostrPrivateKey: "",
},
};

jest.mock("~/app/context/AccountsContext", () => ({
Expand Down
2 changes: 2 additions & 0 deletions src/app/router/Options/Options.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Container from "@components/Container";
import Navbar from "@components/Navbar";
import Account from "@screens/Account";
import Accounts from "@screens/Accounts";
import ConfirmPayment from "@screens/ConfirmPayment";
import Keysend from "@screens/Keysend";
Expand Down Expand Up @@ -59,6 +60,7 @@ function Options() {
<Route path="lnurlAuth" element={<LNURLAuth />} />
<Route path="settings" element={<Settings />} />
<Route path="accounts">
<Route path=":id" element={<Account />} />
<Route
path="new"
element={
Expand Down
Loading