Merge pull request #2 from vbaranov/master

(Fix) ETH to POA in alerts and in the page
poanetwork · Jan 4, 2018 · 887fb3b · 887fb3b
2 parents 8fca8f7 + 754b027
commit 887fb3b
Show file tree

Hide file tree

Showing 12 changed files with 5,298 additions and 130 deletions.
diff --git a/helpers/blockchainHelper.js b/helpers/blockchainHelper.js
@@ -43,7 +43,7 @@ module.exports = function (app) {
 	    response.send({
     		code: 200,
     		title: "Success",
-    		message: '0.5 ETH successfully sent'
+    		message: '0.5 POA successfully sent'
     	});
 	}
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/public/assets/images/FAUCET.png b/public/assets/images/FAUCET.png
diff --git a/public/assets/images/[email protected] b/public/assets/images/[email protected]
diff --git a/public/assets/images/socials/[email protected] b/public/assets/images/socials/[email protected]
diff --git a/public/assets/javascripts/application/index.js b/public/assets/javascripts/application/index.js
@@ -23,7 +23,7 @@ $(function() {
 				$("#receiver").val('');
 				loader.addClass("hidden");
 				swal("Success",
-				  "0.5 ETH is successfully transfered to " + receiver + "</a>",
+				  "0.5 POA is successfully transfered to " + receiver + "</a>",
 				  "success"
 				);
 				grecaptcha.reset();

diff --git a/public/assets/stylesheets/index/_0_fonts.scss b/public/assets/stylesheets/index/_0_fonts.scss
diff --git a/public/assets/stylesheets/index/_1_mixins.scss b/public/assets/stylesheets/index/_1_mixins.scss
diff --git a/public/assets/stylesheets/index/_2_placeholders.scss b/public/assets/stylesheets/index/_2_placeholders.scss
diff --git a/public/assets/stylesheets/index/_3_base.scss b/public/assets/stylesheets/index/_3_base.scss
diff --git a/public/index.html b/public/index.html
@@ -25,7 +25,7 @@ <h2>
               Please use <a href="https://sokol.poa.network">https://sokol.poa.network</a> RPC to connect<br>
               to the Sokol testnet.
             </h2>
-            <button type="submit" id="requestTokens" class="request-tokens-button">Request 0.5 ETH</button>
+            <button type="submit" id="requestTokens" class="request-tokens-button">Request 0.5 POA</button>
         </div>
         <!--<div class="text-xs-center">
           <div class="g-recaptcha" data-sitekey="6LdcdjQUAAAAACIxl5VzkTRuVG5KvWdf0rYcC7mD"></div>