Merge branch 'release' into develop

Conflicts: bower.json package.json src/jade/tabs/aud.jade src/jade/tabs/nzd.jade src/js/entry/web.js src/templates/tabs/account.jade src/templates/tabs/advanced.jade src/templates/tabs/contacts.jade src/templates/tabs/fund/menu.jade src/templates/tabs/security.jade src/templates/tabs/settingstrade.jade
ripple · Apr 16, 2015 · 06810f0 · 06810f0
2 parents 1b7888b + 1c9cd87
commit 06810f0
Show file tree

Hide file tree

Showing 32 changed files with 190 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "ripple-client",
   "dependencies": {
-    "ripple": "~0.12.2-rc1",
+    "ripple": "~0.12.3",
     "ripple-vault-client": "~0.4.7",
     "angular": "~1.3.12",
     "angular-messages": "~1.3.12",

diff --git a/deps/gateways.json b/deps/gateways.json
@@ -76,13 +76,6 @@
             "currencies": ["XAU", "XAG", "XPT", "SGD"],
             "hotwallets": []
             }]
-    }, {
-        "name": "RippleTradeJapan",
-        "accounts": [{
-            "address": "rMAz5ZnK73nyNUL4foAvaxdreczCkG3vA6",
-            "currencies": ["JPY"],
-            "hotwallets": []
-            }]
     }, {
         "name": "Bitso",
         "accounts": [{

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ripple-client",
-  "version": "1.4.0-2",
+  "version": "1.4.0-4",
   "description": "Trade client for the Ripple payment network",
   "author": {
     "name": "Ripple Labs, Inc.",

diff --git a/src/jade/tabs/banner/rtjapan.jade b/src/jade/tabs/banner/rtjapan.jade
@@ -0,0 +1,4 @@
+div.warning-attention.banner
+  h4(l10n) 警告
+  p(l10n) リップルトレードジャパンをゲイトウェイとして使用しないことをお勧めします。
+    | 最近の出来事から判断しまして、リップルトレードジャパンを使用すると、資金が失われる可能性があります。
diff --git a/src/jade/tabs/banner/rtjapanrippling.jade b/src/jade/tabs/banner/rtjapanrippling.jade
@@ -0,0 +1,8 @@
+div.warning-attention.banner
+  h4(l10n) 警告
+  p(l10n) 資金を保護するために、リップルトレードジャパンへのリップリングを無効にすることをお勧めします。
+    | 無効化するには
+    a(href='#/advanced') 設定 &#62; 詳細
+    | をクリックし、与信限度額の「Advanced Settings」が「表示」になっていることを確認して下さい。その後、
+    a(href='#/trust') 資金 &#62; ゲイトウェイ
+    | ページで、リップルトレードジャパン(rMAz5ZnK73nyNUL4foAvaxdreczCkG3vA6)との Rippling がオフになっていることをご確認下さい。
diff --git a/src/js/controllers/app.controller.js b/src/js/controllers/app.controller.js
@@ -175,6 +175,17 @@ function AppCtrl ($scope, id, net, keychain, txQueue, appManager, rpTracker,
           });
 
           $scope.lines[line.account + line.currency] = line;
+
+          // TEMPORARY: Check if user has trust to RippleTradeJapan to display banner
+          $scope.hasRTJapanTrust = false;
+          $scope.hasRTJapanTrustWithRippling = false;
+          if (line.account === 'rMAz5ZnK73nyNUL4foAvaxdreczCkG3vA6') {
+            $scope.hasRTJapanTrust = true;
+            if (!line.no_ripple || !line.no_ripple_peer) {
+              $scope.hasRTJapanTrustWithRippling = true;
+            }
+          }
+
           updateRippleBalance(line.currency, line.account, line.balance);
         }
       }
@@ -431,6 +442,7 @@ function AppCtrl ($scope, id, net, keychain, txQueue, appManager, rpTracker,
       $scope.offers[""+offer.seq] = offer;
     } else {
       delete $scope.offers[""+offer.seq];
+
     }
   }
 

diff --git a/src/js/tabs/exchange.controller.js b/src/js/tabs/exchange.controller.js
@@ -191,7 +191,7 @@ ExchangeTab.prototype.angular = function (module)
                   var alt = {};
                   alt.amount   = Amount.from_json(raw.source_amount);
                   alt.rate     = alt.amount.ratio_human(amount);
-                  alt.send_max = alt.amount.product_human(Amount.from_human('1.001'));
+                  alt.send_max = alt.amount.scale('1.001');
                   alt.paths    = raw.paths_computed
                       ? raw.paths_computed
                       : raw.paths_canonical;

diff --git a/src/js/tabs/send.controller.js b/src/js/tabs/send.controller.js
@@ -797,7 +797,7 @@ SendTab.prototype.angular = function (module)
               var slightlyInFuture = new Date(+new Date() + 5 * 60000);
 
               alt.rate     = alt.amount.ratio_human(amount, {reference_date: slightlyInFuture});
-              alt.send_max = alt.amount.product_human(Amount.from_human('1.001'));
+              alt.send_max = alt.amount.scale('1.001');
               alt.paths    = raw.paths_computed || raw.paths_canonical;
 
               // Selected currency should be the first option

diff --git a/src/less/ripple/content.less b/src/less/ripple/content.less
@@ -521,6 +521,60 @@ a.danger {
   }
 }
 
+.warning-attention {
+  margin-bottom: 20px;
+  font-size: 13px;
+  background: @notification-error-background;
+  color: @notification-error-text;
+  border: 1px solid @notification-info-border;
+  padding: 15px;
+  h4 {
+    display: inline-block;
+    margin-top: 0;
+  }
+  .close {
+    display: inline-block;
+    font-size: 21px;
+    margin-top: -5px;
+    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+
+  }
+  .rounded(5px);
+  a{
+    text-decoration: underline;
+    &#hide {
+      margin-top: -8px;
+      display: inline-block;
+      font-size: 21px;
+      text-decoration: none;
+      color: #000;
+      opacity: 0.2;
+      font-family: "Helvetica Neue Bold";
+      font-weight: bold;
+      &:hover {
+        opacity: 0.5;
+      }
+    }
+    &:hover {
+      text-decoration: none;
+    }
+  }
+  ul {
+    margin-bottom: 0;
+    padding-left: 18px;
+  }
+  span {
+    font-family: OpenSansBold;
+  }
+  #announcement {
+    font-size: 13px;
+    font-weight: 400;
+    margin-bottom: -5px;
+    padding-left: 5px;
+    width: 90%;
+  }
+}
+
 .blank {
   visibility: hidden;
 }

diff --git a/src/templates/tabs/_usd.jade b/src/templates/tabs/_usd.jade
@@ -11,6 +11,10 @@ section.col-xs-12.content(ng-controller='UsdCtrl')
     include ../tabs/banner/unfunded
 
   .row(ng-show='connected')
+    div(ng-show='hasRTJapanTrust')
+      include banner/rtjapan
+    div(ng-show='hasRTJapanTrustWithRippling')
+      include banner/rtjapanrippling
     .col-sm-3
       include ../tabs/fund/menu
     form.col-sm-9.list#usdDepositForm(action="", method="post", name="usdDeposit"

diff --git a/src/templates/tabs/account.jade b/src/templates/tabs/account.jade
@@ -4,6 +4,10 @@ section.col-xs-12.content(ng-controller="AccountCtrl")
   .row(ng-show='!debug')
     div(ng-show="!loadingAccount && !account.Balance && loadState.account && connected")
       include ../tabs/banner/unfunded
+    div(ng-show='hasRTJapanTrust')
+      include banner/rtjapan
+    div(ng-show='hasRTJapanTrustWithRippling')
+      include banner/rtjapanrippling
     .col-sm-3
       include ../tabs/account/navbar
 

diff --git a/src/templates/tabs/advanced.jade b/src/templates/tabs/advanced.jade
@@ -3,6 +3,10 @@ section.col-xs-12.content(ng-controller="AdvancedCtrl")
 
   div(ng-show="!loadingAccount && !account.Balance && loadState.account && connected && !debug")
     include ../tabs/banner/unfunded
+  div(ng-show='hasRTJapanTrust')
+    include banner/rtjapan
+  div(ng-show='hasRTJapanTrustWithRippling')
+    include banner/rtjapanrippling
   .row(ng-show='!debug')
     .col-sm-12.notification-wrapper
       .alert.alert-success(ng-show="success.blobvault", l10n) Your blobvault has been changed successfully.

diff --git a/src/templates/tabs/balance.jade b/src/templates/tabs/balance.jade
@@ -16,6 +16,11 @@ section.col-xs-12.content(ng-controller='BalanceCtrl')
   div(ng-show='!loadingAccount && !account.Balance && loadState.account && connected')
     include ../tabs/banner/unfunded
 
+  div(ng-show='hasRTJapanTrust')
+    include banner/rtjapan
+  div(ng-show='hasRTJapanTrustWithRippling')
+    include banner/rtjapanrippling
+
   group(ng-show='connected && loadState.account')
     include ../tabs/banner/announcement
     .widgets.row

diff --git a/src/templates/tabs/brl.jade b/src/templates/tabs/brl.jade
@@ -10,6 +10,11 @@ section.col-xs-12.content(ng-controller='BrlCtrl')
   div(ng-show="!loadingAccount && !account.Balance && loadState.account && connected")
     include ../tabs/banner/unfunded
 
+  div(ng-show='hasRTJapanTrust')
+    include banner/rtjapan
+  div(ng-show='hasRTJapanTrustWithRippling')
+    include banner/rtjapanrippling
+
   .row(ng-show='connected')
     // Transaction errors coming from errors.js & transactionerror.jade
     .col-sm-12(ng-show='mode=="error" || mode=="granting" && account.Balance')

diff --git a/src/templates/tabs/btc.jade b/src/templates/tabs/btc.jade
@@ -13,6 +13,11 @@ section.col-xs-12.content(ng-controller='BtcCtrl')
   div(ng-show="!loadingAccount && !account.Balance && loadState.account && connected")
     include ../tabs/banner/unfunded
 
+  div(ng-show='hasRTJapanTrust')
+    include banner/rtjapan
+  div(ng-show='hasRTJapanTrustWithRippling')
+    include banner/rtjapanrippling
+
   group.mode-granted.wide(ng-show='notif !== "clear"', ng-hide='!notif')
     group(ng-switch="notif")
       group.result-success(ng-switch-when="success")

diff --git a/src/templates/tabs/contacts.jade b/src/templates/tabs/contacts.jade
@@ -3,6 +3,10 @@ section.col-xs-12.content(ng-controller="ContactsCtrl")
 
   div(ng-show="!loadingAccount && !account.Balance && loadState.account && connected && !debug")
     include ../tabs/banner/unfunded
+  div(ng-show='hasRTJapanTrust')
+    include banner/rtjapan
+  div(ng-show='hasRTJapanTrustWithRippling')
+    include banner/rtjapanrippling
   div(ng-hide='debug')
     .row
       .col-sm-12.notification-wrapper

diff --git a/src/templates/tabs/eur.jade b/src/templates/tabs/eur.jade
@@ -10,6 +10,11 @@ section.col-xs-12.content(ng-controller='EurCtrl')
   div(ng-show="!loadingAccount && !account.Balance && loadState.account && connected")
     include ../tabs/banner/unfunded
 
+  div(ng-show='hasRTJapanTrust')
+    include banner/rtjapan
+  div(ng-show='hasRTJapanTrustWithRippling')
+    include banner/rtjapanrippling
+
   .row(ng-show='connected')
     // Transaction errors coming from errors.js & transactionerror.jade
     .col-sm-12(ng-show='mode=="error" || mode=="granting" && account.Balance')

diff --git a/src/templates/tabs/exchange.jade b/src/templates/tabs/exchange.jade
@@ -14,6 +14,11 @@ section.col-xs-12.content(ng-controller="ExchangeCtrl")
     include ../tabs/banner/unfunded
     p.literal(l10n="err-you-must-be-funded-before-you-can-exchange-money", l10n) You have to be funded before you can submit an order.
 
+  div(ng-show='hasRTJapanTrust')
+    include banner/rtjapan
+  div(ng-show='hasRTJapanTrustWithRippling')
+    include banner/rtjapanrippling
+
   div(ng-show='debug') This page is not available in debug mode
 
   //- Connected

diff --git a/src/templates/tabs/fund.jade b/src/templates/tabs/fund.jade
@@ -10,6 +10,11 @@ section.col-xs-12.content(ng-controller='FundCtrl')
   div(ng-show="!loadingAccount && !account.Balance && loadState.account && connected")
     include ../tabs/banner/unfunded
 
+  div(ng-show='hasRTJapanTrust')
+    include banner/rtjapan
+  div(ng-show='hasRTJapanTrustWithRippling')
+    include banner/rtjapanrippling
+
   .row(ng-show='connected')
     .col-sm-3
       include ../tabs/fund/menu

diff --git a/src/templates/tabs/gold.jade b/src/templates/tabs/gold.jade
@@ -10,6 +10,11 @@ section.col-xs-12.content(ng-controller='GoldCtrl')
   div(ng-show="!loadingAccount && !account.Balance && loadState.account && connected")
     include ../tabs/banner/unfunded
 
+  div(ng-show='hasRTJapanTrust')
+    include banner/rtjapan
+  div(ng-show='hasRTJapanTrustWithRippling')
+    include banner/rtjapanrippling
+
   .row(ng-show='connected')
     // Transaction errors coming from errors.js & transactionerror.jade
     .col-sm-12(ng-show='mode=="error" || mode=="granting" && account.Balance')

diff --git a/src/templates/tabs/history.jade b/src/templates/tabs/history.jade
@@ -5,6 +5,11 @@ section.col-xs-12.content(ng-controller="HistoryCtrl")
     include ../tabs/banner/unfunded
     p.literal(l10n) Your account history is empty
 
+  div(ng-show='hasRTJapanTrust')
+    include banner/rtjapan
+  div(ng-show='hasRTJapanTrustWithRippling')
+    include banner/rtjapanrippling
+
   //- Connected
 
   group.row

diff --git a/src/templates/tabs/jpy.jade b/src/templates/tabs/jpy.jade
@@ -10,6 +10,11 @@ section.col-xs-12.content(ng-controller='JpyCtrl')
   div(ng-show="!loadingAccount && !account.Balance && loadState.account && connected")
     include ../tabs/banner/unfunded
 
+  div(ng-show='hasRTJapanTrust')
+    include banner/rtjapan
+  div(ng-show='hasRTJapanTrustWithRippling')
+    include banner/rtjapanrippling
+
   .row(ng-show='connected')
     // Transaction errors coming from errors.js & transactionerror.jade
     .col-sm-12(ng-show='mode=="error" || mode=="granting" && account.Balance')

diff --git a/src/templates/tabs/kyc.jade b/src/templates/tabs/kyc.jade
@@ -10,6 +10,11 @@ section.col-xs-12.content(ng-controller='KycCtrl')
   div(ng-show="!loadingAccount && !account.Balance && loadState.account && connected")
     include ../tabs/banner/unfunded
 
+  div(ng-show='hasRTJapanTrust')
+    include banner/rtjapan
+  div(ng-show='hasRTJapanTrustWithRippling')
+    include banner/rtjapanrippling
+
   div.auth-attention.banner(ng-hide="hideUsOnlyBanner")
     h4#announcement(l10n) Profile completion is only available to US residents.
     a.dismiss#hide(href="", ng-click="hideUsOnlyBanner=!hideUsOnlyBanner")  ×

diff --git a/src/templates/tabs/mxn.jade b/src/templates/tabs/mxn.jade
@@ -10,6 +10,11 @@ section.col-xs-12.content(ng-controller='MxnCtrl')
   div(ng-show="!loadingAccount && !account.Balance && loadState.account && connected")
     include ../tabs/banner/unfunded
 
+  div(ng-show='hasRTJapanTrust')
+    include banner/rtjapan
+  div(ng-show='hasRTJapanTrustWithRippling')
+    include banner/rtjapanrippling
+
   .row(ng-show='connected')
     // Transaction errors coming from errors.js & transactionerror.jade
     .col-sm-12(ng-show='mode=="error" || mode=="granting" && account.Balance')

diff --git a/src/templates/tabs/security.jade b/src/templates/tabs/security.jade
@@ -19,6 +19,10 @@ section.col-xs-12.content(ng-controller="SecurityCtrl")
         span(l10n) Entered password is wrong.
     div.col-xs-12(ng-show="!loadingAccount && !account.Balance && loadState.account && connected")
       include ../tabs/banner/unfunded
+    div(ng-show='hasRTJapanTrust')
+      include banner/rtjapan
+    div(ng-show='hasRTJapanTrustWithRippling')
+      include banner/rtjapanrippling
     .col-sm-12.error-wrapper
       .alert.alert-danger(ng-show="error", ng-switch="error")
         span(ng-switch-when="wrongpassword", l10n)

diff --git a/src/templates/tabs/send.jade b/src/templates/tabs/send.jade
@@ -15,6 +15,10 @@ section.col-xs-12.content(ng-controller='SendCtrl')
   div(ng-show="!loadingAccount && !account.Balance && loadState.account && connected")
     include ../tabs/banner/unfunded
     p.literal(l10n="err-you-must-be-funded-before-you-can-send-money", l10n) You have to be funded before you can send money
+  div(ng-show='hasRTJapanTrust')
+    include banner/rtjapan
+  div(ng-show='hasRTJapanTrustWithRippling')
+    include banner/rtjapanrippling
 
   div(ng-show='debug') This page is not available in debug mode
 

diff --git a/src/templates/tabs/settingstrade.jade b/src/templates/tabs/settingstrade.jade
@@ -3,6 +3,10 @@ section.col-xs-12.content(ng-controller="SettingsTradeCtrl")
 
   div(ng-show="!loadingAccount && !account.Balance && loadState.account && connected && !debug")
     include ../tabs/banner/unfunded
+  div(ng-show='hasRTJapanTrust')
+    include banner/rtjapan
+  div(ng-show='hasRTJapanTrustWithRippling')
+    include banner/rtjapanrippling
   .row(ng-show='!debug')
     .col-sm-12
     .col-sm-3

diff --git a/src/templates/tabs/sgd.jade b/src/templates/tabs/sgd.jade
@@ -10,6 +10,11 @@ section.col-xs-12.content(ng-controller='SgdCtrl')
   div(ng-show="!loadingAccount && !account.Balance && loadState.account && connected")
     include ../tabs/banner/unfunded
 
+  div(ng-show='hasRTJapanTrust')
+    include banner/rtjapan
+  div(ng-show='hasRTJapanTrustWithRippling')
+    include banner/rtjapanrippling
+
   .row(ng-show='connected')
     // Transaction errors coming from errors.js & transactionerror.jade
     .col-sm-12(ng-show='mode=="error" || mode=="granting" && account.Balance')

diff --git a/src/templates/tabs/trade.jade b/src/templates/tabs/trade.jade
@@ -18,6 +18,11 @@ section.col-xs-12.content(ng-controller="TradeCtrl")
   div(ng-show="!loadingAccount && !account.Balance && loadState.account && connected && !debug")
     include ../tabs/banner/unfunded
 
+  div(ng-show='hasRTJapanTrust')
+    include banner/rtjapan
+  div(ng-show='hasRTJapanTrustWithRippling')
+    include banner/rtjapanrippling
+
   .row(ng-show='connected && !debug && loadState.offers')
     .widgets.hidden-xs.col-sm-4.col-md-4.col-lg-3
       include ../tabs/widgets/balances

diff --git a/src/templates/tabs/trust.jade b/src/templates/tabs/trust.jade
@@ -14,6 +14,11 @@ section.col-xs-12.content(ng-controller="TrustCtrl")
     div(ng-show="!loadingAccount && !account.Balance && loadState.account && connected")
       include ../tabs/banner/unfunded
 
+    div(ng-show='hasRTJapanTrust')
+      include banner/rtjapan
+    div(ng-show='hasRTJapanTrustWithRippling')
+      include banner/rtjapanrippling
+
     //- N1. Trust form
     .row
       // Transaction errors coming from errors.js & transactionerror.jade