Merge remote-tracking branch 'origin/euphoria' into baseline/main_202…

…30720
aura-nw · Jul 20, 2023 · 446839e · 446839e
2 parents 4ccf390 + e02d6b1
commit 446839e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/src/app/core/services/common.service.ts b/src/app/core/services/common.service.ts
@@ -124,7 +124,7 @@ export class CommonService {
   findNameTag(keySearch, listNameTag = []) {
     this.listNameTag = this.listNameTag?.length > 0 ? this.listNameTag : listNameTag;
     if (this.listNameTag?.length > 0) {
-      const result = this.listNameTag?.find((k) => k.name_tag.trim() === keySearch.trim())?.address;
+      const result = this.listNameTag?.find((k) => k.name_tag?.trim() === keySearch?.trim())?.address || '';
       return result;
     }
   }

diff --git a/src/app/core/services/contract.service.ts b/src/app/core/services/contract.service.ts
@@ -48,11 +48,16 @@ export class ContractService extends CommonService {
   }) {
     let updateQuery = '';
     const isFilterCW4973 = contractType?.includes('CW4973');
-    let typeQuery = isFilterCW4973
-      ? '_or: [{code: {type: {_in: $type}}}, {name: {_eq: "crates.io:cw4973"}}],'
-      : contractType?.includes('CW721') || contractType?.includes('CW20')
-      ? 'code: {type: {_in: $type}}, name: {_neq: "crates.io:cw4973"}'
-      : 'code: {_or: [{type: {_in: $type}}, {_and: {type: {_is_null: true}}}]}';
+    let typeQuery = 'code: {_or: [{type: {_in: $type}}, {_and: {type: {_is_null: true}}}]}';
+    if (isFilterCW4973) {
+      typeQuery = contractType?.includes('')
+        ? '_or: [{code: {_or: [{type: {_in: $type}}, {_and: {type: {_is_null: true}}}]}}, {name: {_eq: "crates.io:cw4973"}}],'
+        : '_or: [{code: {type: {_in: $type}}}, {name: {_eq: "crates.io:cw4973"}}],';
+    } else if (contractType?.includes('CW721') || contractType?.includes('CW20')) {
+      typeQuery = contractType?.includes('')
+        ? 'code: {_or: [{type: {_in: $type}}, {_and: {type: {_is_null: true}}}]}, name: {_neq: "crates.io:cw4973"}'
+        : 'code: {type: {_in: $type}}, name: {_neq: "crates.io:cw4973"}';
+    }
 
     const addressNameTag = this.findNameTag(keyword, this.global.listNameTag);
     if (addressNameTag?.length > 0) {

diff --git a/.../pages/code-ids/code-id-detail/code-id-contracts-tab/code-id-contracts-tab.component.html b/.../pages/code-ids/code-id-detail/code-id-contracts-tab/code-id-contracts-tab.component.html
@@ -1,7 +1,7 @@
 <div class="text--gray-6 body mb-4 mb-lg-6">
   A total of {{ pageData.length }} record{{ pageData.length > 1 ? 's' : '' }} found
 </div>
-<div class="table-responsive aura-table-contain mt-4 mt-lg-0">
+<div class="overflow-x aura-table-contain mt-4 mt-lg-0">
   <ng-container *ngIf="dataSource.data.length > 0; else noValues">
     <table mat-table matSort [dataSource]="dataSource" class="aura-table contract-table">
       <ng-container *ngFor="let template of templates; index as i">

diff --git a/src/app/pages/transaction/transaction-detail/transaction-detail.component.scss b/src/app/pages/transaction/transaction-detail/transaction-detail.component.scss
@@ -18,7 +18,7 @@
   word-break: break-word;
   font-size: 16px;
   font-weight: 400;
-  margin: 0;
+  margin: 0px;
 }
 
 ::ng-deep app-transaction-messages .card-info:not(:last-child) {

diff --git a/...s/transaction/transaction-detail/transaction-messages/transaction-messages.component.scss b/...s/transaction/transaction-detail/transaction-messages/transaction-messages.component.scss
@@ -38,7 +38,7 @@
   }
 
   .divider-lighter {
-    background-color: var(--aura-gray-5);
+    background-color: var(--aura-gray-6);
     max-height: 8px;
   }