Skip to content
Open
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
75 changes: 40 additions & 35 deletions config-overrides.js
Original file line number Diff line number Diff line change
@@ -1,48 +1,53 @@
const webpack = require("webpack");

module.exports = function override(webpackConfig) {
webpackConfig.resolve.fallback = {
url: require.resolve("url"),
querystring: false,
assert: require.resolve("assert"),
crypto: require.resolve("crypto-browserify"),
path: require.resolve("path"),
fs: false,
os: false,
http: require.resolve("stream-http"),
https: require.resolve("https-browserify"),
buffer: require.resolve("buffer"),
stream: require.resolve("stream-browserify"),
zlib: require.resolve("browserify-zlib"),
};
webpackConfig.resolve.fallback = {
url: require.resolve("url"),
querystring: false,
assert: require.resolve("assert"),
crypto: require.resolve("crypto-browserify"),
path: require.resolve("path"),
fs: false,
os: false,
http: require.resolve("stream-http"),
https: require.resolve("https-browserify"),
buffer: require.resolve("buffer"),
stream: require.resolve("stream-browserify"),
zlib: require.resolve("browserify-zlib"),
vm: false,
};

webpackConfig.ignoreWarnings = [/Failed to parse source map/];
webpackConfig.ignoreWarnings = [/Failed to parse source map/];

/* webpackConfig.resolve.alias = {
/* webpackConfig.resolve.alias = {
...webpackConfig.resolve.alias,
"@hashgraph/proto": "@hashgraph/proto/lib/proto.js",
};*/

webpackConfig.module.rules = webpackConfig.module.rules.map((rule) => {
if (rule.oneOf instanceof Array) {
rule.oneOf[rule.oneOf.length - 1].exclude = [/\.(js|mjs|jsx|cjs|ts|tsx)$/, /\.html$/, /\.json$/];
}
return rule;
});
webpackConfig.module.rules = webpackConfig.module.rules.map((rule) => {
if (rule.oneOf instanceof Array) {
rule.oneOf[rule.oneOf.length - 1].exclude = [
/\.(js|mjs|jsx|cjs|ts|tsx)$/,
/\.html$/,
/\.json$/,
];
}
return rule;
});

webpackConfig.module.rules.push({
test: /\.m?js/,
resolve: {
fullySpecified: false,
},
});
webpackConfig.module.rules.push({
test: /\.m?js/,
resolve: {
fullySpecified: false,
},
});

webpackConfig.plugins.push(
new webpack.ProvidePlugin({
process: "process/browser",
Buffer: ["buffer", "Buffer"],
})
);
webpackConfig.plugins.push(
new webpack.ProvidePlugin({
process: "process/browser",
Buffer: ["buffer", "Buffer"],
})
);

return webpackConfig;
return webpackConfig;
};
252 changes: 126 additions & 126 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,128 +1,128 @@
{
"name": "xp-network-bridge",
"version": "0.1.0",
"private": true,
"browser": {
"crypto": false,
"electron": false
},
"dependencies": {
"@harmony-js/core": "^0.1.57",
"@hashgraph/sdk": "^2.34.1",
"@multiversx/sdk-extension-provider": "^3.0.0",
"@multiversx/sdk-wallet-connect-provider": "^4.0.3",
"@near-wallet-selector/core": "^7.9.2",
"@near-wallet-selector/here-wallet": "^7.9.2",
"@near-wallet-selector/meteor-wallet": "^7.9.2",
"@near-wallet-selector/modal-ui": "^7.9.2",
"@near-wallet-selector/my-near-wallet": "^7.9.2",
"@near-wallet-selector/near-wallet": "^7.9.2",
"@near-wallet-selector/sender": "^7.9.2",
"@perawallet/connect": "^1.2.1",
"@randlabs/myalgo-connect": "^1.1.1",
"@reduxjs/toolkit": "^1.9.5",
"@solana/web3.js": "^1.73.3",
"@taquito/beacon-wallet": "^13.0.0",
"@taquito/taquito": "^12.1.1",
"@temple-wallet/dapp": "^7.0.0",
"@ton/core": "^0.53.0",
"@ton/crypto": "^3.2.0",
"@uauth/js": "^2.4.0",
"@uauth/web3modal": "^2.4.0",
"@vechain/connex": "^2.0.14",
"@walletconnect/client": "^1.7.0",
"@walletconnect/web3-provider": "^1.8.0",
"@web3-react/core": "^6.1.9",
"@web3-react/injected-connector": "^6.0.7",
"@web3-react/walletconnect-connector": "^6.2.8",
"@web3modal/ethereum": "^2.7.1",
"@web3modal/react": "^2.7.1",
"algorand-walletconnect-qrcode-modal": "^1.6.1",
"axios": "^1.3.3",
"bignumber.js": "=9.0.1",
"bootstrap": "^4.6.0",
"browserify-zlib": "^0.2.0",
"crypto-browserify": "^3.12.0",
"ethers": "^5",
"hashconnect": "^0.2.9",
"https-browserify": "^1.0.0",
"ic-stoic-identity": "^2.0.0",
"jest": "^29.7.0",
"moment": "^2.29.1",
"near-api-js": "^1.1.0",
"nft-parser": "git+https://github.com/xp-network/nft-parser#bleeding-edge",
"path": "^0.12.7",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-app-rewired": "^2.2.1",
"react-blockies": "^1.4.1",
"react-bootstrap": "^2.0.0",
"react-copy-to-clipboard": "^5.0.4",
"react-dom": "^18.2.0",
"react-ga4": "^2.1.0",
"react-jazzicon": "^1.0.3",
"react-modal-image": "^2.5.0",
"react-qrcode-logo": "^2.8.0",
"react-redux": "^8.1.0",
"react-router": "^6.13.0",
"react-router-bootstrap": "^0.26.0",
"react-router-dom": "^6.13.0",
"react-scripts": "^5.0.1",
"rxjs": "^7.8.0",
"secretjs": "=1.4.7",
"socket.io-client": "^4.6.2",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"ton-x": "^2.0.0",
"tonweb": "^0.0.60",
"url": "^0.11.0",
"viem": "^1.2.9",
"wagmi": "^1.4.1",
"web3": "^1.8.2",
"web3-providers-connex": "^0.7.4",
"web3modal": "^1.9.12",
"xp.network": "git+https://github.com/XP-NETWORK/xpjs#bleeding-edge"
},
"scripts": {
"analyze": "source-map-explorer 'build/static/js/*.js'",
"start": "react-app-rewired start",
"build": "GENERATE_SOURCEMAP=false REACT_APP_GIT_SHA=`git rev-parse HEAD` react-app-rewired build --max-old-space-size=8192",
"eject": "react-app-rewired eject",
"predeploy": "npm run build",
"test": "react-app-rewired test --transformIgnorePatterns 'node_modules/(?!@codemirror)/'",
"deploy": "gh-pages -d build"
},
"resolutions": {
"react-error-overlay": "6.0.9"
},
"eslintConfig": {
"extends": []
},
"browserslist": {
"production": [
"chrome >= 67",
"edge >= 79",
"firefox >= 68",
"opera >= 54",
"safari >= 14"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"eslint": "^8.26.0",
"eslint-plugin-react": "^7.31.10",
"gh-pages": "^3.2.3",
"parcel": "^2.7.0",
"react-error-overlay": "6.0.9",
"react-test-renderer": "^18.2.0",
"source-map-explorer": "^2.5.3"
},
"main": "index.js",
"repository": "https://github.com/XP-NETWORK/bridge-interface.git",
"author": "YuraDXPNetwork <[email protected]>",
"license": "MIT"
"name": "xp-network-bridge",
"version": "0.1.0",
"private": true,
"browser": {
"crypto": false,
"electron": false
},
"dependencies": {
"@harmony-js/core": "^0.1.57",
"@hashgraph/sdk": "^2.34.1",
"@multiversx/sdk-extension-provider": "^3.0.0",
"@multiversx/sdk-wallet-connect-provider": "^4.0.3",
"@near-wallet-selector/core": "^7.9.2",
"@near-wallet-selector/here-wallet": "^7.9.2",
"@near-wallet-selector/meteor-wallet": "^7.9.2",
"@near-wallet-selector/modal-ui": "^7.9.2",
"@near-wallet-selector/my-near-wallet": "^7.9.2",
"@near-wallet-selector/near-wallet": "^7.9.2",
"@near-wallet-selector/sender": "^7.9.2",
"@perawallet/connect": "^1.2.1",
"@randlabs/myalgo-connect": "^1.1.1",
"@reduxjs/toolkit": "^1.9.5",
"@solana/web3.js": "^1.73.3",
"@taquito/beacon-wallet": "^13.0.0",
"@taquito/taquito": "^12.1.1",
"@temple-wallet/dapp": "^7.0.0",
"@ton/core": "^0.53.0",
"@ton/crypto": "^3.2.0",
"@uauth/js": "^2.4.0",
"@uauth/web3modal": "^2.4.0",
"@vechain/connex": "^2.0.14",
"@walletconnect/client": "^1.7.0",
"@walletconnect/web3-provider": "^1.8.0",
"@web3-react/core": "^6.1.9",
"@web3-react/injected-connector": "^6.0.7",
"@web3-react/walletconnect-connector": "^6.2.8",
"@web3modal/ethereum": "^2.7.1",
"@web3modal/react": "^2.7.1",
"algorand-walletconnect-qrcode-modal": "^1.6.1",
"axios": "^1.3.3",
"bignumber.js": "=9.0.1",
"bootstrap": "^4.6.0",
"browserify-zlib": "^0.2.0",
"crypto-browserify": "^3.12.0",
"ethers": "^5",
"hashconnect": "^0.2.9",
"https-browserify": "^1.0.0",
"ic-stoic-identity": "^2.0.0",
"jest": "^29.7.0",
"moment": "^2.29.1",
"near-api-js": "^1.1.0",
"nft-parser": "git+https://github.com/xp-network/nft-parser#bleeding-edge",
"path": "^0.12.7",
"prop-types": "^15.8.1",
"react": "^18.2.0",
"react-app-rewired": "^2.2.1",
"react-blockies": "^1.4.1",
"react-bootstrap": "^2.0.0",
"react-copy-to-clipboard": "^5.0.4",
"react-dom": "^18.2.0",
"react-ga4": "^2.1.0",
"react-jazzicon": "^1.0.3",
"react-modal-image": "^2.5.0",
"react-qrcode-logo": "^2.8.0",
"react-redux": "^8.1.0",
"react-router": "^6.13.0",
"react-router-bootstrap": "^0.26.0",
"react-router-dom": "^6.13.0",
"react-scripts": "^5.0.1",
"rxjs": "^7.8.0",
"secretjs": "=1.4.7",
"socket.io-client": "^4.6.2",
"stream-browserify": "^3.0.0",
"stream-http": "^3.2.0",
"ton-x": "^2.0.0",
"tonweb": "^0.0.60",
"url": "^0.11.0",
"viem": "^1.2.9",
"wagmi": "^1.4.1",
"web3": "^1.8.2",
"web3-providers-connex": "^0.7.4",
"web3modal": "^1.9.12",
"xp.network": "git+https://github.com/XP-NETWORK/xpjs#bleeding-edge"
},
"scripts": {
"analyze": "source-map-explorer 'build/static/js/*.js'",
"start": "react-app-rewired start",
"build": "GENERATE_SOURCEMAP=false REACT_APP_GIT_SHA=`git rev-parse HEAD` NODE_OPTIONS=--max-old-space-size=8192 react-app-rewired build",
"eject": "react-app-rewired eject",
"predeploy": "npm run build",
"test": "react-app-rewired test --transformIgnorePatterns 'node_modules/(?!@codemirror)/'",
"deploy": "gh-pages -d build"
},
"resolutions": {
"react-error-overlay": "6.0.9"
},
"eslintConfig": {
"extends": []
},
"browserslist": {
"production": [
"chrome >= 67",
"edge >= 79",
"firefox >= 68",
"opera >= 54",
"safari >= 14"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"eslint": "^8.26.0",
"eslint-plugin-react": "^7.31.10",
"gh-pages": "^3.2.3",
"parcel": "^2.7.0",
"react-error-overlay": "6.0.9",
"react-test-renderer": "^18.2.0",
"source-map-explorer": "^2.5.3"
},
"main": "index.js",
"repository": "https://github.com/XP-NETWORK/bridge-interface.git",
"author": "YuraDXPNetwork <[email protected]>",
"license": "MIT"
}
3 changes: 2 additions & 1 deletion src/components/App/container.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const Container = ({ children, serviceContainer, setContainer }) => {

const event = window.location.pathname === "/crossroads";
const eventMinting = window.location.pathname.includes("/minting");
const eventMintingHedera = window.location.pathname.includes("/hedera");

if (!event) {
if (window.location.pathname.includes(BridgeModes.Staging)) {
Expand All @@ -51,7 +52,7 @@ const Container = ({ children, serviceContainer, setContainer }) => {
const bridge = await serviceContainer?.bridge?.init(network);
checkWallet && bridge.setCheckWallet(checkWallet);

if (!event && !eventMinting) {
if (!event && !eventMinting && !eventMintingHedera) {
setContainer({ ...serviceContainer, bridge });

const query = window.location.search;
Expand Down
8 changes: 8 additions & 0 deletions src/components/Wallet/ConnectWalletHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,14 @@ export const connectMetaMask = async (
}?to=${to}&from=${from}/`;
window.open(link);
}

if (!window.ethereum && mobile) {
const event = window.location.pathname === "/hedera";
const link = `dapp://${window.location.host}${
event ? "/hedera" : ""
}?to=${to}&from=${from}/`;
window.open(link);
}
//d/
if (!mobile && !window.safeLocalStorage?.getItem("XP_MM_CONNECTED"))
await window.ethereum.request({
Expand Down
Loading