merge nfc-binary

.prettierignore

@@ -1,3 +1,5 @@
 dist
 src-capacitor
 src-cordova
+android
+ios

LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Cashu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package.json

@@ -36,6 +36,7 @@
     "capacitor-plugin-safe-area": "^3.0.4",
     "core-js": "^3.37.0",
     "date-fns": "^3.6.0",
+    "dexie": "^4.0.9",
     "light-bolt11-decoder": "^3.1.1",
     "lucide-vue-next": "^0.453.0",
     "nostr-tools": "^2.5.2",

src/components/AnimatedNumber.vue

@@ -23,17 +23,27 @@ export default defineComponent({
   },
   setup(props) {
     const displayedValue = ref(props.value);
+    // value to remember that we do not want to animate the very first update (when the component is created)
+    const initialized = ref(false);
 
     watch(
       () => props.value,
       (newValue, oldValue) => {
+        if (!initialized.value) {
+          displayedValue.value = newValue;
+          if (newValue > 0) {
+            // do not animate until we set the first value
+            initialized.value = true;
+          }
+          return;
+        }
         const startTime = performance.now();
         const startValue = oldValue !== undefined ? oldValue : newValue;
         const endValue = newValue;
 
         const animate = (currentTime: number) => {
           const elapsed = currentTime - startTime;
-          const progress = Math.min(elapsed / props.duration, 1);
+          const progress = Math.max(Math.min(elapsed / props.duration, 1), 0);
           const currentValue = startValue + (endValue - startValue) * progress;
           displayedValue.value = currentValue;
           if (progress < 1) {

src/components/BalanceView.vue

@@ -104,7 +104,7 @@
           Balance:
           <b>
             <AnimatedNumber
-              :value="getActiveMintBalance"
+              :value="getActiveBalance"
               :format="(val) => formatCurrency(val, activeUnit)"
               class="q-my-none q-py-none cursor-pointer"
             />
@@ -163,28 +163,23 @@ export default defineComponent({
     ...mapState(useMintsStore, [
       "activeMintUrl",
       "activeProofs",
-      "mints",
-      "proofs",
       "activeBalance",
+      "mints",
+      "totalUnitBalance",
       "activeUnit",
       "activeMint",
     ]),
     ...mapState(useTokensStore, ["historyTokens"]),
     ...mapState(useUiStore, ["globalMutexLock"]),
     ...mapState(usePriceStore, ["bitcoinPrice"]),
     ...mapWritableState(useMintsStore, ["activeUnit"]),
-    ...mapWritableState(useUiStore, ["hideBalance"]),
+    ...mapWritableState(useUiStore, ["hideBalance", "lastBalanceCached"]),
     pendingBalance: function () {
       return -this.historyTokens
         .filter((t) => t.status == "pending")
         .filter((t) => t.unit == this.activeUnit)
         .reduce((sum, el) => (sum += el.amount), 0);
     },
-    balance: function () {
-      return this.activeProofs
-        .flat()
-        .reduce((sum, el) => (sum += el.amount), 0);
-    },
     balancesOptions: function () {
       const mint = this.activeMint();
       return Object.entries(mint.allBalances).map(([key, value]) => ({
@@ -196,12 +191,10 @@ export default defineComponent({
       return [].concat(...this.mints.map((m) => m.keysets));
     },
     getTotalBalance: function () {
-      return this.activeBalance;
+      return this.totalUnitBalance;
     },
-    getActiveMintBalance: function () {
-      return this.activeProofs
-        .flat()
-        .reduce((sum, el) => (sum += el.amount), 0);
+    getActiveBalance: function () {
+      return this.activeBalance;
     },
     activeMintLabel: function () {
       const mintClass = this.activeMint();

src/components/ChooseMint.vue

@@ -116,7 +116,6 @@ export default defineComponent({
       "activeMintUrl",
       "activeProofs",
       "mints",
-      "proofs",
       "activeUnit",
     ]),
     ...mapWritableState(useMintsStore, ["activeMintUrl"]),

src/components/MainHeader.vue

@@ -1,5 +1,5 @@
 <template>
-  <q-header class="bg-marginal-bg">
+  <q-header class="bg-transparent">
     <q-toolbar>
       <q-btn
         flat
@@ -193,3 +193,9 @@ export default defineComponent({
   },
 });
 </script>
+<style scoped>
+.q-header {
+  position: relative;
+  z-index: auto;
+}
+</style>

src/components/MintSettings.vue

@@ -198,16 +198,6 @@
             >
           </q-item-section>
         </q-item>
-        <q-item v-if="false">
-          <q-btn
-            class="q-ml-sm q-px-md"
-            color="primary"
-            rounded
-            outline
-            @click="initNdk"
-            >Link to extension</q-btn
-          >
-        </q-item>
         <q-item>
           <q-btn
             class="q-ml-sm q-px-md"
@@ -735,52 +725,6 @@ export default defineComponent({
       await this.mintAmountSwap(swapAmountData);
       this.clearSwapData();
     },
-    enable_terminal: function () {
-      // enable debug terminal
-      var script = document.createElement("script");
-      script.src = "//cdn.jsdelivr.net/npm/eruda";
-      document.body.appendChild(script);
-      script.onload = function () {
-        eruda.init();
-      };
-    },
-    getLocalstorageToFile: async function () {
-      // https://stackoverflow.com/questions/24263682/save-restore-local-storage-to-a-local-file
-      const fileName = `cashu_backup_${currentDateStr()}.json`;
-      var a = {};
-      for (var i = 0; i < localStorage.length; i++) {
-        var k = localStorage.key(i);
-        var v = localStorage.getItem(k);
-        a[k] = v;
-      }
-      var textToSave = JSON.stringify(a);
-      var textToSaveAsBlob = new Blob([textToSave], {
-        type: "text/plain",
-      });
-      var textToSaveAsURL = window.URL.createObjectURL(textToSaveAsBlob);
-
-      var downloadLink = document.createElement("a");
-      downloadLink.download = fileName;
-      downloadLink.innerHTML = "Download File";
-      downloadLink.href = textToSaveAsURL;
-      downloadLink.onclick = function () {
-        document.body.removeChild(event.target);
-      };
-      downloadLink.style.display = "none";
-      document.body.appendChild(downloadLink);
-      downloadLink.click();
-    },
-    toggleGetBitcoinPrice: function () {
-      this.getBitcoinPrice = !this.getBitcoinPrice;
-    },
-    initNdk: async function () {
-      await this.initNdkReadOnly();
-      console.log(await this.getUserPubkey());
-      // console.log("### fetch events");
-      // console.log(await this.fetchEventsFromUser());
-      // console.log("### fetch mints");
-      // console.log(await this.fetchMints());
-    },
     fetchMintsFromNdk: async function () {
       this.discoveringMints = true;
       await this.initNdkReadOnly();

src/components/PayInvoiceDialog.vue

@@ -64,7 +64,10 @@
         <div class="col-12">
           <ChooseMint />
         </div>
-        <div v-if="enoughActiveBalance" class="row q-mt-lg">
+        <div
+          v-if="enoughtotalUnitBalance || globalMutexLock"
+          class="row q-mt-lg"
+        >
           <q-btn
             unelevated
             rounded
@@ -296,10 +299,9 @@ export default defineComponent({
       "activeMintUrl",
       "activeProofs",
       "mints",
-      "proofs",
       "activeUnit",
+      "totalUnitBalance",
       "activeBalance",
-      "activeMintBalance",
     ]),
     ...mapState(usePriceStore, ["bitcoinPrice"]),
     canPasteFromClipboard: function () {
@@ -309,10 +311,9 @@ export default defineComponent({
         navigator.clipboard.readText
       );
     },
-    enoughActiveBalance: function () {
+    enoughtotalUnitBalance: function () {
       return (
-        this.activeMintBalance() >=
-        this.payInvoiceData.meltQuote.response.amount
+        this.activeBalance >= this.payInvoiceData.meltQuote.response.amount
       );
     },
   },
@@ -326,7 +327,7 @@ export default defineComponent({
     ...mapActions(useCameraStore, ["closeCamera", "showCamera"]),
     canPay: function () {
       if (!this.payInvoiceData.invoice) return false;
-      return payInvoiceData.meltQuote.response.amount <= this.activeBalance;
+      return payInvoiceData.meltQuote.response.amount <= this.totalUnitBalance;
     },
     closeParseDialog: function () {
       setTimeout(() => {

src/components/SendTokenDialog.vue

@@ -152,10 +152,7 @@
               </div>
             </div>
           </transition>
-          <div
-            v-if="activeMintBalance() >= sendData.amount"
-            class="row q-mt-lg"
-          >
+          <div v-if="activeBalance >= sendData.amount" class="row q-mt-lg">
             <q-btn
               v-if="!sendData.tokens"
               :disable="
@@ -203,7 +200,7 @@
                 v-if="
                   sendData.amount > 0 &&
                   !showLockInput &&
-                  activeMintBalance() >= sendData.amount
+                  activeBalance >= sendData.amount
                 "
                 :disable="sendData.p2pkPubkey == null || sendData.amount <= 0"
                 color="primary"
@@ -537,7 +534,7 @@ export default defineComponent({
       "activeUnitLabel",
       "activeUnitCurrencyMultiplyer",
       "activeMintUrl",
-      "activeMintBalance",
+      "activeBalance",
     ]),
     ...mapState(useSettingsStore, [
       "checkSentTokens",