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.

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

nip68 debits #327

Merged
merged 51 commits into from
Oct 6, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
d519699
nip68-2
Sep 18, 2024
91028c7
Merge pull request #302 from shocknet/nip68-test-2
shocknet-justin Sep 18, 2024
bf384d5
userinfo includes ndebit
Sep 18, 2024
0f45a13
Merge pull request #303 from snake-eaterr/ndebit-in-userinfo
shocknet-justin Sep 18, 2024
9580307
update css
polarDefender Sep 18, 2024
1a7788a
Merge pull request #304 from shocknet/fix-notification
shocknet-justin Sep 18, 2024
861a53c
fix
Sep 18, 2024
5fb91fc
Merge pull request #305 from snake-eaterr/ndebit-in-userinfo
shocknet-justin Sep 19, 2024
70b08d1
move modal to main
boufni95 Sep 20, 2024
140d8e7
ban and reset
boufni95 Sep 20, 2024
0daac38
deny dont ban
boufni95 Sep 20, 2024
bd582d0
up types
boufni95 Sep 20, 2024
baac7ca
send rules, ban button
boufni95 Sep 20, 2024
8dd3d83
revert android files
boufni95 Sep 23, 2024
a7becdf
debit ui
Sep 25, 2024
11b4efa
Merge pull request #306 from snake-eaterr/debits-ui
snake-eaterr Sep 25, 2024
76d338a
copyable ndebit string and show debits for selected source
Sep 25, 2024
a692445
Merge pull request #308 from snake-eaterr/debits-ui
snake-eaterr Sep 25, 2024
5eeaf67
use nostr tools fork
boufni95 Sep 26, 2024
c610721
ndebits complete
Sep 28, 2024
148ad57
Merge pull request #311 from snake-eaterr/debits-ui
snake-eaterr Sep 28, 2024
287354e
fix
Sep 28, 2024
13135c5
Merge pull request #313 from snake-eaterr/debits-ui
snake-eaterr Sep 28, 2024
dbbcf9c
Merge pull request #310 from shocknet/ntools-fork
shocknet-justin Sep 28, 2024
59f1638
Update .env.development.example
shocknet-justin Sep 29, 2024
0222dcf
rerender linked apps after ndebit string fetch
Sep 30, 2024
e743e62
Merge pull request #314 from snake-eaterr/debits-ui
snake-eaterr Sep 30, 2024
55a84e4
fixies
boufni95 Sep 30, 2024
9e9a772
Merge branch 'test' into ntools-fork
boufni95 Sep 30, 2024
c48dd4f
Merge pull request #315 from shocknet/ntools-fork
shocknet-justin Sep 30, 2024
8d7ecf3
new nostr-tools fork hash and
Sep 30, 2024
7bd9455
Merge pull request #316 from snake-eaterr/Buffer-fix-and-new-nostr-to…
shocknet-justin Sep 30, 2024
f6a44eb
Merge pull request #317 from shocknet/main
shocknet-justin Sep 30, 2024
797272a
create rule
boufni95 Oct 2, 2024
65e61bc
Merge pull request #320 from shocknet/create-rule
shocknet-justin Oct 2, 2024
147545c
debits placeholders
Oct 3, 2024
ecd64a6
edit source modal and prompt
Oct 4, 2024
8cee378
Merge pull request #321 from snake-eaterr/edit-source-modal-and-prompt
snake-eaterr Oct 4, 2024
672468f
proto
Oct 4, 2024
2198252
ui fix
Oct 4, 2024
7488a8f
Merge pull request #322 from snake-eaterr/edit-source-modal-and-prompt
snake-eaterr Oct 4, 2024
ac3cc8a
respondToDebit
Oct 4, 2024
99f7af7
Merge branch 'test' into debits-placeholders
snake-eaterr Oct 4, 2024
a43cdac
Merge pull request #323 from snake-eaterr/debits-placeholders
snake-eaterr Oct 4, 2024
a021438
copy
shocknet-justin Oct 4, 2024
3d5c244
Merge pull request #324 from shocknet/text
shocknet-justin Oct 4, 2024
41035df
style
shocknet-justin Oct 5, 2024
696b7d1
debit improvements
Oct 5, 2024
0213b9e
Merge pull request #325 from snake-eaterr/debit-improvements
snake-eaterr Oct 5, 2024
f8a4cba
ndebit discoverable checkbox
Oct 6, 2024
e2390da
Merge pull request #326 from snake-eaterr/debit-improvements
snake-eaterr Oct 6, 2024
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
Prev Previous commit
Next Next commit
debit improvements
  • Loading branch information
Mothana committed Oct 5, 2024
commit 696b7d1531ee1971303a8296304c3fa179f21fc0
3 changes: 1 addition & 2 deletions src/Components/Modals/DebitRequestModal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export const DebitRequestModal = () => {
})
}

if (currentRequest.request.debit.type === Types.LiveDebitRequest_debit_type.INVOICE && !isRecurringPayment && !isCreateRule) {
if (currentRequest.request.debit.type === Types.LiveDebitRequest_debit_type.INVOICE) {
await (await getNostrClient(currentRequest.source.pasteField, currentRequest.source.keys)).RespondToDebit({
npub: currentRequest.request.npub,
request_id: currentRequest.request.request_id,
Expand All @@ -126,7 +126,6 @@ export const DebitRequestModal = () => {
invoice: currentRequest.request.debit.invoice
}
});
return;
}
const res = await (await getNostrClient(currentRequest.source.pasteField, currentRequest.source.keys)).AuthorizeDebit({
authorize_npub: currentRequest.request.npub, rules,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
}

span {
font-size: 20px;
font-size: clamp(14px, 3vw, 20px);
}

.num-intervals-input {
Expand Down
18 changes: 10 additions & 8 deletions src/Pages/LinkedApp/styles/index.module.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.wrapper {
width: 100%;
padding-inline: 5%;
padding-inline: 2%;
padding-bottom: 30px;
transition-duration: 500ms;
font-family: Montserrat;
Expand Down Expand Up @@ -91,6 +91,8 @@
border-radius: 5px;
padding: 12px;
height: 110px;
overflow: hidden;


&.column {
flex-direction: column;
Expand Down Expand Up @@ -126,10 +128,10 @@
}

.left {
flex: 1;
width: 100%;
flex: 0 0 90px;
max-width: 90px;

margin-right: 7px;
margin-right: 16px;

img {
width: 100%;
Expand All @@ -151,24 +153,24 @@

.right {

flex: 5;
flex: 1;
min-width: 0;
text-align: left;
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: flex-start;
height: 100%;
width: 100%;
gap: 5%;

.name {
font-size: 23px;
font-size: clamp(14px, 5vw, 23px);
font-weight: 500;
}

.npub {
color: #adadad;
font-size: 12px;
font-size: clamp(9px, 3vw, 12px)
}

.rules {
Expand Down
2 changes: 1 addition & 1 deletion src/styles/_modals.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
}

@media (max-width: 480px) {
padding-inline: 15px;
padding-inline: 12px;

}
}
Expand Down