diff --git a/src/pages/Oauth/AuthForm/ButtonEth.tsx b/src/pages/Oauth/AuthForm/ButtonEth.tsx index 434330f01d..fe0a39e319 100644 --- a/src/pages/Oauth/AuthForm/ButtonEth.tsx +++ b/src/pages/Oauth/AuthForm/ButtonEth.tsx @@ -1,4 +1,5 @@ import { LoginMethod } from '@kybernetwork/oauth2' +import { Trans } from '@lingui/macro' import { useCallback } from 'react' import { Flex, Text } from 'rebass' @@ -63,12 +64,16 @@ const ButtonEth = ({ {loading ? ( <> -   Signing In +  {' '} + + {' '} + Signing In + ) : ( <> -   Sign-In with Wallet +   Sign-In with Wallet )} diff --git a/src/pages/Oauth/AuthForm/ButtonGoogle.tsx b/src/pages/Oauth/AuthForm/ButtonGoogle.tsx index 4989c785f6..34e1896d94 100644 --- a/src/pages/Oauth/AuthForm/ButtonGoogle.tsx +++ b/src/pages/Oauth/AuthForm/ButtonGoogle.tsx @@ -1,4 +1,5 @@ import { LoginMethod } from '@kybernetwork/oauth2' +import { Trans } from '@lingui/macro' import React, { useCallback, useRef } from 'react' import { ButtonOutlined, ButtonPrimary } from 'components/Button' @@ -28,7 +29,7 @@ const ButtonGoogle: React.FC = ({ outline, flowStatus }) => { value: 'google', name: 'provider', ref, - children: <>Sign-In with Google, + children: Sign-In with Google, style: isAutoLogin ? { opacity: 0 } : undefined, } return React.createElement(outline ? ButtonOutlined : ButtonPrimary, props) diff --git a/src/pages/Oauth/AuthForm/index.tsx b/src/pages/Oauth/AuthForm/index.tsx index 989b896b7a..4689f9ec22 100644 --- a/src/pages/Oauth/AuthForm/index.tsx +++ b/src/pages/Oauth/AuthForm/index.tsx @@ -1,6 +1,7 @@ import { LoginFlow, LoginMethod } from '@kybernetwork/oauth2' import React from 'react' import { isMobile } from 'react-device-detect' +import { Flex } from 'rebass' import styled from 'styled-components' import useParsedQueryString from 'hooks/useParsedQueryString' @@ -55,9 +56,9 @@ const AuthForm: React.FC = ({ formConfig, signInWithEth, flowStat /> )} {hasBothEthAndGoogle && ( -
+ or -
+ )} {hasGoogle && } diff --git a/src/pages/Oauth/Consent.tsx b/src/pages/Oauth/Consent.tsx index e6ae77a562..75f6a304e2 100644 --- a/src/pages/Oauth/Consent.tsx +++ b/src/pages/Oauth/Consent.tsx @@ -16,10 +16,10 @@ function Page() { KyberOauth2.oauthUi .getFlowConsent(consent_challenge) .then(data => { - console.debug('resp consent', data) + console.debug('Oauth resp consent', data) }) .catch(err => { - console.debug('err consent', err) + console.debug('Oauth consent error', err) }) }, [consent_challenge]) diff --git a/src/pages/Oauth/Logout.tsx b/src/pages/Oauth/Logout.tsx index c26c0d0138..e66feebdb7 100644 --- a/src/pages/Oauth/Logout.tsx +++ b/src/pages/Oauth/Logout.tsx @@ -16,10 +16,10 @@ function Logout() { KyberOauth2.oauthUi .acceptLogout(logout_challenge) .then(data => { - console.debug('logout resp', data) + console.debug('Oauth logout resp', data) }) .catch(err => { - console.debug('err logout', err) + console.debug('Oauth logout error', err) }) }, [logout_challenge])