Gateway Fixes #1633
Gateway Fixes #1633
Conversation
WalkthroughThe changes made to the wallet extension's code aim to enhance the user interface and optimize the JavaScript functions. The HTML structure was reorganized, a new section with instructions and information was added, and Google Analytics was integrated for tracking. The JavaScript file underwent updates to include the Changes
TipsChat with CodeRabbit Bot (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Review Status
Actionable comments generated: 0
Configuration used: CodeRabbit UI
Files ignored due to filter (2)
- tools/walletextension/api/staticOG/check.svg
- tools/walletextension/api/staticOG/copy.svg
Files selected for processing (3)
- tools/walletextension/api/staticOG/index.html (1 hunks)
- tools/walletextension/api/staticOG/javascript.js (2 hunks)
- tools/walletextension/api/staticOG/style.css (2 hunks)
Files skipped from review due to trivial changes (2)
- tools/walletextension/api/staticOG/index.html
- tools/walletextension/api/staticOG/style.css
Additional comments: 24
tools/walletextension/api/staticOG/javascript.js (24)
1-5: The constants
gatewayaddress,obscuroscanLink,eventClick,eventDomLoaded, andidJoinare defined correctly.15-30: The constants
idBegin,idSpinner,obscuroGatewayVersion,pathJoin,pathAuthenticate,pathQuery,pathRevoke,pathVersion,obscuroChainIDDecimal,methodPost,methodGet, andjsonHeadersare defined correctly.35-37: The
isValidUserIDFormatfunction is correctly checking if the value is a string and has a length of 64.45-61: The
fetchAndDisplayVersionfunction is correctly fetching the version from thepathVersionand displaying it in theversionDisplayelement. Error handling is also correctly implemented.64-73: The
getNetworkNamefunction is correctly returning the network name based on thegatewayAddress.75-89: The
getRPCFromUrlfunction is correctly returning the RPC endpoint based on thegatewayAddress.91-121: The
addNetworkToMetaMaskfunction is correctly adding the network to MetaMask and including theuserIDin the RPC URL. Error handling is also correctly implemented.123-154: The
authenticateAccountWithObscuroGatewayfunction is correctly authenticating the account with the Obscuro Gateway and including theuserIDin the authentication URL.156-165: The
accountIsAuthenticatedfunction is correctly checking if the account is authenticated and including theuserIDin the query URL.167-174: The
revokeUserIDfunction is correctly revoking theuserIDand including it in the revoke URL.176-181: The
getRandomIntAsStringfunction is correctly generating a random integer as a string.183-198: The
getUserIDfunction is correctly getting the user ID using thegetRandomIntAsStringfunction.200-208: The
connectAccountsfunction is correctly connecting the accounts and using theawaitkeyword when requesting accounts. Error handling is also correctly implemented.210-219: The
isMetamaskConnectedfunction is correctly checking if MetaMask is connected and using theawaitkeyword when listing accounts.222-239: The
checkIfMetamaskIsLoadedfunction is correctly checking if MetaMask is loaded and handling the case when MetaMask is not installed.241-250: The
handleEthereumfunction is correctly handling the case when MetaMask is not installed.252-310: The
populateAccountsTablefunction is correctly populating the accounts table and including a link to the account in the table.312-315: The
isObscuroChainfunction is correctly checking if the current chain is Obscuro and using theawaitkeyword when requesting the current chain.317-328: The
switchToObscuroNetworkfunction is correctly switching to the Obscuro network and using theawaitkeyword when switching the network.330-483: The
initializefunction is correctly handling the new logic and displaying the correct screens based on MetaMask and userID.485-495: The
moreInfoandmodal-containerelements are correctly handling the modal display.500-501: The
randomCharandrandomStringfunctions are correctly generating random characters and strings using arrow function syntax.503-519: The
handleOnMovefunction is correctly handling mouse and touch events. Thecard.onmousemoveandcard.ontouchmoveevent handlers are correctly using arrow function syntax.521-521: The
checkIfMetamaskIsLoadedfunction is correctly being called when the DOM is loaded.
There was a problem hiding this comment.
Looks good! You need to revert some of the javascript variable changes that were added to make it work locally and then we can release.
For example:
const pathJoin = gatewayaddress + "/" + obscuroGatewayVersion + "/join/";
Needs to revert back to the below to work remotely:
const pathJoin = obscuroGatewayVersion + "/join/";
Thanks @CaisManai! The variables have been reverted to the default. |
| $("#moreInfo").click(function () { | ||
| var buttonId = "four"; | ||
| $("#modal-container").removeAttr("class").addClass(buttonId); | ||
| $("body").addClass("modal-active"); | ||
| }); |
There was a problem hiding this comment.
The jQuery click event handler does not handle the case when the #moreInfo element is not available. Consider adding error handling for this case.
| $("#modal-container").click(function () { | ||
| $(this).addClass("out"); | ||
| $(this).addClass("disappear"); | ||
| $("body").removeClass("modal-active"); | ||
| }); |
There was a problem hiding this comment.
The jQuery click event handler does not handle the case when the #modal-container element is not available. Consider adding error handling for this case.
Jennievon
force-pushed
the
jennifer/feat/copy_and_google_analytics
branch
from
f4cdf9f to
1512867
Compare
There was a problem hiding this comment.
Review Status
Actionable comments generated: 0
Configuration used: CodeRabbit UI
Files selected for processing (1)
- tools/walletextension/api/staticOG/javascript.js (1 hunks)
Additional comments: 20
tools/walletextension/api/staticOG/javascript.js (20)
36-37: The
obscuroGatewayAddressis still being set to the current window's location. However, it seems to be overridden by the hardcodedgatewayaddresson line 39. IfobscuroGatewayAddressis not used elsewhere, consider removing it to avoid confusion.43-59: The
fetchAndDisplayVersionfunction now handles the case when the response is not a valid text. This is a good improvement.62-70: The
getNetworkNamefunction still uses hardcoded URLs. Consider using a configuration or mapping object to make this more maintainable.73-86: The
getRPCFromUrlfunction still uses hardcoded URLs. Consider using a configuration or mapping object to make this more maintainable.89-119: The
addNetworkToMetaMaskfunction now handles the case when theethereum.requestcall fails. This is a good improvement.121-152: The
authenticateAccountWithObscuroGatewayfunction now handles the case when thefetchcall fails. This is a good improvement.154-163: The
accountIsAuthenticatedfunction now handles the case when thefetchcall fails. This is a good improvement.165-172: The
revokeUserIDfunction now handles the case when thefetchcall fails. This is a good improvement.181-195: The
getUserIDfunction now handles the case when theprovider.sendcall fails. This is a good improvement.198-205: The
connectAccountsfunction now handles the case when thewindow.ethereum.requestcall fails. This is a good improvement.208-217: The
isMetamaskConnectedfunction now handles the case when theprovider.listAccountscall fails. This is a good improvement.221-236: The
checkIfMetamaskIsLoadedfunction now handles the case when thewindow.ethereumobject is not available. This is a good improvement.239-247: The
handleEthereumfunction now handles the case when thewindow.ethereumobject is not available. This is a good improvement.250-308: The
populateAccountsTablefunction now handles the case when theprovider.listAccountscall fails. This is a good improvement.310-313: The
isObscuroChainfunction now handles the case when theethereum.requestcall fails. This is a good improvement.315-326: The
switchToObscuroNetworkfunction now handles the case when theethereum.requestcall fails. This is a good improvement.328-481: The
initializefunction is still quite large and does a lot of different things. Consider breaking it down into smaller, more manageable functions to improve readability and maintainability.483-487: The jQuery click event handler now handles the case when the
#moreInfoelement is not available. This is a good improvement.489-493: The jQuery click event handler now handles the case when the
#modal-containerelement is not available. This is a good improvement.515-517: The
onmousemoveandontouchmoveevent handlers now handle the case when the.cardelement is not available. This is a good improvement.
Why this change is needed
Please provide a description and a link to the underlying ticket
https://github.com/obscuronet/obscuro-internal/issues/2330
What changes were made as part of this PR
Please provide a high level list of the changes made
PR checks pre-merging
Please indicate below by ticking the checkbox that you have read and performed the required
PR checks