Prerelease initial Working Copy. version 0.0.1

pirl · Oct 14, 2017 · 06c2dc7 · 06c2dc7
1 parent 6a949ad
commit 06c2dc7
Show file tree

Hide file tree

Showing 58 changed files with 1,611 additions and 584 deletions.
diff --git a/app/client/lib/ethereum/walletInterface.js b/app/client/lib/ethereum/walletInterface.js
diff --git a/app/client/lib/helpers/helperFunctions.js b/app/client/lib/helpers/helperFunctions.js
@@ -316,7 +316,7 @@ Helpers.formatTransactionBalance = function(value, exchangeRates, unit) {
             format += '[0]';
 
         var price = new BigNumber(String(web3.fromWei(value, 'ether')), 10).times(exchangeRates[unit].price);
-        return EthTools.formatNumber(price, format) + ' '+ unit.toUpperCase();
+        return EthTools.formatNumber(price, format) + 'Pirl';
     } else {
         return EthTools.formatBalance(value, format + '[0000000000000000] UNIT');
     }

diff --git a/app/client/mist.js b/app/client/mist.js
@@ -7,7 +7,7 @@ updateMistBadge = function(){
 
         var balance = _.reduce(_.pluck(_.union(accounts, wallets), 'balance'), function(memo, num){ return memo + Number(num); }, 0);
 
-        mist.menu.setBadge(EthTools.formatBalance(balance, '0.0 a','ether') + ' ETH');
+        mist.menu.setBadge(EthTools.formatBalance(balance, '0.0 a','ether') + ' Pirl');
     }
 };
 
@@ -45,7 +45,7 @@ updateMistMenu = function(){
             mist.menu.add(account._id,{
                 position: 3 + index,
                 name: account.name,
-                badge: EthTools.formatBalance(account.balance, "0 a", 'ether')+ ' ETH',
+                badge: EthTools.formatBalance(account.balance, "0 a", 'ether')+ ' Pirl',
                 selected: (location.pathname === '/account/'+ account.address)
             }, function(){
                 FlowRouter.go('/account/'+ account.address);

diff --git a/app/client/styles/elements.import.less b/app/client/styles/elements.import.less
@@ -615,3 +615,12 @@ table {
         width: @gridWidth * 13;
     }
 }
+
+.dapp-container{
+    p{
+        a{
+            color: black;
+            font-weight: bolder;
+        }
+    }
+}
diff --git a/app/client/templates/elements/balance.html b/app/client/templates/elements/balance.html
@@ -9,7 +9,7 @@
             {{> elements_selectableUnit}}
         {{else}}
             <span>
-                {{unit}}
+                Pirl
             </span>
         {{/if}}
     </span>

diff --git a/app/client/templates/elements/selectableUnit.js b/app/client/templates/elements/selectableUnit.js
@@ -21,19 +21,19 @@ selectableUnits = [{
     value: 'ether'
 },
 {
-    text: 'FINNEY', //(µΞ)
+    text: 'PIRL', //(µΞ)
     value: 'finney'
 },
 {
-    text: 'BTC',
+    text: 'PIRL',
     value: 'btc'
 },
 {
-    text: 'USD',
+    text: 'PIRL',
     value: 'usd'
 },
 {
-    text: 'EUR',
+    text: 'PIRL',
     value: 'eur'
 },
 {

diff --git a/app/client/templates/views/account.html b/app/client/templates/views/account.html
@@ -127,27 +127,9 @@ <h3>{{i18n "wallet.app.texts.note"}}</h3>
                             </a>
                         </li>
 
-                        {{#if $eq ($.Session.get "network") "main"}}
-                            <li>
-                                <a href="https://shapeshift.io/shifty.html?destination={{address}}&amp;output=ETH&amp;apiKey=ef8312d8c9b9dda64fb852e8683eac6c33123f8743ff11383fb3bab29a364c01c27343fced4e628db8d5d66d763565763f8699c0fc903ec23db31cb908a944c8" target="_popup" data-popup-width="" data-popup-height="">
-                                    <i class="icon-bitcoin"></i>
-                                    {{i18n "wallet.accounts.buttons.depositBitcoin"}}
-                                </a>
-                            </li>  
-                        {{/if}}
-
-                        {{#if $eq ($.Session.get "network") "main"}}
-                            <li>
-                                <button class="deposit-using-coinbase">
-                                    <i class="icon-credit-card"></i>
-                                    {{i18n "wallet.accounts.buttons.depositUsingCreditCard"}}
-                                </button>
-                            </li>  
-                        {{/if}}
-
                         {{#if $eq ($.Session.get "network") "main"}}
                         <li>
-                            <a href="https://etherscan.io/address/{{address}}">
+                            <a href="https://explorer.pirl.io/#/address/{{address}}">
                                 <i class="icon-info"></i>
                                 {{i18n "wallet.accounts.buttons.viewOnExplorer"}}
                             </a>

diff --git a/app/client/templates/views/dashboard.html b/app/client/templates/views/dashboard.html
@@ -2,7 +2,7 @@
     <div class="dapp-container">
 
         <h1>{{{i18n "wallet.accounts.title"}}}</h1>
-
+        <div class="row">            
         {{#if pendingConfirmations}}
             <h2>{{i18n 'wallet.transactions.pendingConfirmations'}}</h2>
 
@@ -11,12 +11,11 @@ <h2>{{i18n 'wallet.transactions.pendingConfirmations'}}</h2>
         {{/if}}
 
         {{#if hasAccounts}}
-
+            <div class="col col-6">
             <h2>{{i18n "wallet.accounts.accountsTitle"}}</h2>
             <p>
                 {{i18n "wallet.accounts.accountsDescription"}}
             </p>
-            <div class="dapp-clear-fix"></div>
 
             <div class="wallet-box-list">
                 {{#each accounts}}
@@ -33,7 +32,8 @@ <h3>{{i18n "wallet.app.buttons.addAccount"}}</h3>
                 </button>
             {{/if}}
 
-
+            </div>
+            <div class="col col-6">                
             <h2>{{i18n "wallet.accounts.walletsTitle"}}</h2>
 
             {{#if hasMinimumBalance}}
@@ -62,9 +62,10 @@ <h2>{{i18n "wallet.accounts.walletsTitle"}}</h2>
                     <h3>{{i18n "wallet.app.buttons.addWallet"}}</h3>
                 </a>
             {{/if}}
-
+        </div>
         {{else}}
-            <div class="col col-5 mobile-full ">
+        <div class="col-6">
+            <div class="col col-6 mobile-full ">
                 <br>
                 {{#if isMist}}
                     <button class="wallet-box create account">
@@ -75,23 +76,24 @@ <h3>{{i18n "wallet.app.buttons.addAccount"}}</h3>
                     </button>
                 {{/if}}
             </div>
-            <div class="col col-5 mobile-full ">
+            <div class="col col-6 mobile-full ">
                 <h3>{{i18n "wallet.app.texts.noAccounts.title"}}</h3>
                 <p>{{i18n "wallet.app.texts.noAccounts.text"}}</p>
             </div>
+        </div>
         {{/if}}
+        </div>
 
-        <div class="dapp-clear-fix"></div>
-
-
+        <div class="row">
+
         {{#if allTransactions}}
             <h2>{{i18n 'wallet.transactions.latest'}}</h2>
 
             {{> elements_transactions_table limit=5}}
 
         {{else}}
-
             <h2>{{i18n 'wallet.transactions.none'}}</h2>
         {{/if}}
+        </div>
     </div>
 </template>
diff --git a/app/client/templates/views/modals/eventInfo.html b/app/client/templates/views/modals/eventInfo.html
@@ -52,10 +52,10 @@ <h1>
                     <td>{{i18n "wallet.events.transactionHash"}}</td>
                     <td>
                         {{#if $eq ($.Session.get "network") "main"}} 
-                            <a href="http://etherscan.io/tx/{{transactionHash}}" target="_blank">{{transactionHash.substr 0 40}}...</a>
+                            <a href="http://explorer.pirl.io/#/tx/{{transactionHash}}" target="_blank">{{transactionHash.substr 0 40}}...</a>
                         {{else}}
                             {{#if $eq ($.Session.get "network") "test"}}
-                                <a href="http://ropsten.etherscan.io/tx/{{transactionHash}}" target="_blank">{{transactionHash.substr 0 40}}...</a>
+                                <a href="http://ropsten.explorer.pirl.io/#/tx/{{transactionHash}}" target="_blank">{{transactionHash.substr 0 40}}...</a>
                             {{else}}
                                 {{transactionHash.substr 0 40}}...
                             {{/if}}
@@ -66,14 +66,14 @@ <h1>
                     <td>{{i18n "wallet.events.block"}}</td>
                     <td>
                        {{#if $eq ($.Session.get "network") "main"}} 
-                        <a href="http://etherscan.io/block/{{blockHash}}" title="{{blockHash}}" target="_blank" class="dapp-shorten-text">
+                        <a href="http://explorer.pirl.io/#/block/{{blockHash}}" title="{{blockHash}}" target="_blank" class="dapp-shorten-text">
                             {{blockNumber}}
                             <br>
                             {{blockHash.substr 0 40}}...
                         </a>
                         {{else}}
                             {{#if $eq ($.Session.get "network") "test"}}
-                            <a href="http://ropsten.etherscan.io/block/{{blockHash}}" title="{{blockHash}}" target="_blank" class="dapp-shorten-text">
+                            <a href="http://ropsten.explorer.pirl.io/#/block/{{blockHash}}" title="{{blockHash}}" target="_blank" class="dapp-shorten-text">
                                 {{blockNumber}}
                                 <br>
                                 {{blockHash.substr 0 40}}...

diff --git a/app/client/templates/views/modals/transactionInfo.html b/app/client/templates/views/modals/transactionInfo.html
@@ -3,13 +3,13 @@
         <h1>
             {{i18n "wallet.transactions.transactionInfoTitle"}}
             {{#if $eq ($.Session.get "network") "main"}} 
-                <a href="http://etherscan.io/tx/{{transactionHash}}" target="_blank" style="font-size: 0.4em;">{{transactionHash}}</a>
+                <a href="http://explorer.pirl.io/#/tx/{{transactionHash}}" target="_blank" style="font-size: 0.4em;">{{transactionHash}}</a>
             {{else}}
                 {{#if $eq ($.Session.get "network") "rinkeby"}}
-                    <a href="http://rinkeby.etherscan.io/tx/{{transactionHash}}" target="_blank" style="font-size: 0.4em;">{{transactionHash}}</a>
+                    <a href="http://rinkeby.explorer.pirl.io/#/tx/{{transactionHash}}" target="_blank" style="font-size: 0.4em;">{{transactionHash}}</a>
                 {{else}}
                     {{#if $eq ($.Session.get "network") "ropsten"}}
-                        <a href="http://ropsten.etherscan.io/tx/{{transactionHash}}" target="_blank" style="font-size: 0.4em;">{{transactionHash}}</a>
+                        <a href="http://ropsten.explorer.pirl.io/#/tx/{{transactionHash}}" target="_blank" style="font-size: 0.4em;">{{transactionHash}}</a>
                     {{else}}
                         <span style="font-size: 0.4em;">{{transactionHash}}</span>
                     {{/if}}
@@ -84,14 +84,14 @@ <h3 class="orange">
                         <td>{{i18n "wallet.transactions.block"}}</td>
                         <td>
                            {{#if $eq ($.Session.get "network") "main"}} 
-                            <a href="http://etherscan.io/block/{{blockHash}}" title="{{blockHash}}" target="_blank" class="dapp-shorten-text">
+                            <a href="http://explorer.pirl.io/#/block/{{blockHash}}" title="{{blockHash}}" target="_blank" class="dapp-shorten-text">
                                 {{blockNumber}}
                                 <br>
                                 {{blockHash.substr 0 40}}...
                             </a>
                             {{else}}
                                 {{#if $eq ($.Session.get "network") "test"}}
-                                <a href="http://ropsten.etherscan.io/block/{{blockHash}}" title="{{blockHash}}" target="_blank" class="dapp-shorten-text">
+                                <a href="http://ropsten.explorer.pirl.io/#/block/{{blockHash}}" title="{{blockHash}}" target="_blank" class="dapp-shorten-text">
                                     {{blockNumber}}
                                     <br>
                                     {{blockHash.substr 0 40}}...

diff --git a/app/client/templates/views/send.html b/app/client/templates/views/send.html
@@ -79,7 +79,7 @@ <h3>{{i18n 'wallet.send.amount'}}</h3>
                             <input type="radio" id="ether" value="ether" name="choose-token" {{tokenSelectedAttr 'ether'}}>
                             <label for="ether">
                                 <span class="ether-symbol">Ξ</span>
-                                <span class="token-name">ETHER</span>
+                                <span class="token-name">Pirl</span>
                                 <span class="balance">
                                     {{#if $neq unit 'ether'}}
                                         {{dapp_formatBalance selectedAccount.balance "0,0.00 UNIT"}} ({{dapp_formatBalance selectedAccount.balance "0,0.00[0000000000000000] UNIT" "ether"}})
@@ -105,7 +105,7 @@ <h3>{{i18n 'wallet.send.amount'}}</h3>
                 {{else}}
                     <div class="token-ether">
                         <span class="ether-symbol">Ξ</span>
-                        <span class="token-name">ETHER</span>
+                        <span class="token-name">Pirl</span>
                         <span class="balance">
                             {{#if $neq unit 'ether'}}
                                 {{dapp_formatBalance selectedAccount.balance "0,0.00 UNIT"}} ({{dapp_formatBalance selectedAccount.balance "0,0.00[0000000000000000] UNIT" "ether"}})

diff --git a/app/i18n/wallet.de.i18n.json b/app/i18n/wallet.de.i18n.json
@@ -93,7 +93,7 @@
             "buttons": {
                 "deposit": "Pirl hinterlegen",
                 "depositBitcoin": "Pirl mit Bitcoin hinterlegen",
-                "viewOnExplorer": "View on Etherscan",
+                "viewOnExplorer": "View on PirlDiver",
                 "copyAddress": "Adresse kopieren",
                 "scanQRCode": "QR-Code anzeigen",
                 "showInterface": "Interface anzeigen"

diff --git a/app/i18n/wallet.en.i18n.json b/app/i18n/wallet.en.i18n.json
@@ -96,7 +96,7 @@
                 "deposit": "Transfer Pirl & Tokens",
                 "depositBitcoin": "Fund with Bitcoin",
                 "depositUsingCreditCard": "Fund with a Credit Card (U.S. only)",
-                "viewOnExplorer": "View on Etherscan",
+                "viewOnExplorer": "View on PirlDiver",
                 "copyAddress": "Copy address",
                 "scanQRCode": "Show QR-Code",
                 "showInterface": "Show Interface"

diff --git a/app/i18n/wallet.es.i18n.json b/app/i18n/wallet.es.i18n.json
@@ -90,7 +90,7 @@
             "buttons": {
                 "deposit": "Deposit Pirl",
                 "depositBitcoin": "Deposit using Bitcoin",
-                "viewOnExplorer": "View on Etherscan",
+                "viewOnExplorer": "View on PirlDiver",
                 "copyAddress": "Copy address",
                 "scanQRCode": "Show QR-Code",
                 "showInterface": "Show Interface"

diff --git a/app/i18n/wallet.fr.i18n.json b/app/i18n/wallet.fr.i18n.json
@@ -90,7 +90,7 @@
             "buttons": {
                 "deposit": "Déposer de l'Pirl",
                 "depositBitcoin": "Déposer via du Bitcoin",
-                "viewOnExplorer": "View on Etherscan",
+                "viewOnExplorer": "View on PirlDiver",
                 "copyAddress": "Copier l'adresse",
                 "scanQRCode": "Afficher le QR Code",
                 "showInterface": "Afficher l'interface"

diff --git a/app/i18n/wallet.ja.i18n.json b/app/i18n/wallet.ja.i18n.json
@@ -37,7 +37,7 @@
                 }
             },
             "error": {
-                "wrongChain": "間違ったチェーン上にいます。Ethereum Wallet App を再起動して下さい。"
+                "wrongChain": "間違ったチェーン上にいます。Oystr Wallet App を再起動して下さい。"
             },
             "warnings": {
                 "txOriginVulnerabilityWallet": "このスマート契約財布は、古いコードを持っており、フィッシング攻撃の対象となります。",
@@ -90,7 +90,7 @@
             "buttons": {
                 "deposit": "Etherをデポジット",
                 "depositBitcoin": "Bitcoinを使ってデポジット",
-                "viewOnExplorer": "View on Etherscan",
+                "viewOnExplorer": "View on PirlDiver",
                 "copyAddress": "アドレスをコピー",
                 "scanQRCode": "QRコードを表示",
                 "showInterface": "インターフェイスを表示"

diff --git a/app/i18n/wallet.ko.i18n.json b/app/i18n/wallet.ko.i18n.json
@@ -92,7 +92,7 @@
             "buttons": {
                 "deposit": "이더 입금",
                 "depositBitcoin": "비트코인을 사용한 입금",
-                "viewOnExplorer": "View on Etherscan",
+                "viewOnExplorer": "View on PirlDiver",
                 "copyAddress": "주소 복사",
                 "scanQRCode": "QR 코드 보기",
                 "showInterface": "인터페이스 보기"

diff --git a/app/i18n/wallet.pt.i18n.json b/app/i18n/wallet.pt.i18n.json
@@ -95,7 +95,7 @@
             "buttons": {
                 "deposit": "Depositar Pirl",
                 "depositBitcoin": "Depositar com Bitcoin",
-                "viewOnExplorer": "Ver no Etherscan",
+                "viewOnExplorer": "Ver no PirlDiver",
                 "copyAddress": "Copiar endereço",
                 "scanQRCode": "Mostrar código QR",
                 "showInterface": "Mostrar Interface"

diff --git a/app/i18n/wallet.ro.i18n.json b/app/i18n/wallet.ro.i18n.json
@@ -90,7 +90,7 @@
             "buttons": {
                 "deposit": "Depunere",
                 "depositBitcoin": "Depunere Bitcoin",
-                "viewOnExplorer": "View on Etherscan",
+                "viewOnExplorer": "View on PirlDiver",
                 "copyAddress": "Copiaza adresa",
                 "scanQRCode": "Arata QR-Code",
                 "showInterface": "Arata Interfata"

diff --git a/app/i18n/wallet.ru.i18n.json b/app/i18n/wallet.ru.i18n.json
@@ -92,7 +92,7 @@
             "buttons": {
                 "deposit": "Пополнить Эфиром",
                 "depositBitcoin": "Пополнить используя Биткоин",
-                "viewOnExplorer": "View on Etherscan",
+                "viewOnExplorer": "View on PirlDiver",
                 "copyAddress": "Копировать адрес",
                 "scanQRCode": "Показать QR-Код",
                 "showInterface": "Показать Интерфейс"

diff --git a/app/i18n/wallet.ua.i18n.json b/app/i18n/wallet.ua.i18n.json
@@ -83,7 +83,7 @@
             "buttons": {
                 "deposit": "Поповнити Ефіріум",
                 "depositBitcoin": "Поповнити за допомогою Біткоїнів",
-                "viewOnExplorer": "View on Etherscan",
+                "viewOnExplorer": "View on PirlDiver",
                 "copyAddress": "Копіювати адресу",
                 "scanQRCode": "Показати QR-код",
                 "showInterface": "Показати інтерфейс"

diff --git a/app/i18n/wallet.zh-TW.i18n.json b/app/i18n/wallet.zh-TW.i18n.json
@@ -92,7 +92,7 @@
             "buttons": {
                 "deposit": "存入 Pirl",
                 "depositBitcoin": "使用 Bitcoin 做存款",
-                "viewOnExplorer": "View on Etherscan",
+                "viewOnExplorer": "View on PirlDiver",
                 "copyAddress": "複製位址",
                 "scanQRCode": "顯示二維條碼",
                 "showInterface": "顯示界面"

diff --git a/app/i18n/wallet.zh.i18n.json b/app/i18n/wallet.zh.i18n.json
@@ -95,7 +95,7 @@
             "buttons": {
                 "deposit": "存入以太币",
                 "depositBitcoin": "使用比特币做存款",
-                "viewOnExplorer": "View on Etherscan",
+                "viewOnExplorer": "View on PirlDiver",
                 "copyAddress": "复制地址",
                 "scanQRCode": "显示二维码",
                 "showInterface": "显示界面"

diff --git a/app/public/i18n/de.json b/app/public/i18n/de.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ @@
                 {{> elements_selectableUnit}}
             {{else}}
                 <span>
-                    {{unit}}
+                    Pirl
                 </span>
             {{/if}}
         </span>
@@ Expand Down @@