devop: fix conflicts

kvhnuke · kvhnuke · commit 15be10c34fd7 · 2022-08-16T10:59:33.000-07:00
diff --git a/packages/extension/src/providers/ethereum/ui/eth-connect-dapp.vue b/packages/extension/src/providers/ethereum/ui/eth-connect-dapp.vue
@@ -16,7 +16,6 @@
           <img :src="Options.faviconURL" />
           <div class="common-popup__account-info">
             <h4>{{ Options.domain }}</h4>
-            <!-- <p>{{ Options.domain }}</p> -->
           </div>
         </div>
       </div>
diff --git a/packages/extension/src/providers/ethereum/ui/eth-decrypt.vue b/packages/extension/src/providers/ethereum/ui/eth-decrypt.vue
@@ -22,8 +22,7 @@
         <div class="common-popup__info">
           <img :src="Options.faviconURL" />
           <div class="common-popup__info-info">
-            <h4>{{ Options.title }}</h4>
-            <p>{{ Options.domain }}</p>
+            <h4>{{ Options.domain }}</h4>
           </div>
         </div>
 
diff --git a/packages/extension/src/providers/ethereum/ui/eth-get-encryption-key.vue b/packages/extension/src/providers/ethereum/ui/eth-get-encryption-key.vue
@@ -22,8 +22,7 @@
         <div class="common-popup__info">
           <img :src="Options.faviconURL" />
           <div class="common-popup__info-info">
-            <h4>{{ Options.title }}</h4>
-            <p>{{ Options.domain }}</p>
+            <h4>{{ Options.domain }}</h4>
           </div>
         </div>
 
diff --git a/packages/extension/src/providers/ethereum/ui/eth-sign-message.vue b/packages/extension/src/providers/ethereum/ui/eth-sign-message.vue
@@ -23,7 +23,6 @@
           <img :src="Options.faviconURL" />
           <div class="common-popup__info-info">
             <h4>{{ Options.domain }}</h4>
-            <!-- <p>{{ Options.domain }}</p> -->
           </div>
         </div>
 
diff --git a/packages/extension/src/providers/ethereum/ui/eth-sign-typedata.vue b/packages/extension/src/providers/ethereum/ui/eth-sign-typedata.vue
@@ -22,8 +22,7 @@
         <div class="common-popup__info">
           <img :src="Options.faviconURL" />
           <div class="common-popup__info-info">
-            <h4>{{ Options.title }}</h4>
-            <p>{{ Options.domain }}</p>
+            <h4>{{ Options.domain }}</h4>
           </div>
         </div>
 
diff --git a/packages/extension/src/providers/ethereum/ui/eth-verify-transaction.vue b/packages/extension/src/providers/ethereum/ui/eth-verify-transaction.vue
@@ -37,7 +37,6 @@
           <img :src="Options.faviconURL" />
           <div class="provider-verify-transaction__info-info">
             <h4>{{ Options.domain }}</h4>
-            <!-- <p>{{ Options.domain }}</p> -->
           </div>
         </div>
 
@@ -82,8 +81,6 @@
         @open-popup="toggleSelectFee"
       />
 
-      <!-- <best-offer-error :not-enough-verify="true"></best-offer-error> -->
-
       <div class="provider-verify-transaction__data">
         <a
           class="provider-verify-transaction__data-link"
diff --git a/packages/extension/src/providers/polkadot/libs/injected-provider.ts b/packages/extension/src/providers/polkadot/libs/injected-provider.ts
@@ -20,16 +20,26 @@ class InjectedProvider implements SubstrateInjectedProvider {
   constructor(options: InjectLibOptions) {
     this.dappName = options.dappName;
     this.id = options.id;
-    this.accounts = new Accounts(options);
-    this.metadata = new Metadata(options);
-    this.provider = new Provider(options);
-    this.signer = new Signer(options);
+    this.accounts = new Proxy(new Accounts(options), ProxyHandler);
+    this.metadata = new Proxy(new Metadata(options), ProxyHandler);
+    this.provider = new Proxy(new Provider(options), ProxyHandler);
+    this.signer = new Proxy(new Signer(options), ProxyHandler);
     this.sendMessageHandler = options.sendMessageHandler;
   }
   handleMessage(request: RPCRequestType): void {
     const { method, params } = request;
     console.info(method, params);
   }
 }
-
+const ProxyHandler = {
+  set(target: any, name: keyof any, value: any) {
+    return Reflect.set(target, name, value);
+  },
+  get(target: any, prop: keyof any) {
+    if (typeof target[prop] === "function") {
+      return (target[prop] as () => any).bind(target);
+    }
+    return target[prop];
+  },
+};
 export default InjectedProvider;
diff --git a/packages/extension/src/providers/polkadot/ui/dot-accounts.vue b/packages/extension/src/providers/polkadot/ui/dot-accounts.vue
@@ -16,7 +16,6 @@
           <img :src="Options.faviconURL" />
           <div class="common-popup__account-info">
             <h4>{{ Options.domain }}</h4>
-            <!-- <p>{{ Options.domain }}</p> -->
           </div>
         </div>
       </div>
diff --git a/packages/extension/src/providers/polkadot/ui/dot-approvetx.vue b/packages/extension/src/providers/polkadot/ui/dot-approvetx.vue
diff --git a/packages/extension/src/providers/polkadot/ui/dot-sign-message.vue b/packages/extension/src/providers/polkadot/ui/dot-sign-message.vue
@@ -23,7 +23,6 @@
           <img :src="Options.faviconURL" />
           <div class="common-popup__info-info">
             <h4>{{ Options.domain }}</h4>
-            <!-- <p>{{ Options.domain }}</p> -->
           </div>
         </div>
 
diff --git a/packages/extension/src/providers/polkadot/ui/routes/index.ts b/packages/extension/src/providers/polkadot/ui/routes/index.ts
@@ -1,5 +1,4 @@
 import dotAccounts from "../dot-accounts.vue";
-//import dotTxApprove from "../dot-approvetx.vue";
 import dotSignMessage from "../dot-sign-message.vue";
 import dotUpdateMetadata from "../dot-update-metadata.vue";
 import dotVerifyTransaction from "../dot-verify-transaction.vue";
@@ -11,7 +10,6 @@ routes.dotAccounts.component = dotAccounts;
 routes.dotTxApprove.component = dotVerifyTransaction;
 routes.dotSignMessage.component = dotSignMessage;
 routes.dotUpdateMetadata.component = dotUpdateMetadata;
-routes.dotVerifyTransaction.component = dotVerifyTransaction;
 routes.dotHWVerify.component = dotHWVerify;
 export default (namespace: string): RouteRecordRaw[] => {
   return Object.values(routes).map((route) => {
diff --git a/packages/extension/src/providers/polkadot/ui/routes/names.ts b/packages/extension/src/providers/polkadot/ui/routes/names.ts
@@ -19,11 +19,6 @@ export default {
     component: {},
     name: "dotUpdateMetadata",
   },
-  dotVerifyTransaction: {
-    path: "dot-verify-transaction",
-    component: {},
-    name: "dotVerifyTransaction",
-  },
   dotHWVerify: {
     path: "dot-hw-verify",
     name: "dotHWVerify",
diff --git a/packages/extension/src/ui/action/components/base-search/index.vue b/packages/extension/src/ui/action/components/base-search/index.vue
@@ -59,7 +59,7 @@ const textValue = computed({
 @import "~@action/styles/theme.less";
 
 .app-search {
-  background: @gray01;
+  background: transparent;
   border-radius: 10px;
   margin: 17px 0 8px 0;
   height: 40px;
@@ -68,9 +68,10 @@ const textValue = computed({
   padding-left: 40px;
   padding-right: 40px;
   box-sizing: border-box;
+  border: 1px solid @gray02;
 
   &.border {
-    border: 1px solid rgba(0, 0, 0, 0.1);
+    border: 1px solid @gray02 !important;
     box-shadow: none !important;
     margin: 0;
     background: @white;
@@ -80,6 +81,7 @@ const textValue = computed({
     background: @white;
     box-shadow: 0px 0.25px 1px rgba(0, 0, 0, 0.039),
       0px 0.85px 3px rgba(0, 0, 0, 0.19);
+    border-color: @white;
   }
 
   &__icon {
@@ -94,7 +96,7 @@ const textValue = computed({
     font-style: normal;
     font-weight: normal;
     font-size: 14px;
-    line-height: 40px;
+    line-height: 38px;
     letter-spacing: 0.25px;
     background: none;
     color: @primaryLabel;
@@ -103,6 +105,10 @@ const textValue = computed({
     &.border {
       line-height: 38px;
     }
+
+    &::placeholder {
+      color: @tertiaryLabel;
+    }
   }
 
   &__clear {
diff --git a/packages/extension/src/ui/action/views/network-nfts/index.vue b/packages/extension/src/ui/action/views/network-nfts/index.vue
@@ -11,19 +11,22 @@
           :favorites="favoriteNFTs"
           @update:fav-clicked="favClicked"
           @update:hide-clicked="hideClicked"
+          @update:toggle-detail="toggleDetail"
         />
         <network-nfts-category
           v-for="(item, index) in NFTs"
           :key="index"
           :collection="item"
           @update:fav-clicked="favClicked"
           @update:hide-clicked="hideClicked"
+          @update:toggle-detail="toggleDetail"
         />
         <network-nfts-hidden
           v-if="hiddenNFTs.length"
           :hiddens="hiddenNFTs"
           @update:fav-clicked="favClicked"
           @update:hide-clicked="hideClicked"
+          @update:toggle-detail="toggleDetail"
         />
       </div>
     </custom-scrollbar>
@@ -32,6 +35,17 @@
       v-if="!NFTs.length && !favoriteNFTs.length && !hiddenNFTs.length"
       :is-empty="isNoNFTs"
     />
+
+    <nft-detail-view
+      v-if="!!detailNFT"
+      :item="detailNFT"
+      :is-favorite="isFavorite"
+      :link-action="openLink"
+      v-bind="$attrs"
+      @close:popup="toggleDetail(null)"
+      @update:fav-clicked="favClicked"
+      @update:hide-clicked="hideClicked"
+    />
   </div>
 </template>
 
@@ -42,12 +56,13 @@ import NetworkNftsCategory from "./components/network-nfts-category.vue";
 import NetworkNftsFavorite from "./components/network-nfts-favorite.vue";
 import NetworkNftsHidden from "./components/network-nfts-hidden.vue";
 import NetworkNftsEmpty from "./components/network-nfts-empty.vue";
-import { onMounted, PropType, ref, watch } from "vue";
+import { onMounted, PropType, ref, watch, computed } from "vue";
 import { NodeType } from "@/types/provider";
 import { AccountsHeaderData } from "../../types/account";
 import { NFTCollection, NFTItem } from "@/types/nft";
 import NFTState from "@/libs/nft-state";
 import scrollSettings from "@/libs/utils/scroll-settings";
+import NftDetailView from "@action/views/nft-detail-view/index.vue";
 
 const nftState = new NFTState();
 const props = defineProps({
@@ -64,6 +79,7 @@ const NFTs = ref<NFTCollection[]>([]);
 const favoriteNFTs = ref<NFTItem[]>([]);
 const hiddenNFTs = ref<NFTItem[]>([]);
 const liveNFTCollection = ref<NFTCollection[]>([]);
+const detailNFT = ref<NFTItem | null>(null);
 const isNoNFTs = ref(false);
 
 watch([props.accountInfo, props.network], () => {
@@ -137,6 +153,19 @@ const hideClicked = async (isHidden: boolean, item: NFTItem) => {
   }
   localUpdate();
 };
+const toggleDetail = (item: NFTItem | null) => {
+  detailNFT.value = item;
+};
+const openLink = () => {
+  if (detailNFT.value) window.open(detailNFT.value.url, "_blank");
+};
+const isFavorite = computed(() => {
+  if (detailNFT.value && favoriteNFTs.value.length) {
+    return favoriteNFTs.value.includes(detailNFT.value);
+  }
+
+  return false;
+});
 </script>
 
 <style lang="less" scoped>
diff --git a/packages/extension/src/ui/action/views/nft-detail-view/index.vue b/packages/extension/src/ui/action/views/nft-detail-view/index.vue
