Merge pull request #266 from Dapiguabc/use-new-lamden-js

hotfix

Author: JeffWScott

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lamden-wallet",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "A secure wallet for making transactions on the Lamden blockchain.",
   "author": "Jeff Scott <[email protected]>",
   "license": "",

src/js/utils.js

@@ -142,7 +142,11 @@ const formatKwargs = (kwargsList) => {
     kwargs = {}
     kwargsList.forEach(item => {
         if (item.value !== "" && typeof item.value !== 'undefined') {
-            kwargs[item.name] = Encoder(item.type, item.value)
+            if (item.type === "Any") {
+                kwargs[item.name] = Encoder(item.selectedType, item.value);
+              } else {
+                kwargs[item.name] = Encoder(item.type, item.value);
+            }
         }
     })
     return kwargs;

src/svelte/coins/Coin.svelte

@@ -86,7 +86,7 @@
   $: direction = collapseStatus ? "down" : "right";
 
   //Context
-  const { switchPage, openModal } = getContext("app_functions");
+  const { switchPage, openModal, closeModal } = getContext("app_functions");
 
   const genericIcon_base64_svg =
     "PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB3aWR0aD0iMTAwIiBoZWlnaHQ9IjEwMCIgdmlld0JveD0iMCAwIDEwMCAxMDAiPjxjaXJjbGUgc3Ryb2tlPSJub25lIiBmaWxsPSIjOGU3Yjk4IiByPSI0OCUiIGN4PSI1MCUiIGN5PSI1MCUiPjwvY2lyY2xlPjxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKDUwIDUwKSBzY2FsZSgwLjY5IDAuNjkpIHJvdGF0ZSgwKSB0cmFuc2xhdGUoLTUwIC01MCkiIHN0eWxlPSJmaWxsOiNmZmZmZmYiPjxzdmcgZmlsbD0iI2ZmZmZmZiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSIgdmVyc2lvbj0iMS4xIiBzdHlsZT0ic2hhcGUtcmVuZGVyaW5nOmdlb21ldHJpY1ByZWNpc2lvbjt0ZXh0LXJlbmRlcmluZzpnZW9tZXRyaWNQcmVjaXNpb247aW1hZ2UtcmVuZGVyaW5nOm9wdGltaXplUXVhbGl0eTsiIHZpZXdCb3g9IjAgMCA1OCA4OCIgeD0iMHB4IiB5PSIwcHgiIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIj48ZGVmcz48c3R5bGUgdHlwZT0idGV4dC9jc3MiPgogICAKICAgIC5maWwwIHtmaWxsOiNmZmZmZmZ9CiAgIAogIDwvc3R5bGU+PC9kZWZzPjxnPjxwYXRoIGNsYXNzPSJmaWwwIiBkPSJNMCAyNGMwLC0zMSA1OCwtMzMgNTgsLTEgMCwxOSAtMTksMTggLTIzLDM2IC0yLDkgLTE0LDggLTE0LC0yIDAsLTE3IDE0LC0xOCAyMCwtMjkgNCwtOCAtMywtMTYgLTExLC0xNiAtMTcsMCAtMTEsMTkgLTIyLDE5IC00LDAgLTgsLTMgLTgsLTd6bTI4IDY0Yy0xMiwwIC0xMSwtMTggMCwtMTggMTIsMCAxMiwxOCAwLDE4eiI+PC9wYXRoPjwvZz48L3N2Zz48L2c+PC9zdmc+";
@@ -226,15 +226,23 @@
   };
 
   const handleSend = () => {
-    if (token) {
-      openModal("TokenLamdenSend", {
-        token,
-        coin,
-        txMethod: "transfer",
-        refreshTx: () => refreshTx(),
-      });
+    if (balance.isGreaterThan(0)) {
+      if (token) {
+        openModal("TokenLamdenSend", {
+          token,
+          coin,
+          txMethod: "transfer",
+          refreshTx: () => refreshTx(),
+        });
+      } else {
+        openModal("CoinLamdenSend", { coin, refreshTx: () => refreshTx() });
+      }
     } else {
-      openModal("CoinLamdenSend", { coin, refreshTx: () => refreshTx() });
+      openModal("MessageBox", {
+        text: `You have no ${$currentNetwork.currencySymbol} balances. Please get some coins before making a transaction.`,
+        type: "caution",
+        buttons: [{name: 'Cancel', click: () => closeModal(), class: 'button__solid button__primary'}],
+      })
     }
   };
 

src/svelte/coins/CoinLamdenSend.svelte

@@ -51,7 +51,7 @@
     let txui = "simple";  // "simple", "advanced";
     let txallInfo; // used to retry fetch result
 
-    let buferSize = 0.05;
+    let buferSize = 0.1;
 
     $: coin = modalData.coin;
 

src/svelte/coins/CoinLamdenSimpleContract.svelte

@@ -142,7 +142,6 @@
         contractName = e.detail.selected.value.contractName;
         tokenSymbol = e.detail.selected.value.tokenSymbol;
         amount = 0;
-        updateMaxStamps();
     }
 
     const handleNext = () => {

src/svelte/components/DropDown.svelte

@@ -47,6 +47,8 @@
     }
   });
 
+  afterUpdate(() => dispatchSelected())
+
   const dispatchSelected = () => {
     if (selectElm.selectedIndex >= 0)
       dispatch("selected", { id, selected: items[selectElm.selectedIndex] });

src/svelte/components/MessageBox.svelte

@@ -34,12 +34,12 @@
     /*margin: 1rem 0 2rem;*/
     margin: 3rem 0 0.5rem;
     width: 100%;
+    justify-content: center;
 }
 
 .icon{
     margin-right: 14px;
     min-width: 30px;
-    margin-top: -4px;
 }
 
 .checkmark{

src/svelte/misc/LockScreen.svelte

@@ -57,10 +57,6 @@
     margin-bottom: 16px;
 }
 
-.text-box{
-    margin-bottom: 16px;
-}
-
 .lockscreen{
     box-sizing: border-box;
     display: flex;

src/svelte/tokens/TokenEditDetails.svelte

@@ -11,7 +11,6 @@
     //Props
     export let tokenMeta;
     export let disableInputs = false;
-    export let error = "";
 
     const dispatch = createEventDispatcher()
 

src/svelte/tokens/TokenLamdenSend.svelte

@@ -26,7 +26,7 @@
     //Props
     export let modalData;
 
-    let buferSize = 0.05;
+    let buferSize = 0.1;
 
     let steps = [
         {page: 'CoinLamdenSimpleContract', back: -1, cancelButton: true},