From 49fe3ebbca28ba0bb8c551bde3337019739e9cd1 Mon Sep 17 00:00:00 2001 From: Jarindr Thitadilaka Date: Tue, 9 Jul 2019 17:47:30 +0700 Subject: [PATCH] Update v1.3 with v1.2.3 (#1110) * fix conflict * fix version name --- apps/activity_logger/mix.exs | 2 +- apps/admin_api/mix.exs | 2 +- apps/db/mix.exs | 2 +- apps/ewallet/config/config.exs | 2 +- apps/ewallet/mix.exs | 2 +- apps/ewallet_api/mix.exs | 2 +- apps/ewallet_config/mix.exs | 2 +- apps/ewallet_db/mix.exs | 2 +- apps/frontend/assets/src/omg-alert/reducer.js | 10 +++++++++- .../assets/src/omg-createNewPassword-form/index.js | 4 ++-- apps/frontend/assets/src/omg-session/reducer.js | 4 ++-- apps/frontend/mix.exs | 2 +- apps/load_tester/mix.exs | 2 +- apps/local_ledger/mix.exs | 2 +- apps/local_ledger_db/mix.exs | 2 +- apps/status/mix.exs | 2 +- apps/url_dispatcher/mix.exs | 2 +- apps/utils/mix.exs | 2 +- 18 files changed, 28 insertions(+), 20 deletions(-) diff --git a/apps/activity_logger/mix.exs b/apps/activity_logger/mix.exs index df5963141..817f688f1 100644 --- a/apps/activity_logger/mix.exs +++ b/apps/activity_logger/mix.exs @@ -4,7 +4,7 @@ defmodule ActivityLogger.MixProject do def project do [ app: :activity_logger, - version: "1.3.0-pre.0", + version: "1.3.0", build_path: "../../_build", config_path: "../../config/config.exs", deps_path: "../../deps", diff --git a/apps/admin_api/mix.exs b/apps/admin_api/mix.exs index f2d70861b..a499c0821 100644 --- a/apps/admin_api/mix.exs +++ b/apps/admin_api/mix.exs @@ -4,7 +4,7 @@ defmodule AdminAPI.Mixfile do def project do [ app: :admin_api, - version: "1.3.0-pre.0", + version: "1.3.0", build_path: "../../_build", config_path: "../../config/config.exs", deps_path: "../../deps", diff --git a/apps/db/mix.exs b/apps/db/mix.exs index b124f8fd5..95b54ca48 100644 --- a/apps/db/mix.exs +++ b/apps/db/mix.exs @@ -4,7 +4,7 @@ defmodule DB.Mixfile do def project do [ app: :db, - version: "1.3.0-pre.0", + version: "1.3.0", elixir: "~> 1.8", start_permanent: Mix.env == :prod, test_coverage: [tool: ExCoveralls], diff --git a/apps/ewallet/config/config.exs b/apps/ewallet/config/config.exs index 77bbcda22..fe97afe58 100644 --- a/apps/ewallet/config/config.exs +++ b/apps/ewallet/config/config.exs @@ -4,7 +4,7 @@ use Mix.Config config :ewallet, ecto_repos: [], - version: "1.3.0-pre.0", + version: "1.3.0", cors_origin: {:system, "CORS_ORIGIN", nil}, settings: [ :base_url, diff --git a/apps/ewallet/mix.exs b/apps/ewallet/mix.exs index 526a0a4c2..545cc9e4f 100644 --- a/apps/ewallet/mix.exs +++ b/apps/ewallet/mix.exs @@ -4,7 +4,7 @@ defmodule EWallet.Mixfile do def project do [ app: :ewallet, - version: "1.3.0-pre.0", + version: "1.3.0", build_path: "../../_build", config_path: "../../config/config.exs", deps_path: "../../deps", diff --git a/apps/ewallet_api/mix.exs b/apps/ewallet_api/mix.exs index 2fae9f893..63333b460 100644 --- a/apps/ewallet_api/mix.exs +++ b/apps/ewallet_api/mix.exs @@ -4,7 +4,7 @@ defmodule EWalletAPI.Mixfile do def project do [ app: :ewallet_api, - version: "1.3.0-pre.0", + version: "1.3.0", build_path: "../../_build", config_path: "../../config/config.exs", deps_path: "../../deps", diff --git a/apps/ewallet_config/mix.exs b/apps/ewallet_config/mix.exs index eef94ad1c..3efa14c7c 100644 --- a/apps/ewallet_config/mix.exs +++ b/apps/ewallet_config/mix.exs @@ -4,7 +4,7 @@ defmodule EWalletConfig.MixProject do def project do [ app: :ewallet_config, - version: "1.3.0-pre.0", + version: "1.3.0", build_path: "../../_build", config_path: "../../config/config.exs", deps_path: "../../deps", diff --git a/apps/ewallet_db/mix.exs b/apps/ewallet_db/mix.exs index 0aa4bbf09..3493a073f 100644 --- a/apps/ewallet_db/mix.exs +++ b/apps/ewallet_db/mix.exs @@ -4,7 +4,7 @@ defmodule EWalletDB.Mixfile do def project do [ app: :ewallet_db, - version: "1.3.0-pre.0", + version: "1.3.0", build_path: "../../_build", config_path: "../../config/config.exs", deps_path: "../../deps", diff --git a/apps/frontend/assets/src/omg-alert/reducer.js b/apps/frontend/assets/src/omg-alert/reducer.js index 13240b966..8f8fe60cf 100644 --- a/apps/frontend/assets/src/omg-alert/reducer.js +++ b/apps/frontend/assets/src/omg-alert/reducer.js @@ -263,6 +263,12 @@ export const alertsReducer = createReducer([], { createAlertState(
Exported transactions successfully
, 'success') ] }, + 'ADMIN/INVITE/SUCCESS': state => { + return [...state, createAlertState('Invited admin successfully.', 'success')] + }, + 'INVITE_ADMIN/REQUEST/SUCCESS': state => { + return [...state, createAlertState('Invited admin successfully.', 'success')] + }, 'CONFIGURATIONS/UPDATE/FAILED': errorStateHandler, 'TRANSACTIONS/EXPORT/FAILED': errorStateHandler, 'PASSWORD/UPDATE/FAILED': errorStateHandler, @@ -286,5 +292,7 @@ export const alertsReducer = createReducer([], { 'TOKEN_EXPIRE': errorStateHandler, 'USER/UPDATE/FAILED': errorStateHandler, 'ADMIN/UPDATE/FAILED': errorStateHandler, - 'TRANSACTION_REQUEST/CANCEL/FAILED': errorStateHandler + 'TRANSACTION_REQUEST/CANCEL/FAILED': errorStateHandler, + 'ADMIN/INVITE/FAILED': errorStateHandler, + 'INVITE_ADMIN/REQUEST/FAILED': errorStateHandler }) diff --git a/apps/frontend/assets/src/omg-createNewPassword-form/index.js b/apps/frontend/assets/src/omg-createNewPassword-form/index.js index 8c8995caa..f46743a40 100644 --- a/apps/frontend/assets/src/omg-createNewPassword-form/index.js +++ b/apps/frontend/assets/src/omg-createNewPassword-form/index.js @@ -79,10 +79,10 @@ class ForgetPasswordForm extends Component { password: this.state.newPassword, passwordConfirmation: this.state.reEnteredNewPassword }) - if (result.data.success) { + if (result.data) { this.setState({ submitStatus: 'SUCCESS' }) } else { - this.setState({ submitStatus: 'FAILED', submitErrorText: result.data.data.code }) + this.setState({ submitStatus: 'FAILED', submitErrorText: result.error.code }) } } } diff --git a/apps/frontend/assets/src/omg-session/reducer.js b/apps/frontend/assets/src/omg-session/reducer.js index a5f820dcf..9b00026b3 100644 --- a/apps/frontend/assets/src/omg-session/reducer.js +++ b/apps/frontend/assets/src/omg-session/reducer.js @@ -3,10 +3,10 @@ import createReducer from '../reducer/createReducer' export const sessionReducer = createReducer( {}, { - 'SESSION/LOGIN/SUCCESS': (state, action) => { + 'SESSION/LOGIN/SUCCESS': () => { return { authenticated: true } }, - 'SESSION/LOGOUT/SUCCESS': (state, action) => { + 'SESSION/LOGOUT/SUCCESS': () => { return { authenticated: false } } } diff --git a/apps/frontend/mix.exs b/apps/frontend/mix.exs index 916688734..cff038f64 100644 --- a/apps/frontend/mix.exs +++ b/apps/frontend/mix.exs @@ -4,7 +4,7 @@ defmodule Frontend.Mixfile do def project do [ app: :frontend, - version: "1.3.0-pre.0", + version: "1.3.0", build_path: "../../_build", config_path: "../../config/config.exs", deps_path: "../../deps", diff --git a/apps/load_tester/mix.exs b/apps/load_tester/mix.exs index 2569dab39..7a542c0fa 100644 --- a/apps/load_tester/mix.exs +++ b/apps/load_tester/mix.exs @@ -4,7 +4,7 @@ defmodule LoadTester.MixProject do def project do [ app: :load_tester, - version: "1.3.0-pre.0", + version: "1.3.0", build_path: "../../_build", config_path: "../../config/config.exs", deps_path: "../../deps", diff --git a/apps/local_ledger/mix.exs b/apps/local_ledger/mix.exs index 862c4fc61..4f72f98c1 100644 --- a/apps/local_ledger/mix.exs +++ b/apps/local_ledger/mix.exs @@ -4,7 +4,7 @@ defmodule LocalLedger.Mixfile do def project do [ app: :local_ledger, - version: "1.3.0-pre.0", + version: "1.3.0", build_path: "../../_build", config_path: "../../config/config.exs", deps_path: "../../deps", diff --git a/apps/local_ledger_db/mix.exs b/apps/local_ledger_db/mix.exs index dd482fd32..3a6218a0c 100644 --- a/apps/local_ledger_db/mix.exs +++ b/apps/local_ledger_db/mix.exs @@ -4,7 +4,7 @@ defmodule LocalLedgerDB.Mixfile do def project do [ app: :local_ledger_db, - version: "1.3.0-pre.0", + version: "1.3.0", build_path: "../../_build", config_path: "../../config/config.exs", deps_path: "../../deps", diff --git a/apps/status/mix.exs b/apps/status/mix.exs index 86dc1dbb4..1f65e9768 100644 --- a/apps/status/mix.exs +++ b/apps/status/mix.exs @@ -4,7 +4,7 @@ defmodule Status.Mixfile do def project do [ app: :status, - version: "1.3.0-pre.0", + version: "1.3.0", build_path: "../../_build", config_path: "../../config/config.exs", deps_path: "../../deps", diff --git a/apps/url_dispatcher/mix.exs b/apps/url_dispatcher/mix.exs index 66f31b8ca..4b82fdf92 100644 --- a/apps/url_dispatcher/mix.exs +++ b/apps/url_dispatcher/mix.exs @@ -4,7 +4,7 @@ defmodule UrlDispatcher.Mixfile do def project do [ app: :url_dispatcher, - version: "1.3.0-pre.0", + version: "1.3.0", build_path: "../../_build", config_path: "../../config/config.exs", deps_path: "../../deps", diff --git a/apps/utils/mix.exs b/apps/utils/mix.exs index 5411a290f..fe98e6030 100644 --- a/apps/utils/mix.exs +++ b/apps/utils/mix.exs @@ -4,7 +4,7 @@ defmodule Utils.MixProject do def project do [ app: :utils, - version: "1.3.0-pre.0", + version: "1.3.0", build_path: "../../_build", config_path: "../../config/config.exs", deps_path: "../../deps",