1 files changed, 13 insertions, 9 deletions

diff --git a/extensions/MozProjectReview/Extension.pm b/extensions/MozProjectReview/Extension.pm
index 0f5c2b735..a7c632f46 100644
--- a/extensions/MozProjectReview/Extension.pm
+++ b/extensions/MozProjectReview/Extension.pm
@@ -41,6 +41,13 @@ sub post_bug_after_creation {
     my ($do_sec_review, $do_legal, $do_finance, $do_privacy_vendor,
         $do_data_safety, $do_privacy_tech, $do_privacy_policy);
 
+    # Logic section which dictates which bugs are created. This should be 
+    # similar to the logic used in extensions/MozProjectReview/web/js/moz_project_review.js
+
+    if ($params->{new_or_change} eq 'New') {
+        $do_legal = 1;
+    }
+
     if ($params->{mozilla_data} eq 'Yes') {
         $do_legal = 1;
         $do_privacy_policy = 1;
@@ -54,15 +61,15 @@ sub post_bug_after_creation {
         $do_data_safety = 1;
     }
 
-    if ($params->{new_or_change} eq 'New') {
-        $do_legal = 1;
-    }
-
     if ($params->{separate_party} eq 'Yes') {
         if ($params->{relationship_type} ne 'Hardware Purchase') {
             $do_legal = 1;
         }
 
+        if ($params->{relationship_type} eq 'Hardware Purchase') {
+            $do_finance = 1;
+        }
+
         if ($params->{data_access} eq 'Yes') {
             $do_privacy_policy = 1;
             $do_legal = 1;
@@ -106,11 +113,8 @@ sub post_bug_after_creation {
     }
 
     if ($do_legal) {
-        my $component;
-        if ($params->{new_or_change} eq 'New') {
-            $component = 'General';
-        }
-        elsif ($params->{new_or_change} eq 'Existing') {
+        my $component = 'General';
+        if ($params->{new_or_change} eq 'Existing') {
             $component = $params->{mozilla_project};
         }