                   :kind :primary
                   :on-click (fn [_]
                               (raise! owner
-                                      [:saved-project-settings {:project-id project-id
+                                      [:saved-project-settings {:project-id (project-model/id project)
                                                                 :merge-paths [[:jira]]
                                                                 :on-success close-modal!}])
                               (track-event :save-clicked))}
                  "Save")]
       :close-fn close-fn})))
 
-(defn jira-empty-state [project-data owner]
+(defn jira-empty-state [project owner]
   (reify
     om/IInitState
     (init-state [_]

      (component
       (html
        [:div
         (let [project (:project project-data)]
          (case modal
            :basic (jira-connect-modal project owner)
            :connect (jira-basic-modal project owner)
            nil))
         [:p "There are 2 options for setting up JIRA with CircleCI: Atlassian Connect or JIRA Basic Authentication. Choose one of the options below to continue."]
         (element
          :column-group

           [:legend "AWS keys for " (vcs-url/project-name (:vcs_url project))]
           (om/build aws-keys-form project-data)]])))))

(defn- jira-input-path [& args]
  (apply conj state/inputs-path :jira args))

(defn jira-basic-modal
  [project owner]
  (let [project-id (project-model/id project)
        inputs (inputs/get-inputs-from-app-state owner)
        credentials (:jira inputs)
        track-event! (fn [event-type]
                       ((om/get-shared owner :track-event)
                        {:event-type event-type
