fix: style payments

Agoric · Aug 7, 2020 · b7e6176 · b7e6176
1 parent 2559e0d
commit b7e6176
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/packages/dapp-svelte-wallet/ui/lib/ListCard.svelte b/packages/dapp-svelte-wallet/ui/lib/ListCard.svelte
@@ -23,7 +23,7 @@
   };
 </script>
 
-<Card.Card class="fullwidth px-2 py-2">
+<section class="fullwidth px-2 py-2">
   <slot name="title"></slot>
 
   <slot></slot>
@@ -57,4 +57,4 @@
   {/if}
 
   <slot name="actions"></slot>
-</Card.Card>
+</section>
diff --git a/packages/dapp-svelte-wallet/ui/src/Payment.svelte b/packages/dapp-svelte-wallet/ui/src/Payment.svelte
@@ -5,17 +5,25 @@
   import { E } from "@agoric/eventual-send";
   import BoardId from "./BoardId.svelte";
   import { purses } from './store';
+import Button from "smelte/src/components/Button/Button.svelte";
+import Select from "smelte/src/components/Select/Select.svelte";
 
   export let item;
   export let summary = true;
+  export let summaryLine = 0;
   export let details = true;
 
-  let destination;
+  let destination = null;
 
   $: deposit = () => {
     // console.log('deposit to', destination);
-    return E(item.actions).deposit(destination);
+    return E(item.actions).deposit(destination ? destination.purse : undefined);
   };
+
+  $: purseItems = [{ value: null, text: 'Automatic' }, ...(
+    $purses ? $purses.filter(({ brand }) => brand === item.brand).map(p => ({ value: p, text: p.text })) : []
+  )];
+  // $: console.log('purseItems', purseItems);
 </script>
 
 <section>
@@ -26,28 +34,25 @@
       {/if}
     {:else if item.issuer}
       {#if summary}
+        {#if !summaryLine || summaryLine === 1}
         Payment amount
-        {#if item.lastAmount}
+        {/if}
+        {#if item.lastAmount && (!summaryLine || summaryLine === 2)}
           <Amount amount={item.displayPayment.lastAmount} />
         {/if}
       {/if}
 
       {#if details}
-      <button on:click={() => E(item.actions).getAmountOf()}>Refresh Amount</button>
-      <button on:click={deposit}>Deposit to</button>
       {#if $purses}
-        <select bind:value={destination}>
-          <option value={undefined}>Automatic</option>
-          {#each $purses as p}
-            {#if p.brand === item.brand}
-              <option>{p.pursePetname}</option>
-            {/if}
-          {/each}
-        </select>
+        <Select bind:value={destination} items={purseItems} label="Deposit to" />
       {/if}
+      <div>
+        <Button on:click={() => E(item.actions).getAmountOf()}>Refresh</Button>
+        <Button on:click={deposit}>Deposit</Button>
+      </div>
       {/if}
     {:else}
-      {#if summary}
+      {#if summary && (!summaryLine || summaryLine === 1)}
       Unknown brand.  This payment cannot be verified.
       {/if}
     {/if}

diff --git a/packages/dapp-svelte-wallet/ui/src/Payments.svelte b/packages/dapp-svelte-wallet/ui/src/Payments.svelte
@@ -18,7 +18,11 @@ $: paymentItems = $payments && $payments.filter(pmt => pmt.status !== 'deposited
   <div slot="empty">No incoming payments.</div>
 
   <div slot="item-header" let:item>
-    <Payment {item} details={false} />
+    <Payment {item} details={false} summaryLine={1} />
+  </div>
+
+  <div slot="item-header-rest" let:item>
+    <Payment {item} details={false} summaryLine={2} />
   </div>
 
   <div slot="item-details" let:item>