Merge branch 'master' into dev-vj

app/Models/Pro.php

@@ -70,7 +70,7 @@ class Pro extends Model
 
     public function isDefaultNA()
     {
-       return $this->is_considered_for_dna;
+       return $this->is_considered_for_dna && !$this->is_hcp;
     }
 
     public function lastPayment() {

config/app.php

@@ -65,7 +65,7 @@ return [
 
     'hrm2_url' => env('HRM2_URL'),
 
-    'asset_version' => 55,
+    'asset_version' => 57,
 
     'temp_dir' => env('TEMP_DIR'),
 

public/css/style.css

@@ -3087,3 +3087,9 @@ body.forced-masking #mask {
 .post-refresh-highlight {
     background: #cbf4f0 !important;
 }
+.wrapping-pre-container pre {
+    white-space: normal !important;
+}
+[data-segment-template-name="plan_free_text_v2"] pre {
+    white-space: normal !important;
+}

resources/views/app/patient/segment-templates/_simple_text_segment/summary.php

@@ -8,7 +8,7 @@ if (!!@$point->data) {
     $parsed = json_decode($point->data);
 }
 ?>
-<div>
+<div class="wrapping-pre-container">
     <?php
     if (!!$parsed && @$parsed->free_text) {
         echo $parsed->free_text;