fix amount multipliers

cashubtc · Nov 21, 2024 · 7e6f188 · 7e6f188
1 parent 5ba1d9f
commit 7e6f188
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/components/PaymentRequestDialog.vue b/src/components/PaymentRequestDialog.vue
@@ -119,7 +119,11 @@ export default defineComponent({
   },
   computed: {
     ...mapState(usePRStore, ["showPRKData"]),
-    ...mapState(useMintsStore, ["activeMintUrl", "activeUnit"]),
+    ...mapState(useMintsStore, [
+      "activeMintUrl",
+      "activeUnit",
+      "activeUnitCurrencyMultiplyer",
+    ]),
     ...mapWritableState(usePRStore, ["showPRDialog"]),
   },
   methods: {
@@ -149,8 +153,11 @@ export default defineComponent({
         this.paymentRequestAmount = undefined;
         this.amountLabel = this.amountLabelDefault;
       } else {
-        this.paymentRequestAmount = amount;
-        this.amountLabel = useUiStore().formatCurrency(amount, this.activeUnit);
+        this.paymentRequestAmount = amount * this.activeUnitCurrencyMultiplyer;
+        this.amountLabel = useUiStore().formatCurrency(
+          amount * this.activeUnitCurrencyMultiplyer,
+          this.activeUnit
+        );
       }
       this.newPaymentRequest(this.paymentRequestAmount);
       this.isEditingAmount = false;

diff --git a/src/stores/nostr.ts b/src/stores/nostr.ts
@@ -298,6 +298,7 @@ export const useNostrStore = defineStore("nostr", {
       return Math.floor(Date.now() / 1000) - Math.floor(Math.random() * 172800);
     },
     sendNip17DirectMessage: async function (recipient: string, message: string, relays?: string[]) {
+      await this.initWalletSeedPrivateKeySigner();
       const randomPrivateKey = generateSecretKey();
       const randomPublicKey = getPublicKey(randomPrivateKey);
       const ndk = new NDK({ explicitRelayUrls: relays ?? this.relays, signer: new NDKPrivateKeySigner(bytesToHex(randomPrivateKey)) });

diff --git a/src/stores/payment-request.ts b/src/stores/payment-request.ts
@@ -52,7 +52,7 @@ export const usePRStore = defineStore("payment-request", {
       }
       // if the payment request has an amount, set it
       if (request.amount) {
-        sendTokenStore.sendData.amount = request.amount;
+        sendTokenStore.sendData.amount = request.amount / mintsStore.activeUnitCurrencyMultiplyer;
       }
       sendTokenStore.sendData.paymentRequest = request;
       if (!sendTokenStore.showSendTokens) {