Merge pull request #896 from ChronoBank/release

Release 0.9.10

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chronobank/mint",
-  "version": "0.9.8",
+  "version": "0.9.10",
   "description": "Control panel for ChronoBank",
   "private": true,
   "author": "chronobank",

packages/login/network/AbstractNode.js

@@ -4,7 +4,6 @@
  */
 
 import EventEmitter from 'events'
-import SockJS from 'sockjs-client'
 import Stomp from 'webstomp-client'
 
 const TIMEOUT_BASE = 1000
@@ -75,7 +74,7 @@ export default class AbstractNode extends EventEmitter {
     if (!this._socket) {
       return
     }
-    this._ws = new SockJS(this._socket.baseURL)
+    this._ws = new WebSocket(this._socket.baseURL)
     this._client = Stomp.over(this._ws, {
       heartbeat: false,
       debug: false,

packages/login/network/BitcoinNode.js

@@ -15,7 +15,7 @@ const BTC_MAINNET_NODE = new BitcoinMiddlewareNode({
     timeout: 10000,
   }),
   socket: {
-    baseURL: 'https://rabbitmq-webstomp.chronobank.io/stomp',
+    baseURL: 'wss://rabbitmq-prod-ws.chronobank.io/ws',
     user: 'rabbitmq_user',
     password: '38309100024',
     channels: {
@@ -33,7 +33,7 @@ export const BTC_TESTNET_NODE = new BitcoinMiddlewareNode({
     timeout: 10000,
   }),
   socket: {
-    baseURL: 'https://rabbitmq-webstomp.chronobank.io/stomp',
+    baseURL: 'wss://rabbitmq-stage-webstomp.chronobank.io/ws',
     user: 'rabbitmq_user',
     password: '38309100024',
     channels: {
@@ -83,7 +83,7 @@ export const LTC_MAINNET_NODE = new BitcoinMiddlewareNode({
     timeout: 10000,
   }),
   socket: {
-    baseURL: 'https://rabbitmq-webstomp.chronobank.io/stomp',
+    baseURL: 'wss://rabbitmq-prod-ws.chronobank.io/ws',
     user: 'rabbitmq_user',
     password: '38309100024',
     channels: {
@@ -101,7 +101,7 @@ export const LTC_TESTNET_NODE = new BitcoinMiddlewareNode({
     timeout: 10000,
   }),
   socket: {
-    baseURL: 'https://rabbitmq-webstomp.chronobank.io/stomp',
+    baseURL: 'wss://rabbitmq-stage-webstomp.chronobank.io/ws',
     user: 'rabbitmq_user',
     password: '38309100024',
     channels: {

packages/login/network/EthereumNode.js

@@ -4,8 +4,7 @@
  */
 
 import axios from 'axios'
-import Web3 from 'web3'
-import { LOCAL_ID, NETWORK_MAIN_ID } from './settings'
+import { NETWORK_MAIN_ID } from './settings'
 import EthereumMiddlewareNode from './EthereumMiddlewareNode'
 
 // TODO @dkchv: update to actual config
@@ -19,7 +18,7 @@ const ETHEREUM_TESTNET_NODE = new EthereumMiddlewareNode({
     timeout: 10000,
   }),
   socket: {
-    baseURL: 'https://rabbitmq-webstomp.chronobank.io/stomp',
+    baseURL: 'wss://rabbitmq-stage-webstomp.chronobank.io/ws',
     user: 'rabbitmq_user',
     password: '38309100024',
     channels: {
@@ -40,7 +39,7 @@ const ETHEREUM_MAINNET_NODE = new EthereumMiddlewareNode({
     timeout: 10000,
   }),
   socket: {
-    baseURL: 'https://rabbitmq-webstomp.chronobank.io/stomp',
+    baseURL: 'wss://rabbitmq-prod-ws.chronobank.io/ws',
     user: 'rabbitmq_user',
     password: '38309100024',
     channels: {
@@ -51,33 +50,10 @@ const ETHEREUM_MAINNET_NODE = new EthereumMiddlewareNode({
   trace: true,
 })
 
-const ETHEREUM_TESTRPC_NODE = new EthereumMiddlewareNode({
-  api: axios.create({
-    baseURL: 'http://localhost:8083',
-    timeout: 10000,
-  }),
-  twoFA: axios.create({
-    baseURL: 'http://localhost:8081',
-    timeout: 10000,
-  }),
-  socket: {
-    baseURL: 'http://localhost:15674/stomp',
-    user: 'guest',
-    password: 'guest',
-    channels: {
-      balance: '/exchange/events/localhost_balance',
-      events: '/exchange/events/localhost_chrono_sc',
-    },
-  },
-  trace: true,
-})
-
 export default function selectEthereumNode (engine) {
   switch (engine.getNetwork().id) {
     case NETWORK_MAIN_ID :
       return ETHEREUM_MAINNET_NODE
-    case LOCAL_ID:
-      return ETHEREUM_TESTRPC_NODE
     default:
       return ETHEREUM_TESTNET_NODE
   }

packages/login/network/NemNode.js

@@ -35,7 +35,7 @@ export const NEM_MAINNET_NODE = new NemMiddlewareNode({
     timeout: 30000,
   }),
   socket: {
-    baseURL: 'https://rabbitmq-webstomp.chronobank.io/stomp',
+    baseURL: 'wss://rabbitmq-prod-ws.chronobank.io/ws',
     user: 'rabbitmq_user',
     password: '38309100024',
     channels: {
@@ -74,7 +74,7 @@ export const NEM_TESTNET_NODE = new NemMiddlewareNode({
     timeout: 30000,
   }),
   socket: {
-    baseURL: 'https://rabbitmq-webstomp.chronobank.io/stomp',
+    baseURL: 'wss://rabbitmq-stage-webstomp.chronobank.io/ws',
     user: 'rabbitmq_user',
     password: '38309100024',
     channels: {

packages/login/network/WavesNode.js

@@ -4,16 +4,16 @@
  */
 
 import axios from 'axios'
-import WavesMiddlewareNode from './WavesMiddlewareNode'
 import * as WavesApi from '@waves/waves-api'
+import WavesMiddlewareNode from './WavesMiddlewareNode'
 
 export const WAVES_MAINNET_NODE = new WavesMiddlewareNode({
   api: axios.create({
     baseURL: 'https://middleware-waves-mainnet-rest.chronobank.io',
     timeout: 30000,
   }),
   socket: {
-    baseURL: 'https://rabbitmq-webstomp.chronobank.io/stomp',
+    baseURL: 'wss://rabbitmq-prod-ws.chronobank.io/ws',
     user: 'rabbitmq_user',
     password: '38309100024',
     channels: {
@@ -30,7 +30,7 @@ export const WAVES_TESTNET_NODE = new WavesMiddlewareNode({
     timeout: 30000,
   }),
   socket: {
-    baseURL: 'https://rabbitmq-webstomp.chronobank.io/stomp',
+    baseURL: 'wss://rabbitmq-stage-webstomp.chronobank.io/ws',
     user: 'rabbitmq_user',
     password: '38309100024',
     channels: {

src/layouts/partials/LocaleDropDown/LocaleDropDown.jsx

@@ -32,7 +32,7 @@ export default class LocaleDropDown extends PureComponent {
   static propTypes = {
     locale: PropTypes.string,
     onChangeLocale: PropTypes.func,
-    translations: PropTypes.arrayOf(PropTypes.object),
+    translations: PropTypes.objectOf(PropTypes.object),
   }
 
   constructor (props) {