Show credit offer rate table (#3443)

xiangxn · web-flow · commit 76c92a8df1f4 · 2022-01-19T21:04:13.000+01:00
show credit offer rate table
diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
@@ -2594,7 +2594,12 @@
             "witness_create": "Create witness",
             "witness_update": "Update witness",
             "witness_withdraw_pay": "Witness pay withdrawal",
-            "worker_create": "Create worker"
+            "worker_create": "Create worker",
+            "credit_offer_create": "Create credit offer",
+            "credit_offer_delete": "Delete credit offer",
+            "credit_offer_update": "Update credit offer",
+            "credit_offer_accept": "Accept credit offer",
+            "credit_deal_repay": "Repay credit deal"
         },
         "vesting_balance_create": "created vesting balance of",
         "view_json": "Show raw json",
diff --git a/app/assets/locales/locale-zh.json b/app/assets/locales/locale-zh.json
@@ -2594,7 +2594,12 @@
             "witness_create": "创建见证人",
             "witness_update": "更新见证人",
             "witness_withdraw_pay": "领取见证人报酬",
-            "worker_create": "创建预算项目"
+            "worker_create": "创建预算项目",
+            "credit_offer_create": "P2P抵押贷 创建",
+            "credit_offer_delete": "P2P抵押贷 删除",
+            "credit_offer_update": "P2P抵押贷 更新",
+            "credit_offer_accept": "P2P抵押贷 借款",
+            "credit_deal_repay": "P2P抵押贷 还款"
         },
         "vesting_balance_create": "创建待解冻余额",
         "view_json": "显示原始 json",
diff --git a/app/components/Blockchain/Fees.jsx b/app/components/Blockchain/Fees.jsx
@@ -15,7 +15,7 @@ let ops = Object.keys(operations);
 
 // Define groups and their corresponding operation ids
 let fee_grouping = {
-    general: [0, 25, 26, 27, 28, 32, 33, 37, 39, 41, 49, 50, 52],
+    general: [0, 25, 26, 27, 28, 32, 33, 37, 39, 41, 49, 50, 52, 69, 70, 71, 72, 73],
     asset: [10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 38, 43, 44, 47, 48],
     market: [1, 2, 3, 4, 45, 46],
     account: [5, 6, 7, 8, 9],
diff --git a/package.json b/package.json
@@ -148,7 +148,7 @@
         "bignumber.js": "^4.0.0",
         "bitshares-report": "https://github.com/bitshares/bitshares-report.git",
         "bitshares-ui-style-guide": "https://github.com/bitshares/bitshares-ui-style-guide.git",
-        "bitsharesjs": "^6.0.0-rc1",
+        "bitsharesjs": "https://github.com/bitshares/bitsharesjs.git#develop",
         "browser-locale": "^1.0.3",
         "classnames": "^2.2.1",
         "constants-browserify": "^1.0.0",
diff --git a/yarn.lock b/yarn.lock
@@ -2692,10 +2692,9 @@ bitsharesjs-ws@^6.0.0-rc1:
     isomorphic-ws "^4.0.1"
     ws "^8.4.0"
 
-bitsharesjs@^6.0.0-rc1:
+"bitsharesjs@https://github.com/bitshares/bitsharesjs.git#develop":
   version "6.0.0-rc1"
-  resolved "https://registry.yarnpkg.com/bitsharesjs/-/bitsharesjs-6.0.0-rc1.tgz#2b063c74e13b725e471a57a7795c369374d60f0e"
-  integrity sha512-AB0rMQa+Z1uXthtLUKdLlACGsXSiqk0j5OS8Qz7Gl+fLfdgitf5d+W0uwAl4CjwmefQaKqxAizf32KSAyg+mBQ==
+  resolved "https://github.com/bitshares/bitsharesjs.git#6e440841b2addb4d33b3eec80bc3298f4cbcbe12"
   dependencies:
     bigi "^1.4.2"
     bitsharesjs-ws "^6.0.0-rc1"
