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

* fix conflict

* fix version name

Author: jarindr

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",

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",

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],

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,

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",

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",

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",

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",

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
 })

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 })
       }
     }
   }