Update v1.3 with v1.2.3 (#1110)

* fix conflict * fix version name
omgnetwork · Jul 9, 2019 · 49fe3eb · 49fe3eb
1 parent 9df2910
commit 49fe3eb
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -263,6 +263,12 @@ export const alertsReducer = createReducer([], {
       createAlertState(<div>Exported transactions successfully</div>, '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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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",