+
+
+
+
+
+
diff --git a/packages/extension/src/providers/massa/ui/send-transaction/components/send-token-select.vue b/packages/extension/src/providers/massa/ui/send-transaction/components/send-token-select.vue
new file mode 100644
index 000000000..998a8de9e
--- /dev/null
+++ b/packages/extension/src/providers/massa/ui/send-transaction/components/send-token-select.vue
@@ -0,0 +1,118 @@
+
+
+
+ ![]()
+ ![]()
+
+
+
+ To:
+From:
+ +
+ ![]()
+
+
+
+
+ {{ token.name }}
++ {{ balance ? $filters.formatFloatingPointValue(balance).value : '~' }} + {{ token.symbol }} +
+
+
+
+
+
+
+
+
diff --git a/packages/extension/src/providers/massa/ui/send-transaction/index.vue b/packages/extension/src/providers/massa/ui/send-transaction/index.vue
new file mode 100644
index 000000000..2f6a94fe5
--- /dev/null
+++ b/packages/extension/src/providers/massa/ui/send-transaction/index.vue
@@ -0,0 +1,717 @@
+
+
+
+
+
+
+
+
diff --git a/packages/extension/src/providers/massa/ui/send-transaction/verify-transaction/index.vue b/packages/extension/src/providers/massa/ui/send-transaction/verify-transaction/index.vue
new file mode 100644
index 000000000..d341b1e4c
--- /dev/null
+++ b/packages/extension/src/providers/massa/ui/send-transaction/verify-transaction/index.vue
@@ -0,0 +1,472 @@
+
+
+
+
+
+
+
+
+ Fee (MAS)
+
+
+ Minimal fee from network:
+ {{ minimalFee }}
+
+
+
+
+
+
+
+
diff --git a/packages/extension/src/providers/polkadot/networks/index.ts b/packages/extension/src/providers/polkadot/networks/index.ts
index afd51dc77..283c243a8 100644
--- a/packages/extension/src/providers/polkadot/networks/index.ts
+++ b/packages/extension/src/providers/polkadot/networks/index.ts
@@ -8,7 +8,6 @@ import sdnNode from './astar/shiden';
import bncNode from './bifrost/polkadot';
import bncKusamaNode from './bifrost/kusama';
import edgNode from './edgeware';
-import opalNode from './unique/opal';
import quartzNode from './unique/quartz';
import uniqueNode from './unique/unique';
import penNode from './pendulum/pendulum';
@@ -30,7 +29,6 @@ export default {
bifrost: bncNode,
bifrostKusama: bncKusamaNode,
edgeware: edgNode,
- opal: opalNode,
quartz: quartzNode,
unique: uniqueNode,
pendulum: penNode,
diff --git a/packages/extension/src/providers/polkadot/networks/unique/opal.ts b/packages/extension/src/providers/polkadot/networks/unique/opal.ts
deleted file mode 100644
index 909b634f8..000000000
--- a/packages/extension/src/providers/polkadot/networks/unique/opal.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { NetworkNames } from '@enkryptcom/types';
-import {
- SubstrateNetwork,
- SubstrateNetworkOptions,
-} from '../../types/substrate-network';
-import { getActivityHandler } from './libs/activity-handler';
-import { toBN } from 'web3-utils';
-import icon from '../icons/opal.webp';
-
-const GRAPHQL_ENDPOINT = 'https://api-opal.uniquescan.io/v1/graphql';
-
-const opalOptions: SubstrateNetworkOptions = {
- name: NetworkNames.Opal,
- name_long: 'Opal',
- homePage: 'https://unique.network/',
- blockExplorerTX: 'https://uniquescan.io/opal/extrinsic/[[txHash]]',
- blockExplorerAddr: 'https://uniquescan.io/opal/account/[[address]]',
- isTestNetwork: true,
- currencyName: 'OPL',
- currencyNameLong: 'Opal',
- icon,
- decimals: 18,
- prefix: 42,
- node: 'wss://ws-opal.unique.network',
- genesisHash:
- '0xc87870ef90a438d574b8e320f17db372c50f62beb52e479c8ff6ee5b460670b9',
- existentialDeposit: toBN(0),
- activityHandler: getActivityHandler(GRAPHQL_ENDPOINT),
-};
-
-const opal = new SubstrateNetwork(opalOptions);
-
-export default opal;
diff --git a/packages/extension/src/types/activity.ts b/packages/extension/src/types/activity.ts
index 48eb4fe84..b13efcab1 100644
--- a/packages/extension/src/types/activity.ts
+++ b/packages/extension/src/types/activity.ts
@@ -6,6 +6,7 @@ import {
StatusOptionsResponse,
} from '@enkryptcom/swap';
import { ICommandResult } from '@kadena/client';
+import { OperationStatus } from '@massalabs/massa-web3';
interface BTCIns {
address: string;
@@ -91,6 +92,8 @@ interface KadenaDBInfo {
token: string;
}
+type MassaRawInfo = OperationStatus;
+
enum ActivityStatus {
pending = 'pending',
success = 'success',
@@ -128,7 +131,8 @@ interface Activity {
| BTCRawInfo
| SwapRawInfo
| KadenaRawInfo
- | SOLRawInfo;
+ | SOLRawInfo
+ | MassaRawInfo;
}
export {
@@ -143,4 +147,5 @@ export {
KadenaRawInfo,
KadenaDBInfo,
SOLRawInfo,
+ MassaRawInfo,
};
diff --git a/packages/extension/src/types/base-network.ts b/packages/extension/src/types/base-network.ts
index d876a0c99..3ca1af7a2 100644
--- a/packages/extension/src/types/base-network.ts
+++ b/packages/extension/src/types/base-network.ts
@@ -8,6 +8,7 @@ import { CoingeckoPlatform, SignerType, NetworkNames } from '@enkryptcom/types';
import { Activity } from './activity';
import { BaseToken } from './base-token';
import { BNType } from '@/providers/common/types';
+import MassaAPI from '../providers/massa/libs/api';
export interface SubNetworkOptions {
id: string;
@@ -38,7 +39,8 @@ export interface BaseNetworkOptions {
| Promise
+
+
+
+
+
+
+
+
+ Verify Transaction
+ ++ {{ errorMsg }} +
++ Double check the information and confirm transaction +
+
+
+
+
+
+ Transaction sent!
Operation ID:
+ {{ operationIdRef }}
+
+
[] = activeAccounts.map(ac =>
+ isWalletRestricted(currentNetwork.value.displayAddress(ac.address)),
+ );
+ await Promise.all(promises).then(results => {
+ if (results.includes(true)) foundRestrictedAddress.value = true;
+ });
+};
+
const onSelectedSubnetworkChange = async (id: string) => {
await domainState.setSelectedSubNetwork(id);
currentSubNetwork.value = id;
@@ -493,12 +528,15 @@ body {
overflow: hidden;
font-family: 'Roboto', sans-serif;
}
+
.collapsed {
width: 516px;
}
+
.expanded {
width: 800px;
}
+
.app {
height: 600px;
overflow: hidden;
@@ -544,14 +582,17 @@ body {
width: 460px;
height: 600px;
position: relative;
+
&-expand {
padding-left: 340px;
}
+
&-collapse {
padding-left: 56px;
}
}
}
+
.slide-left-enter-active,
.slide-left-leave-active,
.slide-right-enter-active,
@@ -561,14 +602,21 @@ body {
transition-timing-function: cubic-bezier(0.55, 0, 0.1, 1);
overflow: hidden;
}
+
.slide-left-enter,
.slide-right-leave-active {
opacity: 0;
transform: translate(2em, 0);
}
+
.slide-left-leave-active,
.slide-right-enter {
opacity: 0;
transform: translate(-2em, 0);
}
+
+.restricted-container {
+ width: 800px;
+ height: 600px;
+}
diff --git a/packages/extension/src/ui/action/components/app-menu/components/solana-staking-banner.vue b/packages/extension/src/ui/action/components/app-menu/components/solana-staking-banner.vue
index cc7b07303..3ddd65741 100644
--- a/packages/extension/src/ui/action/components/app-menu/components/solana-staking-banner.vue
+++ b/packages/extension/src/ui/action/components/app-menu/components/solana-staking-banner.vue
@@ -31,7 +31,7 @@ const close = () => {
emit('close');
};
const openStakingLink = async () => {
- trackSolanaStakingBanner(SolanaStakingBannerEvents.SolanaWalletClicked);
+ trackSolanaStakingBanner(SolanaStakingBannerEvents.NetworkListClicked);
setTimeout(() => {
openLink('https://staking.enkrypt.com');
}, 1000);
diff --git a/packages/extension/src/ui/action/components/app-menu/components/survey-popup.vue b/packages/extension/src/ui/action/components/app-menu/components/survey-popup.vue
new file mode 100644
index 000000000..8e142c764
--- /dev/null
+++ b/packages/extension/src/ui/action/components/app-menu/components/survey-popup.vue
@@ -0,0 +1,108 @@
+
+
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/packages/extension/src/ui/action/components/app-menu/index.vue b/packages/extension/src/ui/action/components/app-menu/index.vue
index 16e959037..085112ba9 100644
--- a/packages/extension/src/ui/action/components/app-menu/index.vue
+++ b/packages/extension/src/ui/action/components/app-menu/index.vue
@@ -158,10 +158,20 @@
+
+
+ Access restricted
++ Your wallet address or IP has been flagged as originating from a + restricted jurisdiction. Under our platform policies, access to our + platform is therefore restricted. Please refer to our geographic policies + page for more details. +
++ If this address has been incorrectly flagged, you can contact us at + support@myetherwallet.com. +
+ More info +
+
+
+
+
+
+
+
+
+
+ View My Secret Recovery Phrase
++ Use this phrase to restore access to your funds in another wallet. + Don't show this to anyone +
+
+
+
+
+
+
+
diff --git a/packages/extension/src/ui/action/views/send-transaction/index.vue b/packages/extension/src/ui/action/views/send-transaction/index.vue
index 5e3e90ffe..4a796a729 100644
--- a/packages/extension/src/ui/action/views/send-transaction/index.vue
+++ b/packages/extension/src/ui/action/views/send-transaction/index.vue
@@ -12,6 +12,7 @@ import SendTransactionEVM from '@/providers/ethereum/ui/send-transaction/index.v
import SendTransactionBTC from '@/providers/bitcoin/ui/send-transaction/index.vue';
import SendTransactionKadena from '@/providers/kadena/ui/send-transaction/index.vue';
import SendTransactionSolana from '@/providers/solana/ui/send-transaction/index.vue';
+import SendTransactionMassa from '@/providers/massa/ui/send-transaction/index.vue';
import { useRoute } from 'vue-router';
import { ProviderName } from '@/types/provider';
import { getNetworkByName } from '@/libs/utils/networks';
@@ -25,6 +26,7 @@ const sendLayouts: Record
+
+
-
+
General
@@ -24,6 +24,10 @@ defineEmits<{ (e: 'window:back'): void; }>(); defineProps({ + hasBack: { + type: Boolean, + default: true, + }, isGeneral: { type: Boolean, default: false, diff --git a/packages/extension/src/ui/action/views/settings/views/settings-recovery/index.vue b/packages/extension/src/ui/action/views/settings/views/settings-recovery/index.vue index 28f20d3df..9f83f6777 100644 --- a/packages/extension/src/ui/action/views/settings/views/settings-recovery/index.vue +++ b/packages/extension/src/ui/action/views/settings/views/settings-recovery/index.vue @@ -1,6 +1,10 @@
-
@@ -43,6 +47,10 @@ import { MnemonicWithExtraWord } from '@enkryptcom/types';
import { computed, PropType } from 'vue';
const props = defineProps({
+ hasBack: {
+ type: Boolean,
+ default: true,
+ },
mnemonic: {
type: Object as PropType
+
Follow further instructions on your hardware wallet device
+ Waiting for Transactions to be mined, this can take upto 30
+ seconds
+
@@ -91,6 +95,7 @@ interface IProps {
isLoading: boolean;
isHardware: boolean;
isError: boolean;
+ waitingToBeMined: boolean;
errorMessage: string;
network: BaseNetwork;
}
diff --git a/packages/extension/src/ui/action/views/swap/index.vue b/packages/extension/src/ui/action/views/swap/index.vue
index 7541084f9..dc2f6df85 100644
--- a/packages/extension/src/ui/action/views/swap/index.vue
+++ b/packages/extension/src/ui/action/views/swap/index.vue
@@ -168,6 +168,7 @@ import { GenericNameResolver, CoinType } from '@/libs/name-resolver';
import { trackSwapEvents } from '@/libs/metrics';
import { SwapEventType } from '@/libs/metrics/types';
import { Connection } from '@solana/web3.js';
+import { SwapType } from '@enkryptcom/swap/src/types';
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const debug = (..._args: any[]) => {};
@@ -837,8 +838,12 @@ const sendAction = async () => {
const tradeStatusOptions = trades.map(t =>
t!.getStatusObject({ transactions: [] }),
);
+ const rfqTrades = trades.filter(t => t!.type === SwapType.rfq);
+ const tradesRfqOptions = rfqTrades.map(t => t!.getRFQObject!());
const statusObjects = await Promise.all(tradeStatusOptions);
+ const rfqOptionObjects = await Promise.all(tradesRfqOptions);
trades.forEach((t, idx) => (t!.status = statusObjects[idx]));
+ rfqTrades.forEach((t, idx) => (t!.rfqOptions = rfqOptionObjects[idx]));
if (!trades.length) {
swapError.value = SwapError.NO_TRADES;
toggleLooking();
@@ -956,7 +961,7 @@ const sendAction = async () => {
position: absolute;
left: 0;
bottom: 0;
- padding: 32px;
+ padding: 28px;
display: flex;
justify-content: space-between;
align-items: center;
diff --git a/packages/extension/src/ui/action/views/swap/libs/evm-gasvals.ts b/packages/extension/src/ui/action/views/swap/libs/evm-gasvals.ts
index aa7e97c28..4ca98ffd2 100644
--- a/packages/extension/src/ui/action/views/swap/libs/evm-gasvals.ts
+++ b/packages/extension/src/ui/action/views/swap/libs/evm-gasvals.ts
@@ -47,7 +47,20 @@ export const getEVMTransactionFees = async (
});
const gasVals = await Promise.all(gasPromises);
-
+ if (!gasVals.length) {
+ const zeroFees = {
+ nativeValue: '0',
+ fiatValue: '0.00',
+ nativeSymbol: network.currencyName,
+ fiatSymbol: 'USD',
+ };
+ return {
+ [GasPriceTypes.ECONOMY]: zeroFees,
+ [GasPriceTypes.REGULAR]: zeroFees,
+ [GasPriceTypes.FAST]: zeroFees,
+ [GasPriceTypes.FASTEST]: zeroFees,
+ };
+ }
const finalVal = gasVals.reduce((prev, curr) => {
if (!prev) return curr;
diff --git a/packages/extension/src/ui/action/views/swap/libs/evm-waitreceipt.ts b/packages/extension/src/ui/action/views/swap/libs/evm-waitreceipt.ts
new file mode 100644
index 000000000..9d99e5336
--- /dev/null
+++ b/packages/extension/src/ui/action/views/swap/libs/evm-waitreceipt.ts
@@ -0,0 +1,22 @@
+import { BaseNetwork } from '@/types/base-network';
+import EvmAPI from '@/providers/ethereum/libs/api';
+
+const waitForReceipt = async (
+ hashes: string[],
+ network: BaseNetwork,
+ timeOutSecs: number,
+) => {
+ const timeNow = new Date().getTime();
+ if (!hashes.length) return Promise.resolve();
+ const api = await network.api();
+ const web3 = (api as EvmAPI).web3;
+ let promises = hashes.map(hash => web3.getTransactionReceipt(hash));
+ while ((await Promise.all(promises)).find(i => i === null) === null) {
+ await new Promise(resolve => setTimeout(resolve, 2000));
+ if (new Date().getTime() - timeNow > timeOutSecs * 1000)
+ return Promise.reject('Transactions taking too long, timedout');
+ promises = hashes.map(hash => web3.getTransactionReceipt(hash));
+ }
+};
+
+export default waitForReceipt;
diff --git a/packages/extension/src/ui/action/views/swap/types.ts b/packages/extension/src/ui/action/views/swap/types.ts
index 98aad018f..213048f7b 100644
--- a/packages/extension/src/ui/action/views/swap/types.ts
+++ b/packages/extension/src/ui/action/views/swap/types.ts
@@ -10,6 +10,7 @@ import {
StatusOptionsResponse,
SolanaTransaction,
} from '@enkryptcom/swap';
+import { RFQOptionsResponse } from '@enkryptcom/swap/src/types';
import { EnkryptAccount } from '@enkryptcom/types';
export enum SWAP_LOADING {
LOADING = 'loading',
@@ -30,6 +31,7 @@ export interface SwapData {
export interface ProviderResponseWithStatus extends ProviderSwapResponse {
status?: StatusOptionsResponse;
+ rfqOptions?: RFQOptionsResponse;
}
export enum SwapBestOfferWarnings {
diff --git a/packages/extension/src/ui/action/views/swap/views/swap-best-offer/components/swap-best-offer-block/components/best-offer-list-item.vue b/packages/extension/src/ui/action/views/swap/views/swap-best-offer/components/swap-best-offer-block/components/best-offer-list-item.vue
index 8e088b0c8..4e3dc5533 100644
--- a/packages/extension/src/ui/action/views/swap/views/swap-best-offer/components/swap-best-offer-block/components/best-offer-list-item.vue
+++ b/packages/extension/src/ui/action/views/swap/views/swap-best-offer/components/swap-best-offer-block/components/best-offer-list-item.vue
@@ -1,7 +1,19 @@
+ ,
+ default: () => {
+ return '';
+ },
+ },
swapNumber: {
type: Number,
default: () => {
@@ -77,8 +98,8 @@ defineProps({
}
img {
- width: 32px;
- height: 32px;
+ width: 20px;
+ height: 20px;
margin-right: 8px;
}
diff --git a/packages/extension/src/ui/action/views/swap/views/swap-best-offer/components/swap-best-offer-block/components/best-offer-list.vue b/packages/extension/src/ui/action/views/swap/views/swap-best-offer/components/swap-best-offer-block/components/best-offer-list.vue
index d4c1ffc1c..f6e3d77a8 100644
--- a/packages/extension/src/ui/action/views/swap/views/swap-best-offer/components/swap-best-offer-block/components/best-offer-list.vue
+++ b/packages/extension/src/ui/action/views/swap/views/swap-best-offer/components/swap-best-offer-block/components/best-offer-list.vue
@@ -5,6 +5,7 @@
v-for="(trade, index) in trades"
:key="trade.provider"
:swap-number="index + 1"
+ :provider="trade.provider"
:amount="`~${getReadable(index)}`"
:select="() => select(trade)"
:is-checked="trade.provider === pickedTrade.provider"
diff --git a/packages/extension/src/ui/action/views/swap/views/swap-best-offer/components/swap-best-offer-block/index.vue b/packages/extension/src/ui/action/views/swap/views/swap-best-offer/components/swap-best-offer-block/index.vue
index 7891613de..916001302 100644
--- a/packages/extension/src/ui/action/views/swap/views/swap-best-offer/components/swap-best-offer-block/index.vue
+++ b/packages/extension/src/ui/action/views/swap/views/swap-best-offer/components/swap-best-offer-block/index.vue
@@ -1,6 +1,10 @@
+ ![]()
+
-
@@ -19,14 +31,23 @@
import DoneIcon from '@action/icons/common/done_icon.vue';
import LottieStatusJson from '@action/assets/animation/status.json';
import { Vue3Lottie } from 'vue3-lottie';
+import { ProviderName } from '@enkryptcom/swap/src/types';
+import { PROVIDER_INFO } from '@enkryptcom/swap';
+import { PropType } from 'vue';
-defineProps({
+const props = defineProps({
select: {
- type: Function as () => void,
+ type: Function as PropType<() => void>,
default: () => {
return null;
},
},
+ provider: {
+ type: String as PropTypeOffer {{ swapNumber }}
++ {{ + props.provider + ? PROVIDER_INFO[props.provider].name + : 'Unknown Provider' + }} +
{{ amount }}
-
+ Best offer including network fee powered by
+
Best offer including network fee
+
+ Best offer including network fee powered by
+ ![]()
+ {{ PROVIDER_INFO[props.pickedTrade.provider].name }}
+
for![]()
@@ -41,6 +45,14 @@ />
+
-
+ Provider:
+
+ {{ PROVIDER_INFO[props.pickedTrade.provider].name }}
+
Rate: 1 {{ fromToken.symbol.toUpperCase() }} ≈
{{ $filters.formatFloatingPointValue(ratio).value }}
@@ -89,6 +101,7 @@ import {
SwapToken,
} from '@enkryptcom/swap';
import { imageLoadError } from '@/ui/action/utils/misc';
+import { PROVIDER_INFO } from '@enkryptcom/swap';
interface SwapBestOfferProps {
trades: ProviderSwapResponse[];
@@ -178,6 +191,11 @@ const toggleOffers = () => {
letter-spacing: 0.15px;
color: @primaryLabel;
margin: 0 0 8px 0;
+
+ img {
+ margin-left: 2px;
+ width: 15px;
+ }
}
&__for {
diff --git a/packages/extension/src/ui/action/views/swap/views/swap-best-offer/index.vue b/packages/extension/src/ui/action/views/swap/views/swap-best-offer/index.vue
index 1e6e582f3..96ad92c2e 100644
--- a/packages/extension/src/ui/action/views/swap/views/swap-best-offer/index.vue
+++ b/packages/extension/src/ui/action/views/swap/views/swap-best-offer/index.vue
@@ -93,6 +93,7 @@
:is-error="isTXSendError"
:error-message="TXSendErrorMessage"
:network="network"
+ :waiting-to-be-mined="waitingToBeMined"
@update:close="close"
@update:try-again="sendAction"
/>
@@ -137,13 +138,14 @@ import { SwapBestOfferWarnings } from '../../types';
import { NATIVE_TOKEN_ADDRESS } from '@/providers/ethereum/libs/common';
import { EnkryptAccount, NetworkNames } from '@enkryptcom/types';
import { getNetworkByName } from '@/libs/utils/networks';
-import {
+import Swap, {
getNetworkInfoByName,
NetworkType,
ProviderSwapResponse,
SupportedNetworkName,
SwapToken,
} from '@enkryptcom/swap';
+import { TypedMessageSigner as EvmTypedMessageSigner } from '@/providers/ethereum/ui/libs/signer';
import PublicKeyRing from '@/libs/keyring/public-keyring';
import { SwapData, ProviderResponseWithStatus } from '../../types';
import { getSwapTransactions } from '../../libs/swap-txs';
@@ -159,6 +161,8 @@ import { getSolanaTransactionFees } from '../../libs/solana-gasvals';
import { SolanaNetwork } from '@/providers/solana/types/sol-network';
import RateState from '@/libs/rate-state';
import { useRateStore } from '@action/store/rate-store';
+import { SwapType, WalletIdentifier } from '@enkryptcom/swap/src/types';
+import waitForReceipt from '../../libs/evm-waitreceipt';
/** -------------------
* Rate
@@ -209,6 +213,8 @@ const isTXSendLoading = ref
+
Pin the Enkrypt extension
Click on
@@ -31,11 +28,25 @@ import ArrowBack from '@action/icons/common/arrow-back.vue'; import ExtensionIcon from '@action/icons/tip/extension-icon.vue'; import OnlineIcon from '@action/icons/tip/online-icon.vue'; import PinIcon from '@action/icons/tip/pin-icon.vue'; +import { onMounted } from 'vue'; import { useRoute, useRouter } from 'vue-router'; +import { isGeoRestricted } from '@/libs/utils/screening'; const route = useRoute(); const router = useRouter(); +onMounted(async () => { + isGeoRestricted().then(restricted => { + if (restricted) { + window.open( + 'https://help.myetherwallet.com/en/articles/12897302-geographic-restrictions-for-mew', + '_blank', + 'noopener', + ); + window.close(); + } + }); +}); const isShowBackButton = () => { return ( route.name && @@ -61,8 +72,7 @@ const wrapClassObject = () => {