diff --git a/package-lock.json b/package-lock.json index 1937b38e2..be77b0279 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,6 +38,7 @@ "copy-to-clipboard": "^3.3.1", "core-js": "^3.23.3", "create-hash": "^1.2.0", + "das-sdk": "^1.8.0", "deepmerge": "^4.2.2", "eth-block-tracker": "^5.0.1", "eth-json-rpc-filters": "^4.2.2", @@ -7424,6 +7425,17 @@ "type": "^1.0.1" } }, + "node_modules/das-sdk": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/das-sdk/-/das-sdk-1.9.2.tgz", + "integrity": "sha512-WwgQCOkpOixx/fUR9Tn0oksg0xLvSLLXoegq7BuCgn5hJPt6dbeNYUYlYB32Xtx8AytHuPCI/m2/v6ctnkzh5Q==", + "dependencies": { + "node-fetch": "^2.6.6" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -28076,6 +28088,14 @@ "type": "^1.0.1" } }, + "das-sdk": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/das-sdk/-/das-sdk-1.9.2.tgz", + "integrity": "sha512-WwgQCOkpOixx/fUR9Tn0oksg0xLvSLLXoegq7BuCgn5hJPt6dbeNYUYlYB32Xtx8AytHuPCI/m2/v6ctnkzh5Q==", + "requires": { + "node-fetch": "^2.6.6" + } + }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", diff --git a/package.json b/package.json index dc0469ed9..b9f49f138 100644 --- a/package.json +++ b/package.json @@ -58,6 +58,7 @@ "copy-to-clipboard": "^3.3.1", "core-js": "^3.23.3", "create-hash": "^1.2.0", + "das-sdk": "^1.8.0", "deepmerge": "^4.2.2", "eth-block-tracker": "^5.0.1", "eth-json-rpc-filters": "^4.2.2", diff --git a/public/images/logos/bitIcon.png b/public/images/logos/bitIcon.png new file mode 100644 index 000000000..da52c5dc5 Binary files /dev/null and b/public/images/logos/bitIcon.png differ diff --git a/src/components/WalletTransfer/AddContact/AddContact.vue b/src/components/WalletTransfer/AddContact/AddContact.vue index 814330617..676859873 100644 --- a/src/components/WalletTransfer/AddContact/AddContact.vue +++ b/src/components/WalletTransfer/AddContact/AddContact.vue @@ -40,6 +40,8 @@ import log from 'loglevel' import { + BIT, + BIT_LABEL, DISCORD, DISCORD_LABEL, ENS, @@ -66,6 +68,7 @@ const VERIFIER_LABELS = { [TWITTER]: TWITTER_LABEL, [GITHUB]: GITHUB_LABEL, [ENS]: ENS_LABEL, + [BIT]: BIT_LABEL, [UNSTOPPABLE_DOMAINS]: UNSTOPPABLE_DOMAINS_LABEL, } export default { diff --git a/src/containers/WalletTransfer/WalletTransfer.scss b/src/containers/WalletTransfer/WalletTransfer.scss index 0c0f2db8b..27c96788f 100644 --- a/src/containers/WalletTransfer/WalletTransfer.scss +++ b/src/containers/WalletTransfer/WalletTransfer.scss @@ -105,4 +105,25 @@ top: 0; right: 0; } -} \ No newline at end of file +} +.address-chip { + position: relative; + top: -6px; + height: 29px; + .v-avatar { + left: -7px; + height: 19px !important; + width: 19px !important; + } +} +.bitAddress { + padding: 10px 5px 10px 0; +} +.bitLabelChip { + font-size: 12px; + display: block; + width: fit-content; + height: 19px; + line-height: 19px; + padding: 0 6px; +} diff --git a/src/containers/WalletTransfer/WalletTransfer.vue b/src/containers/WalletTransfer/WalletTransfer.vue index 1bdf6fd98..d6d75bba4 100644 --- a/src/containers/WalletTransfer/WalletTransfer.vue +++ b/src/containers/WalletTransfer/WalletTransfer.vue @@ -134,18 +134,32 @@ class="recipient-address" :class="{ hasQrError: qrErrorMsg !== '' }" :value="contactSelected" - :items="contactList" + :items="getToAddressComboboxItems" :placeholder="verifierPlaceholder" required - :rules="[contactRule, rules.contactRequired, ensRule, unstoppableDomainsRule]" + :rules="[contactRule, rules.contactRequired, ensRule, unstoppableDomainsRule, bitRule]" outlined item-text="name" item-value="value" aria-label="Recipient Address" - :return-object="false" + :return-object="getReturnObject" @input="contactChanged" + @blur="checkContact" + @update:search-input="listenInput" >