Fix DashWallet.js implementation

.github/workflows/deploy.js

@@ -4,7 +4,11 @@ process.removeAllListeners('warning');
 process.on('SIGTERM', () => process.exit());
 process.on('SIGINT', () => process.exit());
 
-const { BASE_HREF = '' } = process.env
+const {
+  BASE_HREF = '',
+  GITHUB_REF_NAME = '',
+  PAGE_URL = '',
+} = process.env
 
 import {
   readFile, writeFile, readdir,
@@ -17,6 +21,15 @@ const PUB = 'public/'
 const DIST = './dist/'
 const FAV = 'favicon.png'
 
+let footerReplacer = []
+
+if (GITHUB_REF_NAME && !['master','main'].includes(GITHUB_REF_NAME)) {
+  footerReplacer.push([
+    '<a target="_blank" href="https://github.com/dashhive/wallet-ui">Source Code</a>',
+    `<a target="_blank" href="https://github.com/dashhive/wallet-ui/tree/${GITHUB_REF_NAME}">Source Code</a> for <br/><output>${GITHUB_REF_NAME}</output>`,
+  ])
+}
+
 const walk = async (
   dirPath,
   filterFiles = f => f
@@ -54,7 +67,8 @@ const fixOrCopy = async (
       [
         '../public/',
         '../public/'
-      ]
+      ],
+      ...footerReplacer,
     ],
   }
 ) => {
@@ -81,7 +95,21 @@ const fixOrCopy = async (
 }
 
 let filterDirs = file => {
-  return !file?.name?.includes('.git') && !file?.name?.includes('dist/')
+  return ![
+    '.env',
+    '.git',
+    '.vscode',
+    '.nvmrc',
+    '.jshintrc',
+    '.github',
+    '.prettierignore',
+    '.prettierrc.json',
+    'jsconfig.json',
+    'package-lock.json',
+    'package.json',
+    'dist/',
+  ].includes(file?.name)
+  // return !file?.name?.includes('.git') && !file?.name?.includes('dist/')
 }
 
 try {
@@ -127,6 +155,7 @@ try {
               '../public/',
               './public/'
             ],
+            ...footerReplacer,
           ],
           js: [
             [
@@ -141,6 +170,7 @@ try {
               '/src/manifest.webmanifest',
               '/manifest.webmanifest',
             ],
+            ...footerReplacer,
           ],
           json: [
             [
@@ -162,6 +192,9 @@ try {
     'prepare files for deployment',
     allFiles
   );
+  // console.log(
+  //   PAGE_URL,
+  // );
 } catch (err) {
   console.error(err);
 }

.github/workflows/static.yml

@@ -12,33 +12,37 @@ concurrency:
 
 jobs:
   deploy:
-    # outputs:
-    #   branch: ${{ steps.clean_branch.outputs.branch }}
     environment:
       name: wallet
-      url: ${{ vars.WEBSITE }}
+      url: ${{ steps.clean_branch.outputs.page_url }}
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           check-latest: true
           node-version: 20
           cache: 'npm'
       - run: npm ci
-      - run: npm run deploy
       - name: Get clean branch name
         id: clean_branch
         env:
           REPLACE_SLASH: "/"
           WITH_DASH: "-"
+          BASE_DOMAIN: ${{ vars.BASE_DOMAIN }}
         run: |
           export BRANCH=${GITHUB_REF_NAME//$REPLACE_SLASH/$WITH_DASH}
+          export PAGE_URL=https://$BRANCH.$BASE_DOMAIN/
           echo "branch=$BRANCH" >> "$GITHUB_OUTPUT"
-      - name: Deploy via rsync
-        uses: bnnanet/github-actions-rsync@master
+          echo "page_url=$PAGE_URL" >>  "$GITHUB_OUTPUT"
+          echo "name=page_url::$PAGE_URL" >> $GITHUB_OUTPUT
+      - run: npm run deploy
+        id: run_deploy
+        env:
+          PAGE_URL: ${{ steps.clean_branch.outputs.page_url }}
+          GITHUB_REF_NAME: ${{ github.ref_name }}
+          GITHUB_OUTPUT: $GITHUB_OUTPUT
+      - uses: bnnanet/github-actions-rsync@master
         with:
           RSYNC_OPTIONS: -avzr --delete --exclude '.git*'
           RSYNC_SOURCE: ./dist/

README.md

@@ -52,9 +52,6 @@ See the [Stage 2](/../../milestone/2) milestone
 - [ ] Contact/Payment Share Features
   - [ ] SMS (sms:)
   - [ ] Email (mailto:)
-- [ ] Transactions view
-  - [ ] Table with filter/sort
-  - [ ] Select & Copy as CSV
 - [ ] View & manage addresses associated with Wallet
 - [ ] Coin Control
   - [ ] Set Fund Denomination for Send & Request payments

package.json

@@ -44,7 +44,7 @@
     "dashphrase": "^1.4.0",
     "dashsight": "^1.6.1",
     "dashtx": "^0.13.2",
-    "dashwallet": "^0.6.1",
+    "dashwallet": "^0.7.0-1",
     "html5-qrcode": "^2.3.8",
     "idb": "^8.0.0",
     "localforage": "^1.10.0",

src/components/balance.js

@@ -1,5 +1,5 @@
 import { lit as html } from '../helpers/lit.js'
-import { fixedDash, envoy, } from '../helpers/utils.js'
+import { envoy, formatDash, } from '../helpers/utils.js'
 import { updateAllFunds, } from '../helpers/wallet.js'
 
 const initialState = {
@@ -14,6 +14,7 @@ const initialState = {
   addr: null,
   maxlen: 10,
   fract: 8,
+  sigsplit: 3,
   render(
     renderState = {},
     position = 'afterbegin',
@@ -23,41 +24,19 @@ const initialState = {
     <figcaption>${state.name} ${state.id}</figcaption>
   `,
   content: state => {
-    let funds = 0
-    let balance = `${funds}`
-
-    if (state.walletFunds.balance) {
-      funds += state.walletFunds.balance
-      balance = fixedDash(funds, state.fract)
-      // TODO FIX: does not support large balances
-
-      // console.log('balance fixedDash', balance, balance.length)
-
-      let [fundsInt,fundsFract] = balance.split('.')
-      state.maxlen -= fundsInt.length
-
-      let fundsFraction = fundsFract?.substring(
-        0, Math.min(Math.max(0, state.maxlen), 3)
-      )
-
-      let fundsRemainder = fundsFract?.substring(
-        fundsFraction.length,
-        Math.max(0, state.maxlen)
-      )
-
-      balance = html`${
-        fundsInt
-      }<sub><span>.${
-        fundsFraction
-      }</span>${
-        fundsRemainder
-      }</sub>`
-    }
+    let balance = formatDash(
+      state.walletFunds.balance,
+      {
+        fract: state.fract,
+        maxlen: state.maxlen,
+        sigsplit: state.sigsplit,
+      }
+    )
 
     return html`
       ${state.header(state)}
 
-      <div title="${funds}">
+      <div title="${state.walletFunds.balance}">
         <svg width="32" height="33" viewBox="0 0 32 33">
           <use xlink:href="#icon-dash-mark"></use>
         </svg>