diff --git a/static/directives/setup-trigger-dialog.html b/static/directives/setup-trigger-dialog.html
index 542047612..eb4298aaf 100644
--- a/static/directives/setup-trigger-dialog.html
+++ b/static/directives/setup-trigger-dialog.html
@@ -35,16 +35,13 @@
           <div class="trigger-option-section" ng-show="currentView == 'analyzed'">
 
             <!-- Messaging -->
-            <!-- TODO(jschorr): eventually ng-switch on pullINfo.analysis.status -->
-            <div class="alert alert-danger" ng-if="pullInfo.analysis.status == 'error'">
-              {{ pullInfo.analysis.message }}
-            </div>
-            <div class="alert alert-warning" ng-if="pullInfo.analysis.status == 'warning'">
-              {{ pullInfo.analysis.message }}
-            </div>
-            <div class="alert alert-warning" ng-if="pullInfo.analysis.status == 'notimplemented'">
-              <p>For {{ TriggerService.getTitle(trigger.service) }} triggers, we are unable to determine dependencies automatically.</p>
-              <p>If the git repository being built depends on a private base image, you must manually select a robot account with the proper permissions.</p>
+            <div ng-switch on="pullInfo.analysis.status">
+              <div ng-switch-when="error" class="alert alert-danger">{{ pullInfo.analysis.message }}</div>
+              <div ng-switch-when="warning" class="alert alert-warning">{{ pullInfo.analysis.message }}</div>
+              <div ng-switch-when="notimplemented" class="alert alert-warning">
+                <p>For {{ TriggerService.getTitle(trigger.service) }} triggers, we are unable to determine dependencies automatically.</p>
+                <p>If the git repository being built depends on a private base image, you must manually select a robot account with the proper permissions.</p>
+              </div>
             </div>
             <div class="dockerfile-found" ng-if="pullInfo.analysis.is_public === false">
               <div class="dockerfile-found-content">