diff --git a/src/components/MeritRequests.svelte b/src/components/MeritRequests.svelte
index 1754282..cc7c36d 100644
--- a/src/components/MeritRequests.svelte
+++ b/src/components/MeritRequests.svelte
@@ -103,6 +103,7 @@
Problem
Amount (Sats)
Merits
+ Status
When
@@ -119,12 +120,12 @@
@@ -133,10 +134,11 @@
{merit.Sats}
{merit.Merits}
+ {status(merit).toUpperCase()}
{unixToRelativeTime(merit.TimeStamp * 1000)}
- {status(merit).toUpperCase()}
+
{/each}
{#if $merits.size > $meritsTruncated.length}
diff --git a/src/components/MeritsAndSatflow.svelte b/src/components/MeritsAndSatflow.svelte
index 92129cd..e700daa 100644
--- a/src/components/MeritsAndSatflow.svelte
+++ b/src/components/MeritsAndSatflow.svelte
@@ -8,17 +8,25 @@
import { Avatar, Name } from '@nostr-dev-kit/ndk-svelte-components';
import { ndk } from '@/ndk';
- export let rocket: NDKEvent;
- export let unratifiedZaps:number = 0;
+ export let rocket: Rocket;
+ export let unratifiedZaps: Map;
- let parsedRocket = new Rocket(rocket);
+ let unratifiedZapsAmount = 0;
+
+ $: {
+ unratifiedZapsAmount = 0;
+ for (let [_, a] of unratifiedZaps) {
+ unratifiedZapsAmount += a / 1000;
+ }
+ unratifiedZapsAmount = unratifiedZapsAmount;
+ }
let _merits: { pubkey: string; merits: number; sats: number }[] = [];
let merits = writable(_merits);
$: {
let m = new Map();
- for (let [_, amr] of parsedRocket.ApprovedMeritRequests()) {
+ for (let [_, amr] of rocket.ApprovedMeritRequests()) {
let existing = m.get(amr.Pubkey);
if (!existing) {
existing = { merits: 0, sats: 0 };
@@ -29,12 +37,12 @@
}
//calculate percentage ownership of each pubkey and divide the unratified sats among them (round up to nearest sat):
- let satsPerMeritPercentage = unratifiedZaps/100
- let totalMerits = parsedRocket.TotalMerits()
+ let satsPerMeritPercentage = unratifiedZapsAmount / 100;
+ let totalMerits = rocket.TotalMerits();
for (let [id, _m] of m) {
- _m.sats += (((_m.merits/totalMerits)*100)*satsPerMeritPercentage)
- _m.sats = Math.round(_m.sats)
- m.set(id, _m)
+ _m.sats += (_m.merits / totalMerits) * 100 * satsPerMeritPercentage;
+ _m.sats = Math.round(_m.sats);
+ m.set(id, _m);
}
let _merits: { pubkey: string; merits: number; sats: number }[] = [];
@@ -42,16 +50,16 @@
_merits.push({ pubkey: pubkey, merits: _m.merits, sats: _m.sats });
}
if (_merits.length == 0) {
- _merits.push({pubkey: rocket.pubkey, merits: 1, sats: 0})
+ _merits.push({ pubkey: rocket.Event.pubkey, merits: 1, sats: 0 });
}
merits.set(_merits);
}
- const COLORS = ["bg-pink-800", 'bg-red-800', 'bg-purple-800', 'bg-blue-800'];
+ const COLORS = ['bg-pink-800', 'bg-red-800', 'bg-purple-800', 'bg-blue-800'];
- function c(i:number) {
- return COLORS[i]
+ function c(i: number) {
+ return COLORS[i];
}
@@ -60,13 +68,13 @@
Merits and Satflow
- This graph displays the Meritization of equity in {rocket.getMatchingTags('d')[0][1]}
-
+ This graph displays the Meritization of equity in {rocket.Name()}
+
-
+
Participant
Merits
Revenue (Sats)
@@ -80,12 +88,12 @@
diff --git a/src/components/ProductFomo.svelte b/src/components/ProductFomo.svelte
index afe34a9..8219961 100644
--- a/src/components/ProductFomo.svelte
+++ b/src/components/ProductFomo.svelte
@@ -11,7 +11,7 @@
import { ChevronLeft, ChevronRight } from 'lucide-svelte';
export let rocket: Rocket;
- export let unratifiedZaps = 0;
+ export let unratifiedZaps:Map;
let products = writable(new Map());
diff --git a/src/components/ProductPurchases.svelte b/src/components/ProductPurchases.svelte
index e65d0d0..87b0fa7 100644
--- a/src/components/ProductPurchases.svelte
+++ b/src/components/ProductPurchases.svelte
@@ -1,18 +1,17 @@
@@ -37,7 +37,7 @@
-
+
diff --git a/src/views/rockets/Rockets.svelte b/src/views/rockets/Rockets.svelte
index 4fbcdfa..289a0be 100644
--- a/src/views/rockets/Rockets.svelte
+++ b/src/views/rockets/Rockets.svelte
@@ -18,7 +18,6 @@
for (let e of $rockets) {
let existing = _r.get(`${e.pubkey}${e.dTag}`)
if (!existing) {
- console.log(e)
existing = new Rocket(e)
}
if (existing.Event.created_at <= e.created_at) {