cowboy credits (aka nov-5 (aka jan-3)) #1678
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merged
huumn
changed the title
ekzyis
reviewed
Dec 18, 2024
api/paidAction/zap.js
Outdated
| // if the zap is dust, or if me doesn't have a send wallet but has enough sats/credits to pay for it | ||
| // then we don't invoice the peer | ||
| if (sats < me?.sendCreditsBelowSats || | ||
| (me && !hasSendWallet && (me.mcredits > cost || me.msats > cost))) { |
There was a problem hiding this comment.
shouldn't the balance checks use >=?
Comment on lines
+203
to
+213
| if (act === 'TIP' && me) { | ||
| return existingSats + sats | ||
| } | ||
| return existingSats | ||
| }, | ||
| meCredits: (existingCredits = 0) => { | ||
| if (act === 'TIP' && !p2p && me) { | ||
| return existingCredits + sats | ||
| } | ||
| return existingCredits | ||
| }, |
There was a problem hiding this comment.
why is me required for the item to stack real sats? an anon zap can also be p2p
There was a problem hiding this comment.
Because you made it so that we manage anon sats elsewhere, right?
components/notifications.js
Outdated
| @@ -535,9 +535,31 @@ function Referral ({ n }) { | |||
| ) | |||
| } | |||
|
|
|||
| function stackedText (item) { | |||
| let text = '' | |||
| console.log(item.sats, item.credits) | |||
components/notifications.js
Outdated
Comment on lines
541
to
553
| if (item.sats) { | ||
| text += `${numWithUnits(item.sats, { abbreviate: false })}` | ||
|
|
||
| if (item.credits) { | ||
| text += ' (' | ||
| } | ||
| } | ||
| if (item.credits) { | ||
| text += `${numWithUnits(item.credits, { abbreviate: false, unitSingular: 'CC', unitPlural: 'CCs' })}` | ||
| if (item.sats) { | ||
| text += ')' | ||
| } | ||
| } |
There was a problem hiding this comment.
Mhh, maybe we should split them so it's also easy to see how many sats were stacked. Currently, the parentheses only give you the exact number of CCs. Also, the item info already shows the same number of sats + credits:
so I am proposing this instead:
naive patch:
diff --git a/components/notifications.js b/components/notifications.js
index faae6f80..98aec7a6 100644
--- a/components/notifications.js
+++ b/components/notifications.js
@@ -537,19 +537,14 @@ function Referral ({ n }) {
function stackedText (item) {
let text = ''
- console.log(item.sats, item.credits)
if (item.sats) {
- text += `${numWithUnits(item.sats, { abbreviate: false })}`
-
- if (item.credits) {
- text += ' ('
- }
+ text += `${numWithUnits(item.sats - item.credits, { abbreviate: false })}`
}
if (item.credits) {
- text += `${numWithUnits(item.credits, { abbreviate: false, unitSingular: 'CC', unitPlural: 'CCs' })}`
if (item.sats) {
- text += ')'
+ text += ' and'
}
+ text += ` ${numWithUnits(item.credits, { abbreviate: false, unitSingular: 'CC', unitPlural: 'CCs' })}`
}
return textThere was a problem hiding this comment.
you're right that looks better
pages/settings/index.js
Outdated
| @@ -110,6 +110,8 @@ export default function Settings ({ ssrData }) { | |||
| // if we switched to anon, me is null before the page is reloaded | |||
| if ((!data && !ssrData) || !me) return <PageLoading /> | |||
|
|
|||
| console.log(settings) | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is ready for review. It primarily just gets the important jobs done. Some of more involved things I've discussed like overhauling: settings, top stackers, satistics, etc are prohibitively involved, ie it's too much to change at once a priori like this, ie it's easy to bike shed myself on nonsense things.
TODO
SATSin the final column toSATS/CCsme.satsStackedpuntme.creditsStackedpunt