Merge pull request #1522 from GSA/staging-2025-01-21-merge-to-prod

Staging 2025-01-21 merge to prod
GSA · Jan 21, 2025 · c6c4b0d · c6c4b0d
2 parents 5cecd33 + 2bba21e
commit c6c4b0d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/assets/client/src/components/ChallengeDetails.js b/assets/client/src/components/ChallengeDetails.js
@@ -350,7 +350,7 @@ export const ChallengeDetails = ({challenge, challengePhases, preview, print, ta
                   <div className="logos">
                     <img
                       className="agency-logo"
-                      src={`${imageBase}${encodeURIComponent(challenge.agency_logo)}`}
+                      src={`${imageBase && imageBase !== 'null' ? imageBase : ''}${challenge.agency_logo || ''}`}
                       alt={`Agency logo for ${challenge.agency_name}`}                    
                     />
 

diff --git a/lib/web/controllers/public/page_controller.ex b/lib/web/controllers/public/page_controller.ex
@@ -2,7 +2,6 @@ defmodule Web.Public.PageController do
   use Web, :controller
 
   def index(conn, _params) do
-    conn
-    |> render("index.html")
+    redirect(conn, external: "https://www.challenge.gov")
   end
 end
diff --git a/lib/web/router.ex b/lib/web/router.ex
@@ -133,7 +133,7 @@ defmodule Web.Router do
     )
 
     post("/challenges/:id/create_announcement", ChallengeController, :create_announcement)
-    post("/challenges/:id/remove_announcement", ChallengeController, :remove_announcement)
+    get("/challenges/:id/remove_announcement", ChallengeController, :remove_announcement)
 
     resources("/challenges/:id/submissions/export", SubmissionExportController,
       only: [:index, :create]

diff --git a/lib/web/views/challenge_view.ex b/lib/web/views/challenge_view.ex
@@ -648,7 +648,7 @@ defmodule Web.ChallengeView do
       when not is_nil(announcement) do
     link("Remove update",
       to: Routes.challenge_path(conn, :remove_announcement, challenge.id),
-      method: :post,
+      method: :get,
       class: "usa-button usa-button--secondary",
       data: [confirm: "Are you sure you want to remove this update?"]
     )