Skip to content

Commit a145e7e

Browse files
arhtudormorararhtudormorar
authored
Merge pull request #353 from multiversx/tm/feature/session-callbacks
Session callbacks
2 parents 4947eb7 + 6d4161c commit a145e7e

5 files changed

Lines changed: 60 additions & 75 deletions

File tree

‎package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"@fortawesome/fontawesome-svg-core": "6.5.1",
1010
"@fortawesome/free-solid-svg-icons": "6.5.1",
1111
"@fortawesome/react-fontawesome": "0.2.0",
12-
"@multiversx/sdk-core": "14.0.2",
13-
"@multiversx/sdk-dapp": "5.0.0-alpha.5",
14-
"@multiversx/sdk-dapp-ui": "0.0.6",
12+
"@multiversx/sdk-core": "14.2.0",
13+
"@multiversx/sdk-dapp": "5.0.0-alpha.11",
14+
"@multiversx/sdk-dapp-ui": "0.0.7",
1515
"@multiversx/sdk-dapp-utils": "2.0.0",
1616
"axios": "1.7.4",
1717
"classnames": "2.3.2",

‎src/initConfig.ts‎

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,13 @@
11
import './styles/globals.css';
22

33
import { walletConnectV2ProjectId } from 'config';
4-
import {
5-
EnvironmentsEnum,
6-
ICustomProvider,
7-
InitAppType,
8-
ProviderTypeEnum
9-
} from './lib';
4+
import { EnvironmentsEnum, ICustomProvider, InitAppType } from './lib';
105
import { InMemoryProvider } from './provider/inMemoryProvider';
116

12-
const ADDITIONAL_PROVIDERS = {
13-
inMemoryProvider: 'inMemoryProvider'
14-
} as const;
15-
16-
export const ExtendedProviders = {
17-
...ProviderTypeEnum,
18-
...ADDITIONAL_PROVIDERS
19-
} as const;
20-
21-
const DEFAULT_TOAST_LIEFTIME = 5000;
22-
23-
const providers: ICustomProvider<ProviderTypeEnum>[] = [
7+
const providers: ICustomProvider[] = [
248
{
259
name: 'In Memory Provider',
26-
type: ExtendedProviders.inMemoryProvider,
10+
type: 'inMemoryProvider',
2711
iconUrl: `${window.location.origin}/multiversx-white.svg`,
2812
constructor: async (options) => new InMemoryProvider(options)
2913
}
@@ -42,8 +26,7 @@ export const config: InitAppType = {
4226
walletConnect: {
4327
walletConnectV2ProjectId
4428
}
45-
},
46-
successfulToastLifetime: DEFAULT_TOAST_LIEFTIME
29+
}
4730
}
4831

4932
// Option 2: Add providers using the config `customProviders` array

‎src/lib/sdkDapp/sdkDapp.types.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ export { EnvironmentsEnum } from '@multiversx/sdk-dapp/out/types/enums.types';
33
export type { ICustomProvider } from '@multiversx/sdk-dapp/out/providers/types/providerFactory.types';
44
export type { IProvider } from '@multiversx/sdk-dapp/out/providers/types/providerFactory.types';
55
export type { InitAppType } from '@multiversx/sdk-dapp/out/methods/initApp/initApp.types';
6-
export { ProviderTypeEnum } from '@multiversx/sdk-dapp/out/providers/types/providerFactory.types';
76
export type { ServerTransactionType } from '@multiversx/sdk-dapp/out/types/serverTransactions.types';
87
export type { SignedTransactionType } from '@multiversx/sdk-dapp/out/types/transactions.types';
98
export type { TransactionsDisplayInfoType } from '@multiversx/sdk-dapp/out/types/transactions.types';

‎tests/utils/enums.ts‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,6 @@ export enum GlobalDataEnum {
3434
transactionCanceled = 'Transaction canceled'
3535
}
3636

37-
export enum RoutesEnum {
38-
converters = 'converters',
39-
auth = 'auth',
40-
signMsg = 'sign-message',
41-
scDeploy = 'smart-contract',
42-
explainer = 'explainer',
43-
login = 'unlock',
44-
xportal = 'walletconnect',
45-
ledger = 'ledger',
46-
dashboard = 'dashboard'
47-
}
48-
4937
export enum GlobalSelectorEnum {
5038
homeTitle = 'home-title',
5139
homeDescription = 'home-description',
@@ -65,7 +53,6 @@ export enum GlobalSelectorEnum {
6553
crossWindowLoginBtn = '[data-testid="webWalletLoginBtn"]',
6654
legacyWebWalletLoginDropdownButton = '[data-testid="legacyWebWalletLoginDropdownButton"]',
6755
legacyDropdownValue = '//*[@aria-labelledby="dropdown-button"]',
68-
sendToSelfBtn = 'button*=Send to self',
6956
accesWalletBtn = '[data-testid="submitButton"]',
7057
signBtn = '[data-testid="signBtn"]',
7158
toastSelector = 'transactionToastTitle',
@@ -102,6 +89,24 @@ export enum GlobalSelectorEnum {
10289
signButton = 'signButton'
10390
}
10491

92+
export enum RoutesEnum {
93+
converters = 'converters',
94+
auth = 'auth',
95+
signMsg = 'sign-message',
96+
scDeploy = 'smart-contract',
97+
explainer = 'explainer',
98+
login = 'unlock',
99+
xportal = 'walletconnect',
100+
ledger = 'ledger',
101+
dashboard = 'dashboard'
102+
}
103+
104+
export enum TransactionIndexEnum {
105+
ping = 0,
106+
swapLock = 3,
107+
signBatch = 4
108+
}
109+
105110
export enum WalletAdressEnum {
106111
adress1 = 'erd1qtknph0q5hsm4hmjpvzusj8vgy8m48lpvclnv6jlkw4uu7sacj6smz8uhg',
107112
adress2 = 'erd16fq70uf7mdkkkv3fylawk7269ef63kv2vh5s4lrtm58aufve8dtqjlhjjn',
@@ -111,9 +116,3 @@ export enum WalletAdressEnum {
111116
adress6 = 'erd1p7a4q6qz9pns8mytcw62n2anuhd8nh6qkh4w5mzf9s7urdlkud5q94d630',
112117
adress7 = 'erd1tqtxnneypvga204w3e26096kpyxmtfk660yq7fh3jswtwagpwuds2a8wr3'
113118
}
114-
115-
export enum TransactionIndexEnum {
116-
ping = 0,
117-
swapLock = 3,
118-
signBatch = 4
119-
}

‎yarn.lock‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,10 +1037,10 @@
10371037
resolved "https://registry.yarnpkg.com/@multiversx/sdk-bls-wasm/-/sdk-bls-wasm-0.3.5.tgz#2e83308fdc7a0928c6d5a7f910d796fd8eb2d90b"
10381038
integrity sha512-c0tIdQUnbBLSt6NYU+OpeGPYdL0+GV547HeHT8Xc0BKQ7Cj0v82QUoA2QRtWrR1G4MNZmLsIacZSsf6DrIS2Bw==
10391039

1040-
"@multiversx/sdk-core@14.0.2":
1041-
version "14.0.2"
1042-
resolved "https://registry.yarnpkg.com/@multiversx/sdk-core/-/sdk-core-14.0.2.tgz#e910f94f930fdbbf7a9c8587022d9c41f8aa9318"
1043-
integrity sha512-bVrKH23NSsfVyIZKujFrc8k+mBMM4pJDNe+8CHG3M0OUPi/kOVBev6VFmLpQyW9/t25VHU1lR6c4A/qhZOl1Mw==
1040+
"@multiversx/sdk-core@14.2.0":
1041+
version "14.2.0"
1042+
resolved "https://registry.yarnpkg.com/@multiversx/sdk-core/-/sdk-core-14.2.0.tgz#3577da496d2c2bbecffbe47aa30097f9caee44bf"
1043+
integrity sha512-f9J3qFHoghWiRo07WMFvf3/HGr18Uoa22ocfkawTTKlL3TPZuNBxsZoR5IND6bsxyHB9MkKlOzoTMy13eLmqzw==
10441044
dependencies:
10451045
"@multiversx/sdk-transaction-decoder" "1.0.2"
10461046
"@noble/ed25519" "1.7.3"
@@ -1060,10 +1060,10 @@
10601060
axios "^1.7.4"
10611061
bip39 "3.1.0"
10621062

1063-
"@multiversx/sdk-dapp-ui@0.0.6", "@multiversx/sdk-dapp-ui@>=0.0.6":
1064-
version "0.0.6"
1065-
resolved "https://registry.yarnpkg.com/@multiversx/sdk-dapp-ui/-/sdk-dapp-ui-0.0.6.tgz#f4b0d66c456b42fca14927abe37e7e7637a8b0ff"
1066-
integrity sha512-iJg9OYlcx0TTifzn5XuVMSfgq/Exk4OQRpLrEDtdUkMDRM00TlvxWRg7tKVkWtsBUk7koWA1WVo6g7HCf2Sm5g==
1063+
"@multiversx/sdk-dapp-ui@0.0.7", "@multiversx/sdk-dapp-ui@>=0.0.7":
1064+
version "0.0.7"
1065+
resolved "https://registry.yarnpkg.com/@multiversx/sdk-dapp-ui/-/sdk-dapp-ui-0.0.7.tgz#6e8914c49fb6a34dcae3087a7fc05db2d76f46e5"
1066+
integrity sha512-5bTTY62JYvb9Zo0Z/WBl6ZxMjzvm4lF9K0Ntq9IAG8a0E9nDs7zcWc2gOB8vXYvHN0CL6WINXIqNT1da9KtzBw==
10671067
dependencies:
10681068
"@fortawesome/fontawesome-svg-core" ">= 6.7.2"
10691069
"@fortawesome/free-solid-svg-icons" ">= 6.7.2"
@@ -1075,30 +1075,29 @@
10751075
qrcode ">= 1.5.4"
10761076
sass-embedded "^1.85.1"
10771077

1078-
"@multiversx/sdk-dapp-utils@2.0.0", "@multiversx/sdk-dapp-utils@>= 1.0.4", "@multiversx/sdk-dapp-utils@^2.x":
1078+
"@multiversx/sdk-dapp-utils@2.0.0", "@multiversx/sdk-dapp-utils@>= 1.0.4":
10791079
version "2.0.0"
10801080
resolved "https://registry.yarnpkg.com/@multiversx/sdk-dapp-utils/-/sdk-dapp-utils-2.0.0.tgz#15cae568ae5d25ea2ac12c3793d52d18db5ac1fe"
10811081
integrity sha512-NcaQUgXrjDqjKJgbUj1eM11ID7sDJRVFamjEA/VO4qquP8jBOrSeW0ltvppHElZGC/A14tNDERPbZQkrLIa2KQ==
10821082

1083-
"@multiversx/sdk-dapp@5.0.0-alpha.5":
1084-
version "5.0.0-alpha.5"
1085-
resolved "https://registry.yarnpkg.com/@multiversx/sdk-dapp/-/sdk-dapp-5.0.0-alpha.5.tgz#f129dbb7c398aaa54301c419174c0543883936e0"
1086-
integrity sha512-aimk5eOJGTTN8RpX6HwLgtFFMG8vOKxlvFByK468LCn6U/6HVJWoPWyBvX9SWZZKNi4YmWjnB+uUh1f52lvYmg==
1083+
"@multiversx/sdk-dapp@5.0.0-alpha.11":
1084+
version "5.0.0-alpha.11"
1085+
resolved "https://registry.yarnpkg.com/@multiversx/sdk-dapp/-/sdk-dapp-5.0.0-alpha.11.tgz#9b55afaecd7eac6a4ddc227d4cdc4b80775b5eaa"
1086+
integrity sha512-XmlAFZj890Ju7f2gn4bC2Gb8qdjdSC2Pacp87X4Kii/Sw/iRiyb0mBZe3ivCljrcFg41zUj6r9VMO6k3hl3afg==
10871087
dependencies:
10881088
"@lifeomic/axios-fetch" "3.0.1"
1089-
"@multiversx/sdk-core" "14.0.2"
1090-
"@multiversx/sdk-dapp-utils" "^2.x"
10911089
"@multiversx/sdk-extension-provider" "5.0.0"
10921090
"@multiversx/sdk-hw-provider" "8.0.0"
10931091
"@multiversx/sdk-metamask-provider" "2.0.0"
10941092
"@multiversx/sdk-native-auth-client" "1.0.9"
10951093
"@multiversx/sdk-wallet" "4.6.0"
10961094
"@multiversx/sdk-wallet-connect-provider" "6.0.1"
1097-
"@multiversx/sdk-web-wallet-cross-window-provider" "3.1.0"
1098-
"@multiversx/sdk-web-wallet-iframe-provider" "3.0.0"
1095+
"@multiversx/sdk-web-wallet-cross-window-provider" "3.1.1"
1096+
"@multiversx/sdk-web-wallet-iframe-provider" "3.0.3"
10991097
"@multiversx/sdk-web-wallet-provider" "5.0.0"
1100-
"@multiversx/sdk-webview-provider" "3.0.1"
1098+
"@multiversx/sdk-webview-provider" "3.1.1"
11011099
immer "10.1.1"
1100+
linkifyjs "4.3.1"
11021101
lodash.isempty "4.4.0"
11031102
lodash.isequal "4.5.0"
11041103
lodash.isstring "4.0.1"
@@ -1109,7 +1108,7 @@
11091108
socket.io-client "4.7.5"
11101109
zustand "4.4.7"
11111110
optionalDependencies:
1112-
"@multiversx/sdk-dapp-ui" ">=0.0.6"
1111+
"@multiversx/sdk-dapp-ui" ">=0.0.7"
11131112

11141113
"@multiversx/sdk-extension-provider@5.0.0":
11151114
version "5.0.0"
@@ -1179,17 +1178,17 @@
11791178
tweetnacl "1.0.3"
11801179
uuid "8.3.2"
11811180

1182-
"@multiversx/sdk-web-wallet-cross-window-provider@3.1.0":
1183-
version "3.1.0"
1184-
resolved "https://registry.yarnpkg.com/@multiversx/sdk-web-wallet-cross-window-provider/-/sdk-web-wallet-cross-window-provider-3.1.0.tgz#d8942d17cbd20da3e0c9636c3e7b12ddaf47cc6e"
1185-
integrity sha512-O3FCpRal99Bxf9ESmGB+FD6D5AcIf6Kjo3A2FTwdyhCYu3m2lRtwoFsd+uXSo7FXoMWrlZJaQsdO8GYOo/HQhQ==
1181+
"@multiversx/sdk-web-wallet-cross-window-provider@3.1.1":
1182+
version "3.1.1"
1183+
resolved "https://registry.yarnpkg.com/@multiversx/sdk-web-wallet-cross-window-provider/-/sdk-web-wallet-cross-window-provider-3.1.1.tgz#62534fb4a2cadfc173a54d4d85343a7b1be98226"
1184+
integrity sha512-1hw9Z7HwceQXk6XpOIvYSwmIxDrdoIhUNzLP4VGvsVHJcLw7mqbhA+txXqqevCgB61VmHBV6FNLRWp6U6JvgEw==
11861185
dependencies:
11871186
qs "6.11.2"
11881187

1189-
"@multiversx/sdk-web-wallet-iframe-provider@3.0.0":
1190-
version "3.0.0"
1191-
resolved "https://registry.yarnpkg.com/@multiversx/sdk-web-wallet-iframe-provider/-/sdk-web-wallet-iframe-provider-3.0.0.tgz#65068b2fa9fc0084a2c4fb90d8e686df14258e5e"
1192-
integrity sha512-qEPARy3iMsmnOiRKBsAN2PCXP1l1kHpNn+8MvVFmdHC6jt5mdyKJw5Dj7CgReoLeuHwUtGDp5OGjUUGk6Cf9gg==
1188+
"@multiversx/sdk-web-wallet-iframe-provider@3.0.3":
1189+
version "3.0.3"
1190+
resolved "https://registry.yarnpkg.com/@multiversx/sdk-web-wallet-iframe-provider/-/sdk-web-wallet-iframe-provider-3.0.3.tgz#cdef2a425f191a745a6276dd19c441e36e570a26"
1191+
integrity sha512-lxIFSoutQJD3fIxW/YpEW4/7U6VUoHjVSeOlwgQJr/MmkuURJKpWezPForvPur17tYsxTHmnwWOdD5Ja8OEAtA==
11931192
dependencies:
11941193
"@types/jest" "^29.5.11"
11951194
"@types/qs" "6.9.10"
@@ -1202,10 +1201,10 @@
12021201
dependencies:
12031202
qs "6.10.3"
12041203

1205-
"@multiversx/sdk-webview-provider@3.0.1":
1206-
version "3.0.1"
1207-
resolved "https://registry.yarnpkg.com/@multiversx/sdk-webview-provider/-/sdk-webview-provider-3.0.1.tgz#7413c97756fb4438147f764fe093af4737f79626"
1208-
integrity sha512-Bw4h8lR3p6a8TdU0tCs0LmBYFxCfVzOkEL0kMtMOBxna/6DGTnvpuOmB33LeVPluHUw5jLlFHNCClQst916vuA==
1204+
"@multiversx/sdk-webview-provider@3.1.1":
1205+
version "3.1.1"
1206+
resolved "https://registry.yarnpkg.com/@multiversx/sdk-webview-provider/-/sdk-webview-provider-3.1.1.tgz#35124895353e269f418fa8f4d06e441b5f62b419"
1207+
integrity sha512-HwGL0m4DAirw087MZyGUcq1mWR1tTzommpdhMhhPQLNeeUJT+uZKTIAbBEHef7wehxSPp15QVCrI6uoOOPN+jA==
12091208

12101209
"@noble/ciphers@1.2.1":
12111210
version "1.2.1"
@@ -6902,6 +6901,11 @@ lines-and-columns@^2.0.3:
69026901
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.4.tgz#d00318855905d2660d8c0822e3f5a4715855fc42"
69036902
integrity sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==
69046903

6904+
linkifyjs@4.3.1:
6905+
version "4.3.1"
6906+
resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.3.1.tgz#1f246ebf4be040002accd1f4535b6af7c7e37898"
6907+
integrity sha512-DRSlB9DKVW04c4SUdGvKK5FR6be45lTU9M76JnngqPeeGDqPwYc0zdUErtsNVMtxPXgUWV4HbXbnC4sNyBxkYg==
6908+
69056909
listenercount@~1.0.1:
69066910
version "1.0.1"
69076911
resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937"

0 commit comments

Comments
 (0)