Skip to content

Commit

Permalink
Merge pull request #114 from multiversx/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
radumojic authored Apr 22, 2024
2 parents 257c698 + 9a46998 commit 0dc776c
Show file tree
Hide file tree
Showing 6 changed files with 2,684 additions and 1,976 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/wdio-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ jobs:
- name: Start
run: npm run start
- name: Wait on Localhost
run: npx wait-on http://localhost:3001
run: npx wait-on https://localhost:3001
- name: Test
run: npm run wdio
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
"@fortawesome/fontawesome-svg-core": "6.5.1",
"@fortawesome/free-solid-svg-icons": "6.5.1",
"@fortawesome/react-fontawesome": "0.2.0",
"@multiversx/sdk-core": "13.0.0-beta.6",
"@multiversx/sdk-dapp": "2.29.0-beta.7",
"@multiversx/sdk-dapp-sc-explorer": "0.0.1-beta.7",
"@multiversx/sdk-native-auth-server": "1.0.16",
"@multiversx/sdk-wallet": "4.3.0",
"@multiversx/sdk-core": "13.1.0",
"@multiversx/sdk-dapp": "2.31.5",
"@multiversx/sdk-dapp-sc-explorer": "0.0.1-beta.8",
"@multiversx/sdk-native-auth-server": "1.0.17",
"@multiversx/sdk-wallet": "4.4.0",
"@uiw/react-textarea-code-editor": "2.1.9",
"axios": "1.6.5",
"bignumber.js": "9.1.0",
Expand Down
53 changes: 32 additions & 21 deletions src/assets/sass/plugins/sdk-sc-explorer/_dappCoreOverrides.scss
Original file line number Diff line number Diff line change
@@ -1,26 +1,37 @@
@import './variables';

.dapp-core-component__transactionsToastList-styles__toasts {
border-radius: 0.45rem !important;
background-color: #242526 !important;
bottom: 2rem !important;
color:#fff;
position:fixed !important;

.dapp-core-component__transactionToast-styles__content {
padding-bottom: 1rem !important;
color: #fff !important;
border-radius: 0.45rem !important;
background-color: #242526 !important;
bottom: 2rem !important;
color: #fff;
position: fixed !important;

.dapp-core-component__transactionToast-styles__content {
padding-bottom: 1rem !important;
color: #fff !important;
}

.dapp-core-component__customToast-styles__close {
opacity: 1;
margin-right: 0.675rem !important;
&:hover {
opacity: 0.75;
}

.dapp-core-component__customToast-styles__close {
opacity: 1;
margin-right: 0.675rem !important;
&:hover {
opacity: 0.75;
}
svg {
color: red !important;
fill: red !important;
}
svg {
color: red !important;
fill: red !important;
}
}
}
}

.dapp-core-component__transactionStatusToastStyles__transactions-status-toast-icon {
width: 3rem !important;
min-width: 3rem !important;
height: 3rem !important;
padding: 0 !important;
margin-right: 0.25rem;
svg {
width: 25px !important;
}
}
3 changes: 3 additions & 0 deletions src/assets/sass/plugins/sdk-sc-explorer/_inputs.scss
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@
.dapp-core-component__amountInput-module__amount-input {
padding: 1rem 0.5rem;
font-weight: 400;
&:focus {
border-color: transparent;
}
}
.dapp-core-component__globals-module__error {
padding-top: 0;
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Unlock/Unlock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
ExtensionLoginButton,
LedgerLoginButton,
WalletConnectLoginButton,
WebWalletLoginButton,
CrossWindowLoginButton,
} from '@multiversx/sdk-dapp/UI';
import { Modal } from 'react-bootstrap';
import { useLocation, useNavigate } from 'react-router-dom';
Expand Down Expand Up @@ -93,7 +93,7 @@ export const Unlock = () => {
},
{
name: 'MultiversX Web Wallet',
component: WebWalletLoginButton,
component: CrossWindowLoginButton,
},
];

Expand Down
Loading

0 comments on commit 0dc776c

Please sign in to comment.