Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/assets/logos.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,26 +46,26 @@ export const HanaLogo = ({ fill = '#221542' }: { fill?: string }) => (
</svg>
);

export const HotLogo = ({ fill = '#221542' }: { fill?: string }) => (
export const HotLogo = () => (
<svg
width="182"
height="226"
viewBox="0 0 182 226"
width="80"
height="82"
viewBox="0 0 80 82"
fill="none"
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M35.3956 22.5711C35.3861 22.3324 35.6417 22.1832 35.8491 22.3053C36.0382 22.4165 36.2205 22.5257 36.4099 22.6313C37.4552 23.198 38.4402 23.8684 39.3497 24.6324C40.7641 25.8554 41.9528 27.3151 42.8621 28.9455C43.8192 30.6016 44.5515 32.3765 45.0399 34.224C45.3754 35.475 45.5109 36.7708 45.4414 38.0637C45.4231 38.2364 45.4614 38.4102 45.5506 38.5595C45.6395 38.7088 45.7746 38.8255 45.9357 38.8923C46.0974 38.9554 46.275 38.9655 46.4431 38.9209C46.6109 38.8763 46.76 38.7794 46.8686 38.6444C47.9575 37.49 49.2774 34.882 49.72 33.9747C49.8026 33.8053 50.0113 33.7465 50.1619 33.8612C50.8686 34.4006 52.7431 36.0635 54.3348 39.5289C54.8774 40.6445 55.2013 41.8521 55.4406 43.0659C55.6754 44.1598 55.7118 45.2684 55.6845 46.3866C55.5946 50.0708 54.0887 53.6243 51.5016 56.404C49.2163 58.8592 46.2232 60.5283 42.9103 61.1014C40.0638 61.638 37.1237 61.3821 34.4141 60.3617C33.5021 59.9866 32.622 59.5388 31.7826 59.0225C30.5229 58.3338 29.4357 57.3655 28.4361 56.3377C26.8193 54.5515 25.6161 52.5121 24.9068 50.178C24.5955 49.0177 24.4013 47.8294 24.3271 46.6307C24.2318 44.6775 24.4841 42.6145 25.143 40.8279C26.148 38.1032 27.8486 35.4733 30.1752 33.7232C32.312 32.1263 34.0955 30.2591 34.9939 27.7544C35.3492 26.6941 35.5128 25.5795 35.477 24.4623C35.477 23.8311 35.4204 23.2014 35.3956 22.5711Z"
fill="#1D1F20"
/>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M61.4303 5.67123C61.2592 1.29955 65.9734 -1.42072 69.6841 0.778856C69.8927 0.902496 70.0966 1.02369 70.2969 1.14281C71.1264 1.63596 71.8962 2.0936 72.6948 2.54261C78.7034 5.82496 84.3655 9.70727 89.5947 14.1306L89.6156 14.1482L89.6361 14.1661C97.7987 21.2741 104.659 29.7555 109.908 39.2279C115.369 48.7482 119.548 58.951 122.336 69.5701C124.296 76.931 125.087 84.5551 124.68 92.1622L124.675 92.2585L124.665 92.3544C124.649 92.5091 124.683 92.6642 124.762 92.7966C124.833 92.9169 124.936 93.0102 125.054 93.068C125.182 93.11 125.318 93.1139 125.448 93.0792C125.59 93.0413 125.72 92.9575 125.817 92.8365L125.91 92.7195L126.013 92.6103C128.698 89.7433 131.849 84.8386 134.726 79.7835C137.556 74.8096 139.957 69.9891 141.164 67.4966C142.568 64.5977 146.426 63.2577 149.355 65.5087C153.698 68.8462 164.495 78.5869 173.597 98.5264C176.788 105.147 178.655 112.217 180.006 119.112C181.389 125.623 181.585 132.136 181.432 138.487C180.911 160.012 172.178 180.707 157.252 196.857C144.059 211.131 126.746 220.873 107.545 224.225C91.0921 227.343 74.1004 225.851 58.4408 219.911L58.3874 219.891L58.3347 219.869C53.1215 217.711 48.0904 215.135 43.2903 212.168C35.8615 208.06 29.5566 202.367 23.9357 196.547L23.8884 196.498L23.8428 196.447C14.5411 186.097 7.58254 174.236 3.48102 160.643L3.46314 160.583L3.44721 160.524C1.65787 153.807 0.541657 146.928 0.114817 139.99L0.113297 139.965L0.112107 139.94C-0.435813 128.631 1.00555 116.603 4.85898 106.081C10.609 90.3803 20.4007 75.032 34.0091 64.7227L34.0138 64.7191L34.0186 64.7155C45.5431 56.0415 54.7752 46.187 59.4079 33.2095C61.2271 27.7289 62.0644 21.9686 61.8806 16.1949L61.8787 16.1347V16.0745C61.8787 13.908 61.7607 11.8597 61.636 9.69607C61.562 8.41142 61.4857 7.08613 61.4303 5.67123ZM69.2316 9.30017C69.3561 11.5009 69.4805 13.81 69.4827 16.0143C69.6876 22.6735 68.7159 29.3166 66.6122 35.6374L66.5997 35.6749L66.5865 35.712C61.2619 50.6632 50.7407 61.6319 38.6023 70.7685C26.4351 79.9883 17.3853 93.9831 12.0012 108.684C8.55704 118.089 7.20144 129.072 7.70614 139.55C8.10204 145.958 9.13164 152.311 10.7802 158.515C14.5328 170.92 20.8842 181.778 29.4591 191.333C34.8784 196.939 40.5788 202.01 47.051 205.573L47.1365 205.621L47.2194 205.672C51.6787 208.434 56.3529 210.832 61.1964 212.84C75.536 218.268 91.0907 219.626 106.151 216.767L106.179 216.762L106.208 216.757C123.701 213.709 139.542 204.827 151.662 191.714C165.404 176.846 173.356 157.889 173.83 138.304C173.978 132.189 173.772 126.34 172.561 120.658L172.555 120.627L172.549 120.596C171.251 113.969 169.533 107.589 166.728 101.781L166.71 101.744L166.693 101.706C159.501 85.9381 151.293 77.2056 146.805 73.2479C145.446 75.9679 143.52 79.6962 141.338 83.5293C138.464 88.5794 134.979 94.1159 131.659 97.6933C130.562 99.0114 129.082 99.9614 127.418 100.406C125.7 100.866 123.881 100.762 122.227 100.111L122.191 100.097L122.155 100.082C120.504 99.3934 119.124 98.19 118.215 96.6564C117.326 95.1553 116.933 93.4135 117.091 91.6783C117.446 84.8872 116.735 78.0821 114.985 71.5118L114.984 71.5054L114.982 71.499C112.361 61.5138 108.43 51.9214 103.295 42.9722L103.28 42.9471L103.266 42.9217C98.4467 34.2191 92.1487 26.4281 84.6562 19.8993C79.8788 15.8606 74.7116 12.3101 69.2316 9.30017Z"
d="M34.5092 22.014C34.4771 21.2324 35.3603 20.746 36.0555 21.1393C36.0946 21.1614 36.1328 21.183 36.1703 21.2043C36.3258 21.2925 36.47 21.3743 36.6196 21.4546C37.7453 22.0415 38.8061 22.7356 39.7859 23.5265L39.7898 23.5297L39.7936 23.5329C41.3229 24.8038 42.6081 26.3202 43.5916 28.0139C44.6147 29.7161 45.3976 31.5403 45.92 33.439C46.2872 34.7551 46.4354 36.1183 46.3591 37.4784L46.3582 37.4956L46.3563 37.5128C46.3533 37.5404 46.3597 37.5682 46.3745 37.5919C46.3878 37.6134 46.4071 37.63 46.4292 37.6404C46.4532 37.6479 46.4787 37.6486 46.503 37.6424C46.5296 37.6356 46.554 37.6206 46.5722 37.599L46.5896 37.5781L46.6089 37.5585C47.1119 37.0459 47.7023 36.169 48.2413 35.2651C48.7715 34.3758 49.2213 33.5139 49.4475 33.0683C49.7105 32.5499 50.4333 32.3104 50.9821 32.7128C51.7957 33.3096 53.8186 35.0512 55.5239 38.6163C56.1217 39.8002 56.4715 41.0643 56.7246 42.2971C56.9837 43.4612 57.0205 44.6257 56.9918 45.7613C56.8942 49.6099 55.258 53.3101 52.4616 56.1977C49.9898 58.7499 46.7462 60.4917 43.1488 61.0911C40.0664 61.6486 36.8829 61.3818 33.9491 60.3197L33.9391 60.3162L33.9292 60.3122C32.9525 59.9264 32.0099 59.4658 31.1106 58.9353C29.7188 58.2008 28.5375 57.1829 27.4844 56.1423L27.4756 56.1335L27.467 56.1244C25.7243 54.2739 24.4206 52.1531 23.6522 49.7227L23.6488 49.712L23.6458 49.7015C23.3106 48.5005 23.1015 47.2705 23.0215 46.03L23.0212 46.0255L23.021 46.0211C22.9183 43.999 23.1884 41.8485 23.9103 39.9671C24.9876 37.1598 26.8221 34.4156 29.3717 32.5723L29.3726 32.5716L29.3735 32.571C31.5326 31.0201 33.2623 29.2581 34.1303 26.9378C34.4711 25.9579 34.628 24.9279 34.5935 23.8956L34.5932 23.8848V23.8741C34.5932 23.4867 34.5711 23.1205 34.5477 22.7336C34.5338 22.5039 34.5195 22.267 34.5092 22.014ZM35.9708 22.6629C35.9941 23.0563 36.0174 23.4692 36.0178 23.8633C36.0562 25.054 35.8741 26.2417 35.48 27.3719L35.4777 27.3786L35.4752 27.3852C34.4776 30.0585 32.5064 32.0197 30.2323 33.6533C27.9527 35.3018 26.2572 37.804 25.2485 40.4326C24.6032 42.1142 24.3492 44.0779 24.4438 45.9513C24.5179 47.0971 24.7108 48.233 25.0197 49.3423C25.7228 51.5602 26.9127 53.5016 28.5193 55.21C29.5346 56.2124 30.6026 57.1191 31.8152 57.7561L31.8312 57.7647L31.8467 57.7738C32.6822 58.2677 33.5579 58.6964 34.4653 59.0555C37.1519 60.026 40.0661 60.2688 42.8877 59.7576L42.8929 59.7567L42.8983 59.7558C46.1757 59.2108 49.1436 57.6227 51.4143 55.2782C53.9889 52.6198 55.4787 49.2303 55.5675 45.7286C55.5953 44.6352 55.5567 43.5894 55.3298 42.5735L55.3287 42.5679L55.3275 42.5624C55.0844 41.3775 54.7625 40.2368 54.237 39.1983L54.2336 39.1917L54.2304 39.1849C52.883 36.3656 51.3452 34.8042 50.5043 34.0966C50.2497 34.5829 49.8889 35.2495 49.4801 35.9349C48.9416 36.8378 48.2887 37.8277 47.6667 38.4674C47.4611 38.703 47.1839 38.8729 46.8721 38.9525C46.5502 39.0347 46.2094 39.0161 45.8996 38.8997L45.8928 38.8972L45.8861 38.8945C45.5767 38.7713 45.3182 38.5562 45.1479 38.282C44.9813 38.0136 44.9077 37.7022 44.9373 37.3919C45.0038 36.1777 44.8706 34.9609 44.5427 33.7862L44.5426 33.785L44.5422 33.7839C44.0511 31.9985 43.3146 30.2834 42.3526 28.6833L42.3498 28.6789L42.3472 28.6743C41.4443 27.1183 40.2643 25.7253 38.8606 24.558C37.9655 23.8358 36.9975 23.201 35.9708 22.6629Z"
fill="#FABA0D"
/>
<path
d="M69.2316 9.30017C69.3561 11.5009 69.4805 13.81 69.4827 16.0143C69.6876 22.6735 68.7159 29.3166 66.6122 35.6374L66.5997 35.6749L66.5865 35.712C61.2619 50.6632 50.7407 61.6319 38.6023 70.7685C26.4351 79.9883 17.3853 93.9831 12.0012 108.684C8.55704 118.089 7.20144 129.072 7.70614 139.55C8.10204 145.958 9.13164 152.311 10.7802 158.515C14.5328 170.92 20.8842 181.778 29.4591 191.333C34.8784 196.939 40.5788 202.01 47.051 205.573L47.1365 205.621L47.2194 205.672C51.6787 208.434 56.3529 210.832 61.1964 212.84C75.536 218.268 91.0907 219.626 106.151 216.767L106.179 216.762L106.208 216.757C123.701 213.709 139.542 204.827 151.662 191.714C165.404 176.846 173.356 157.889 173.83 138.304C173.978 132.189 173.772 126.34 172.561 120.658L172.555 120.627L172.549 120.596C171.251 113.969 169.533 107.589 166.728 101.781L166.71 101.744L166.693 101.706C159.501 85.9381 151.293 77.2056 146.805 73.2479C145.446 75.9679 143.52 79.6962 141.338 83.5293C138.464 88.5794 134.979 94.1159 131.659 97.6933C130.562 99.0114 129.082 99.9614 127.418 100.406C125.7 100.866 123.881 100.762 122.227 100.111L122.191 100.097L122.155 100.082C120.504 99.3934 119.124 98.19 118.215 96.6564C117.326 95.1553 116.933 93.4135 117.091 91.6783C117.446 84.8872 116.735 78.0821 114.985 71.5118L114.984 71.5054L114.982 71.499C112.361 61.5138 108.43 51.9214 103.295 42.9722L103.28 42.9471L103.266 42.9217C98.4467 34.2191 92.1487 26.4281 84.6562 19.8993C79.8788 15.8606 74.7116 12.3101 69.2316 9.30017Z"
fill="#0D0E13"
/>
<path
d="M79.2627 113.395C80.316 113.977 81.211 114.548 82.1689 115.087C85.1302 116.708 87.9204 118.625 90.4977 120.81C94.5046 124.308 97.8723 128.482 100.448 133.144C103.159 137.88 105.234 142.957 106.618 148.24C107.568 151.817 107.952 155.523 107.755 159.22C107.704 159.714 107.812 160.211 108.064 160.638C108.317 161.065 108.699 161.399 109.155 161.59C109.614 161.771 110.117 161.8 110.593 161.672C111.068 161.544 111.491 161.267 111.798 160.881C115.566 156.849 118.01 151.635 120.022 146.664C125.664 151.227 130.03 156.864 132.95 163.411C134.487 166.601 135.405 170.054 136.083 173.526C136.748 176.653 136.851 179.824 136.774 183.022C136.519 193.558 132.253 203.72 124.924 211.669C118.45 218.69 109.97 223.464 100.584 225.103C92.5207 226.637 84.1909 225.905 76.5148 222.987C73.9308 221.915 71.4376 220.634 69.0598 219.158C65.4912 217.188 62.4107 214.419 59.5788 211.48C54.9986 206.371 51.5897 200.539 49.5806 193.865C48.6985 190.546 48.1483 187.148 47.9379 183.72C47.6679 178.134 48.383 172.234 50.2498 167.125C53.0967 159.333 57.9146 151.813 64.5059 146.808C70.5596 142.241 75.612 136.901 78.1573 129.738C79.1642 126.706 79.6277 123.519 79.5261 120.324C79.5261 118.011 79.2627 115.705 79.2627 113.395Z"
d="M38.1531 41.1875C38.3545 41.2919 38.5256 41.3944 38.7087 41.4911C39.2749 41.7821 39.8084 42.1261 40.3012 42.5182C41.0673 43.146 41.7112 43.895 42.2037 44.7317C42.722 45.5816 43.1188 46.4927 43.3834 47.4408C43.565 48.0827 43.6384 48.7478 43.6008 49.4113C43.591 49.4999 43.6117 49.5891 43.6599 49.6658C43.7082 49.7424 43.7813 49.8023 43.8685 49.8366C43.9562 49.8691 44.0524 49.8743 44.1434 49.8513C44.2342 49.8283 44.3151 49.7786 44.3738 49.7094C45.0942 48.9858 45.5615 48.0501 45.9462 47.158C47.0249 47.9768 47.8597 48.9885 48.418 50.1634C48.7119 50.7359 48.8874 51.3555 49.017 51.9786C49.1442 52.5398 49.1639 53.1089 49.1491 53.6828C49.1004 55.5736 48.2847 57.3973 46.8835 58.8238C45.6456 60.0838 44.0243 60.9405 42.2297 61.2347C40.688 61.51 39.0953 61.3786 37.6277 60.8549C37.1336 60.6625 36.6569 60.4327 36.2023 60.1678C35.52 59.8142 34.931 59.3173 34.3896 58.7899C33.5138 57.873 32.8621 56.8264 32.4779 55.6287C32.3093 55.0331 32.2041 54.4232 32.1639 53.8081C32.1122 52.8056 32.249 51.7468 32.6059 50.8299C33.1502 49.4316 34.0714 48.082 35.3316 47.1838C36.4891 46.3642 37.4551 45.4059 37.9417 44.1204C38.1342 43.5763 38.2229 43.0044 38.2034 42.431C38.2034 42.0159 38.1531 41.6021 38.1531 41.1875Z"
fill="#FABA0D"
/>
</svg>
Expand Down
1 change: 1 addition & 0 deletions src/components/Input/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ const InputField = ({
{iconLeft && <div className="bluxcc:mr-2">{iconLeft}</div>}
<input
id="bluxcc-input"
autoComplete="off"
min={type === 'number' ? 1 : undefined}
type={type}
autoFocus={autoFocus}
Expand Down
21 changes: 11 additions & 10 deletions src/containers/Pages/Activity/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const Activity: React.FC = () => {
const isEmpty = !loading && transactionsDetails.length === 0;

return (
<div className="bluxcc:flex bluxcc:h-[348px] bluxcc:flex-col bluxcc:justify-between">
<div className="bluxcc:flex bluxcc:h-[335px] bluxcc:flex-col">
{loading ? (
<div className="bluxcc:flex bluxcc:h-full bluxcc:flex-col bluxcc:items-center bluxcc:justify-center bluxcc:text-center bluxcc:text-gray-700">
Loading activity...
Expand Down Expand Up @@ -119,15 +119,16 @@ const Activity: React.FC = () => {
)}

{transactionsDetails.length > 0 && explorerUrl && (
<Button
state="enabled"
variant="outline"
size="medium"
className="mt-4"
onClick={handleGoToExplorer}
>
See all in explorer
</Button>
<div className="bluxcc:absolute bluxcc:bottom-4 bluxcc:left-1/2 bluxcc:!mt-4 bluxcc:w-[calc(100%-3rem)] bluxcc:-translate-x-1/2 bluxcc:transform">
<Button
state="enabled"
variant="outline"
size="medium"
onClick={handleGoToExplorer}
>
See all in explorer
</Button>
</div>
)}
</div>
);
Expand Down
62 changes: 27 additions & 35 deletions src/containers/Pages/SignTransaction/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,17 @@ const SignTransaction = () => {
action={txDetails.action}
/>

{isLobstr && (
<p className="bluxcc:!my-2 bluxcc:flex bluxcc:items-center bluxcc:justify-center bluxcc:text-center bluxcc:!text-xs bluxcc:text-alert-error">
Ensure that your LOBSTR wallet is set to the {networkTitle} network.
Otherwise, the transaction will definitely fail.
</p>
)}

<div
className="bluxcc:mt-4 bluxcc:inline-flex bluxcc:h-14 bluxcc:w-full bluxcc:items-center bluxcc:justify-between bluxcc:border bluxcc:px-4"
className="bluxcc:inline-flex bluxcc:h-14 bluxcc:w-full bluxcc:items-center bluxcc:justify-between bluxcc:border bluxcc:px-4"
style={{
marginTop: isLobstr ? '0px' : '16px',
borderRadius: appearance.borderRadius,
borderColor: appearance.borderColor,
}}
Expand Down Expand Up @@ -94,41 +102,25 @@ const SignTransaction = () => {
</div>

<div className="bluxcc:flex bluxcc:h-8 bluxcc:w-full bluxcc:items-center bluxcc:justify-center">
{isLobstr && (
/* TODO: fox styling */ <p
style={{
color: 'orangered',
fontSize: '12px',
textAlign: 'center',
paddingTop: '10px',
}}
>
Ensure that your LOBSTR wallet is set to the {networkTitle} network.
Otherwise, the transaction will definitely fail.
</p>
)}

<div className="bluxcc:flex bluxcc:h-8 bluxcc:w-full bluxcc:items-center bluxcc:justify-center">
<div
className="bluxcc:absolute bluxcc:right-0 bluxcc:left-0"
style={{
borderTopWidth: appearance.includeBorders
? appearance.borderWidth
: '1px',
borderTopColor: appearance.borderColor,
}}
/>
</div>

<Button
size="large"
state="enabled"
variant="fill"
onClick={handleSignTx}
>
Approve
</Button>
<div
className="bluxcc:absolute bluxcc:right-0 bluxcc:left-0"
style={{
borderTopWidth: appearance.includeBorders
? appearance.borderWidth
: '1px',
borderTopColor: appearance.borderColor,
}}
/>
</div>

<Button
size="large"
state="enabled"
variant="fill"
onClick={handleSignTx}
>
Approve
</Button>
</div>
);
};
Expand Down
2 changes: 0 additions & 2 deletions src/context/provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,6 @@ export const BluxProvider = ({

const sortAvailableWallets = getSortedCheckedWallets(available);

console.log(sortAvailableWallets);

setValue((prev) => ({
...prev,
isReady: true,
Expand Down
3 changes: 0 additions & 3 deletions src/wallets/configs/hotConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ export const hotConfig: WalletInterface = {
website: 'https://hot-labs.org/',

isAvailable: () => {
console.log('checking hot wallet is available');
return typeof window !== 'undefined' && !!window.hotExtension;
},

Expand All @@ -35,8 +34,6 @@ export const hotConfig: WalletInterface = {
accountToSign: options.address,
});

console.log(result);

return result.signedTxXdr;
} catch {
throw new Error('Failed to sign the transaction with Hana wallet.');
Expand Down