Merge pull request #3496 from xiangxn/fix-3490

Fix credit offer repayment period "No limit" #3490

Author: sschiessl-bcp

app/actions/CreditOfferActions.js

@@ -4,19 +4,18 @@ import moment from "moment";
 import {Asset} from "../lib/common/MarketClasses";
 import WalletDb from "../stores/WalletDb";
 import {Apis} from "bitsharesjs-ws";
+import humanizeDuration from "humanize-duration";
 
 export const FEE_RATE_DENOM = 1000000; // Denominator for SameT Fund fee calculation
 export const listRepayPeriod = [43200, 86400, 259200, 604800, 2592000, 7776000];
 
-export const parsingTime = (time, uints = ["day", "hour", "minute"]) => {
-    let str = "";
-    let days = Math.floor(time / 86400);
-    if (days > 0) str = days + uints[0];
-    let hours = Math.floor((time % 86400) / 3600);
-    if (hours > 0) str = str + hours + uints[1];
-    let minute = Math.floor(((time % 86400) % 3600) / 60);
-    if (minute > 0) str = str + minute + uints[2];
-    return str;
+export const parsingTime = (time, locale) => {
+    if (locale === "zh") locale = "zh_CN";
+    return humanizeDuration(parseInt(time) * 1000, {
+        language: locale,
+        delimiter: " ",
+        units: ["d", "h", "m"]
+    });
 };
 
 class CreditOfferActions {

app/assets/locales/locale-en.json

@@ -3038,9 +3038,6 @@
             "period_4": "30 Days",
             "period_5": "90 days"
         },
-        "uint_day": "Days",
-        "uint_hour": "Hours",
-        "uint_minute": "Minutes",
         "info_borrow_err": "Can't borrow from oneself ！",
         "asset": "Asset",
         "total_amount": "Total",

app/assets/locales/locale-zh.json

@@ -3027,9 +3027,6 @@
             "period_4": "30天",
             "period_5": "90天"
         },
-        "uint_day": "天",
-        "uint_hour": "时",
-        "uint_minute": "分",
         "info_borrow_err": "不能向自己借款！",
         "asset": "资产",
         "total_amount": "总数量",

app/components/Account/CreditOffer/CreditOfferList.jsx

@@ -14,12 +14,13 @@ import CreateModal from "./CreateModal";
 import EditModal from "./EditModal";
 import CreditOfferActions, {
     FEE_RATE_DENOM,
-    listRepayPeriod
+    parsingTime
 } from "../../../actions/CreditOfferActions";
 import CreditOfferStore from "../../../stores/CreditOfferStore";
 import LinkToAssetById from "../../Utility/LinkToAssetById";
 import FormattedAsset from "../../Utility/FormattedAsset";
 import moment from "moment";
+import IntlStore from "stores/IntlStore";
 
 class CreditOfferList extends React.Component {
     constructor(props) {
@@ -77,14 +78,6 @@ class CreditOfferList extends React.Component {
         }
     }
 
-    _getUnits() {
-        return [
-            counterpart.translate("credit_offer.uint_day"),
-            counterpart.translate("credit_offer.uint_hour"),
-            counterpart.translate("credit_offer.uint_minute")
-        ];
-    }
-
     _getColumns() {
         let header = [
             {
@@ -151,7 +144,7 @@ class CreditOfferList extends React.Component {
                 title: counterpart.translate("credit_offer.repay_period"),
                 dataIndex: "max_duration_seconds",
                 render: item => {
-                    return parsingTime(item, this._getUnits());
+                    return parsingTime(item, this.props.locale);
                 }
             },
             {
@@ -304,13 +297,14 @@ class CreditOfferList extends React.Component {
 
 CreditOfferList = connect(CreditOfferList, {
     listenTo() {
-        return [AccountStore, CreditOfferStore];
+        return [AccountStore, CreditOfferStore, IntlStore];
     },
     getProps(props) {
         return {
             currentAccount: AccountStore.getState().currentAccount,
             passwordAccount: AccountStore.getState().passwordAccount,
-            listByOwner: CreditOfferStore.getState().listByOwner
+            listByOwner: CreditOfferStore.getState().listByOwner,
+            locale: IntlStore.getState().currentLocale
         };
     }
 });

app/components/Account/CreditOffer/CreditOfferPage.jsx

@@ -17,7 +17,6 @@ import moment from "moment";
 import utils from "../../../lib/common/utils";
 import CreditOfferActions, {
     FEE_RATE_DENOM,
-    listRepayPeriod,
     parsingTime
 } from "../../../actions/CreditOfferActions";
 
@@ -31,6 +30,7 @@ import Translate from "react-translate-component";
 import FeeAssetSelector from "../../Utility/FeeAssetSelector";
 import {checkBalance} from "common/trxHelper";
 import notify from "actions/NotificationActions";
+import IntlStore from "stores/IntlStore";
 
 const getUninitializedFeeAmount = () =>
     new Asset({amount: 0, asset_id: "1.3.0"});
@@ -150,15 +150,9 @@ class CreditOfferPage extends React.Component {
         return aAsset - bAsset;
     }
 
-    _getUnits() {
-        return [
-            counterpart.translate("credit_offer.uint_day"),
-            counterpart.translate("credit_offer.uint_hour"),
-            counterpart.translate("credit_offer.uint_minute")
-        ];
-    }
-
     _getColumns() {
+        let {locale} = this.props;
+        if (locale === "zh") locale = "zh_CN";
         return [
             {
                 title: "ID",
@@ -253,7 +247,7 @@ class CreditOfferPage extends React.Component {
                 sorter: (a, b) =>
                     a.max_duration_seconds - b.max_duration_seconds,
                 render: item => {
-                    return parsingTime(item, this._getUnits());
+                    return parsingTime(item, locale);
                 }
             },
             {
@@ -583,7 +577,7 @@ class CreditOfferPage extends React.Component {
                             >
                                 {parsingTime(
                                     info.max_duration_seconds,
-                                    this._getUnits()
+                                    this.props.locale
                                 )}
                             </div>
                         </Form.Item>
@@ -716,13 +710,14 @@ class CreditOfferPage extends React.Component {
 
 CreditOfferPage = connect(CreditOfferPage, {
     listenTo() {
-        return [AccountStore, CreditOfferStore];
+        return [AccountStore, CreditOfferStore, IntlStore];
     },
     getProps(props) {
         return {
             currentAccount: AccountStore.getState().currentAccount,
             passwordAccount: AccountStore.getState().passwordAccount,
-            allList: CreditOfferStore.getState().allList
+            allList: CreditOfferStore.getState().allList,
+            locale: IntlStore.getState().currentLocale
         };
     }
 });

package.json

@@ -161,6 +161,7 @@
         "handlebars": "^4.7.7",
         "hirestime": "^3.2.1",
         "html2canvas": "^1.3.3",
+        "humanize-duration": "^3.27.1",
         "ifvisible": "^1.1.0",
         "immutable": "3.8.2",
         "indexeddbshim": "^2.2.1",

yarn.lock

@@ -6279,6 +6279,11 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
+humanize-duration@^3.27.1:
+  version "3.27.1"
+  resolved "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.27.1.tgz#2cd4ea4b03bd92184aee6d90d77a8f3d7628df69"
+  integrity sha512-jCVkMl+EaM80rrMrAPl96SGG4NRac53UyI1o/yAzebDntEY6K6/Fj2HOjdPg8omTqIe5Y0wPBai2q5xXrIbarA==
+
 husky@^0.14.3:
   version "0.14.3"
   resolved "https://registry.yarnpkg.com/husky/-/husky-0.14.3.tgz#c69ed74e2d2779769a17ba8399b54ce0b63c12c3"