                 (fn [result]
                   (let [{:keys [public-key address]}
                         (get (types/json->clj result) (keyword path))]
-                    (re-frame/dispatch [:wallet.accounts/account-generated
+                    (re-frame/dispatch [::account-generated
                                         {:name (str "Account " path-num)
                                          :address address
                                          :public-key public-key

(fx/defn generate-new-account
  {:events [:wallet.accounts/generate-new-account]}
  [{:keys [db]} password]
  {:wallet.accounts/generate-account {:address  (get-in db [:multiaccount :address])
                                      :path-num (inc (get-in db [:multiaccount :latest-derived-path]))
                                      :password password}})

(fx/defn account-generated
  {:events [:wallet.accounts/account-generated]}
  [{:keys [db] :as cofx} account]
  (fx/merge cofx
            {:db (assoc db :generate-account {:account account})}
            (navigation/navigate-to-cofx :account-added nil)))

(fx/defn save-account

    (fn [value]
      (let [{:keys [id error]} (types/json->clj value)]
        (if error
          (re-frame/dispatch [::generate-new-account-error])
          (let [path (str constants/path-root "/" path-num)]
            (status/multiaccount-derive-addresses
             id
