force eip1193 connection when interacting with kucocoin interface

packages/frontend/src/ts/components/eip6963.ts

@@ -10,6 +10,19 @@ import type { EIP6963AnnounceProviderEvent, EIP6963ProviderDetail, MetaMaskInpag
 
 declare const window: any
 
+export async function ensureOrForceEip1193(): Promise<EIP6963ProviderDetail> {
+  if (globals.connectedAccount !== undefined) {
+    return globals.connectedWallet!
+  }
+  if (providers.length > 0) {
+    await onWalletConnectClick(providers[0], false)
+  }
+  if (globals.connectedAccount !== undefined) {
+    return globals.connectedWallet!
+  }
+  throw new Error('Failed to connect wallet.')
+}
+
 export async function attachEip6963() {
   onWalletAddKucoCoin()
   attachMouseEvents()
@@ -68,25 +81,25 @@ async function tryAutomaticallyConnectFirstWallet(wallet: EIP6963ProviderDetail)
   }
 }
 
-async function onWalletConnectClick(wallet: EIP6963ProviderDetail) {
+async function onWalletConnectClick(wallet: EIP6963ProviderDetail, popup = true) {
   if (await switchNetworkIfNecessary(wallet.provider)) {
     if (!isCurrentWallet(wallet) || globals.connectedAccount === undefined) {
       const accounts = await requestAccounts(wallet.provider)
       if (accounts?.length) {
         await updateWalletConnectionDisplay(wallet)
-        popupSuccess(`Connected to ${wallet.info.name}`)
+        popup && popupSuccess(`Connected to ${wallet.info.name}`)
         globals.connectedAccount = accounts[0]
         globals.connectedWallet = wallet
       } else {
-        popupError(`Failed to detect ${wallet.info.name} account`)
+        popup && popupError(`Failed to detect ${wallet.info.name} account`)
         await updateWalletConnectionDisplay()
       }
     } else {
-      popupSuccess(`Already connected to ${wallet.info.name}`)
+      popup && popupSuccess(`Already connected to ${wallet.info.name}`)
       await updateWalletConnectionDisplay(wallet)
     }
   } else {
-    popupError(`Failed to switch ${wallet.info.name} network to Avalanche`)
+    popup && popupError(`Failed to switch ${wallet.info.name} network to Avalanche`)
     await updateWalletConnectionDisplay()
   }
 }

packages/frontend/src/ts/site.ts

@@ -3,15 +3,15 @@ import { parseUnits, parseEther, formatUnits } from 'ethers'
 import {
   getMsUnixNow, setImmediateSyncInterval, insideViewport,
   setImmediateAsyncInterval, formatUnitsTruncate,
-  formatUnixDate, mobileAndTabletCheck, requireConnectedWallet
+  formatUnixDate, mobileAndTabletCheck
 } from './utils'
 import {
   investInKucoCoin, claimKucoCoin, retractKucoCoin, reportPeriod,
   makeTransAction, getLiquidityReserves, getNextPeriod
 } from './wrappers/contract'
 import { requestAccounts, requireWalletOnAvalanche } from './wrappers/eip1193'
 import { popupSuccess, popupError, loadingStart, loadingEnd } from './components/utils'
-import { attachEip6963 } from './components/eip6963'
+import { attachEip6963, ensureOrForceEip1193 } from './components/eip6963'
 import { attachWallet, attachWalletInfoRefresher } from './components/wallet'
 import { KUCOCOIN_DECIMALS } from './config/token'
 import { config } from './config/main'
@@ -117,7 +117,7 @@ function attachScrollUnderlining(): void {
 function onInvestInKucoCoin(): void {
   $('#invest-submit').on('click', async () => {
     try {
-      const wallet = requireConnectedWallet()
+      const wallet = await ensureOrForceEip1193()
       loadingStart('invest-claim-retract-interface')
       const amountInput = $('#invest-amount').val()!
       const amount = parseEther(amountInput)
@@ -136,7 +136,7 @@ function onInvestInKucoCoin(): void {
 function onClaimKucoCoin(): void {
   $('#claim-submit').on('click', async () => {
     try {
-      const wallet = requireConnectedWallet()
+      const wallet = await ensureOrForceEip1193()
       loadingStart('invest-claim-retract-interface')
       await requireWalletOnAvalanche(wallet.provider)
       const accounts = await requestAccounts(wallet.provider)
@@ -167,7 +167,7 @@ function onRetractKucoCoin(): void {
   $('#retract-submit').on('click', async () => {
     if (handleRetractEnd()) return
     try {
-      const wallet = requireConnectedWallet()
+      const wallet = await ensureOrForceEip1193()
       loadingStart('invest-claim-retract-interface')
       await requireWalletOnAvalanche(wallet.provider)
       const accounts = await requestAccounts(wallet.provider)
@@ -184,7 +184,7 @@ function onRetractKucoCoin(): void {
 function onMakeTransAction(): void {
   $('#trans-action-button').on('click', async () => {
     try {
-      const wallet = requireConnectedWallet()
+      const wallet = await ensureOrForceEip1193()
       loadingStart('trans-action-interface')
       const to = $('#trans-action-address').val()!
       const amountInput = $('#trans-action-amount').val()!
@@ -203,7 +203,7 @@ function onMakeTransAction(): void {
 function onReportPeriod(): void {
   $('#report-period-interface').on('click', async () => {
     try {
-      const wallet = requireConnectedWallet()
+      const wallet = await ensureOrForceEip1193()
       loadingStart('report-period-interface')
       await requireWalletOnAvalanche(wallet.provider)
       await reportPeriod(wallet.provider)
@@ -219,7 +219,7 @@ function onReportPeriod(): void {
 function onGetNextPeriod(): void {
   $('#get-next-period-interface').on('click', async () => {
     try {
-      const wallet = requireConnectedWallet()
+      const wallet = await ensureOrForceEip1193()
       loadingStart('get-next-period-interface')
       await requireWalletOnAvalanche(wallet.provider)
       const nextPeriodUnix = await getNextPeriod(wallet.provider)

packages/frontend/src/ts/utils.ts

@@ -1,6 +1,5 @@
 import $ from 'jquery'
 import { formatUnits } from 'ethers'
-import { globals } from './shared'
 
 
 declare const window: any
@@ -55,12 +54,4 @@ export function insideViewport(elt: JQuery<any>): boolean {
 export function mobileAndTabletCheck() {
   const a = navigator.userAgent||navigator.vendor||window.opera
   return /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))
-}
-
-export function requireConnectedWallet() {
-  if (globals.connectedWallet === undefined) {
-    throw new Error('Wallet not connected.')
-  } else {
-    return globals.connectedWallet
-  }
 }