Merge pull request #250 from AlphaWallet/require-enabled-DeFi

require the user enable DeFi services before making a supply/withdraw tx

Author: jzaki

examples/erc20/Compound/cBAT.xml renamed to examples/erc20/DeFi/Compound/cBAT.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE token  [
-        <!ENTITY style SYSTEM "shared.css">
+        <!ENTITY style SYSTEM "../shared.css">
         <!ENTITY mint.en SYSTEM "supply.en.shtml">
         <!ENTITY redeem.en SYSTEM "withdraw.en.shtml">
         <!ENTITY enable.en SYSTEM "enable.en.shtml">

examples/erc20/Compound/cDAI.xml renamed to examples/erc20/DeFi/Compound/cDAI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE token  [
-        <!ENTITY style SYSTEM "shared.css">
+        <!ENTITY style SYSTEM "../shared.css">
         <!ENTITY supply.en SYSTEM "supply.en.shtml">
         <!ENTITY withdraw.en SYSTEM "withdraw.en.shtml">
         <!ENTITY enable.en SYSTEM "enable.en.shtml">

examples/erc20/Compound/cETH.xml renamed to examples/erc20/DeFi/Compound/cETH.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE token  [
-        <!ENTITY style SYSTEM "shared.css">
+        <!ENTITY style SYSTEM "../shared.css">
         <!ENTITY mint.en SYSTEM "supply.en.shtml">
         <!ENTITY redeem.en SYSTEM "withdraw.en.shtml">
         ]>

examples/erc20/Compound/cREP.xml renamed to examples/erc20/DeFi/Compound/cREP.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE token  [
-        <!ENTITY style SYSTEM "shared.css">
+        <!ENTITY style SYSTEM "../shared.css">
         <!ENTITY mint.en SYSTEM "supply.en.shtml">
         <!ENTITY redeem.en SYSTEM "withdraw.en.shtml">
         <!ENTITY enable.en SYSTEM "enable.en.shtml">

examples/erc20/Compound/cUSDC.xml renamed to examples/erc20/DeFi/Compound/cUSDC.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE token  [
-        <!ENTITY style SYSTEM "shared.css">
+        <!ENTITY style SYSTEM "../shared.css">
         <!ENTITY mint.en SYSTEM "supply.en.shtml">
         <!ENTITY redeem.en SYSTEM "withdraw.en.shtml">
         <!ENTITY enable.en SYSTEM "enable.en.shtml">

examples/erc20/Compound/cWBTC.xml renamed to examples/erc20/DeFi/Compound/cWBTC.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE token  [
-        <!ENTITY style SYSTEM "shared.css">
+        <!ENTITY style SYSTEM "../shared.css">
         <!ENTITY mint.en SYSTEM "supply.en.shtml">
         <!ENTITY redeem.en SYSTEM "withdraw.en.shtml">
         <!ENTITY enable.en SYSTEM "enable.en.shtml">

examples/erc20/Compound/cZRX.xml renamed to examples/erc20/DeFi/Compound/cZRX.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE token  [
-        <!ENTITY style SYSTEM "shared.css">
+        <!ENTITY style SYSTEM "../shared.css">
         <!ENTITY mint.en SYSTEM "supply.en.shtml">
         <!ENTITY redeem.en SYSTEM "withdraw.en.shtml">
         <!ENTITY enable.en SYSTEM "enable.en.shtml">

examples/erc20/Compound/enable.en.shtml renamed to examples/erc20/DeFi/Compound/enable.en.shtml

@@ -9,6 +9,7 @@ class Token {
         let message = "";
         if(this.props.allowance > 0) {
             message = "Compound " + this.props.name + " is already enabled";
+            window.onConfirm = function() { window.close(); }
         } else {
            message = "Please enable compound " + this.props.name +  " before supplying or withdrawing";
         }

examples/erc20/Compound/supply.en.shtml renamed to examples/erc20/DeFi/Compound/supply.en.shtml

@@ -8,7 +8,8 @@ class Token {
     render() {
         let message = "";
         if(this.props.allowance > 0) {
-            message = "iDAI is already enabled, no need to click confirm";
+            message = "iDAI is already enabled";
+            window.onConfirm = function() { window.close(); }
         } else {
            message = "Please enable iDAI by clicking confirm";
         }

examples/erc20/Compound/withdraw.en.shtml renamed to examples/erc20/DeFi/Compound/withdraw.en.shtml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE token  [
-        <!ENTITY style SYSTEM "shared.css">
+        <!ENTITY style SYSTEM "../shared.css">
         <!ENTITY supply.en SYSTEM "supply.en.shtml">
         <!ENTITY withdraw.en SYSTEM "withdraw.en.shtml">
         <!ENTITY enable.en SYSTEM "enable.en.shtml">