diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/_locales/pl/messages.json | 20 | ||||
| -rw-r--r-- | app/phishing.html | 7 | ||||
| -rw-r--r-- | app/scripts/background.js | 16 | ||||
| -rw-r--r-- | app/scripts/controllers/token-rates.js | 5 | ||||
| -rw-r--r-- | app/scripts/ui.js | 24 |
5 files changed, 4 insertions, 68 deletions
diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json index e13aa9c2..78b005a6 100644 --- a/app/_locales/pl/messages.json +++ b/app/_locales/pl/messages.json @@ -98,18 +98,6 @@ "clickCopy": { "message": "Kliknij żeby skopiować" }, -<<<<<<< HEAD - "clickToAdd": { - "message": "Przycisnij $1, aby dodać go do swojego konta" - }, - "close": { - "message": "Zamknij" - }, - "chromeRequiredForHardwareWallets": { - "message": "Żeby połączyć się z portfelem sprzętowym, należy uruchomić MetaMask z przeglądarką Google Chrome." - }, -======= ->>>>>>> Update translations "confirm": { "message": "Potwierdź" }, @@ -915,16 +903,8 @@ "warning": { "message": "Uwaga" }, -<<<<<<< HEAD - "welcomeBack": { - "message": "Witaj z powrotem!" - }, - "welcome": { - "message": "Witaj w MetaMask" -======= "welcomeBeta": { "message": "Witaj w MetaMask Beta" ->>>>>>> Update translations }, "whatsThis": { "message": "Co to jest?" diff --git a/app/phishing.html b/app/phishing.html index 8c7c45c7..a1790b73 100644 --- a/app/phishing.html +++ b/app/phishing.html @@ -55,17 +55,10 @@ <img src="/images/dekusan.svg" style="height:60px"> <h3>ATTENTION</h3> -<<<<<<< HEAD - <p>This domain is currently on the MetaMask domain warning list. This means that based on information available to us, MetaMask believes this domain could currently compromise your security and, as an added safety feature, MetaMask has restricted access to the site. To override this, please read the rest of this warning for instructions on how to continue at your own risk. </p> - <p>There are many reasons sites can appear on our warning list, and our warning list compiles from other widely used industry lists. Such reasons can include known fraud or security risks, such as domains that test positive on the <a href="https://github.com/metamask/eth-phishing-detect">Ethereum Phishing Detector</a>. Domains on these warning lists may include outright malicious websites and legitimate websites that have been compromised by a malicious actor. - <p id="esdbLink"></p> - <p>Note that this warning list is compiled on a voluntary basis. This list may be inaccurate or incomplete. Just because a domain does not appear on this list is not an implicit guarantee of that domain's safety. As always, your transactions are your own responsibility. If you wish to interact with any domain on our warning list, you can do so by <a id="unsafe-continue">continuing at your own risk</a>.</p> -======= <p>DekuSan believes this domain could currently compromise your security and has prevented you from interacting with it.</p> <p>This is because the site tested positive on the <a href="https://github.com/metamask/eth-phishing-detect">Ethereum Phishing Detector</a>. This includes outright malicious websites and legitimate websites that have been compromised by a malicious actor.</p> <p id="esdbLink"></p> <p>You can turn DekuSan off to interact with this site, but it is advised not to.</p> ->>>>>>> Complete onboarding flow <p> If you think this domain is incorrectly flagged or if a blocked legitimate website has resolved its security issues, <a href="https://github.com/metamask/eth-phishing-detect/issues/new">please file an issue</a>. diff --git a/app/scripts/background.js b/app/scripts/background.js index 01ec0d8b..067b00fc 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -196,22 +196,14 @@ async function loadStateFromPersistence () { // we were able to recover (though it might be old) versionedData = diskStoreState const vaultStructure = getObjStructure(versionedData) -<<<<<<< HEAD - sentry.captureMessage('MetaMask - Empty vault found - recovered from diskStore', { -======= - raven.captureMessage('DekuSan - Empty vault found - recovered from diskStore', { ->>>>>>> Complete onboarding flow + sentry.captureMessage('DekuSan - Empty vault found - recovered from diskStore', { // "extra" key is required by Sentry extra: { vaultStructure }, }) } else { // unable to recover, clear state versionedData = migrator.generateInitialState(firstTimeState) -<<<<<<< HEAD - sentry.captureMessage('MetaMask - Empty vault found - unable to recover') -======= - raven.captureMessage('DekuSan - Empty vault found - unable to recover') ->>>>>>> Complete onboarding flow + sentry.captureMessage('DekuSan - Empty vault found - unable to recover') } } @@ -364,15 +356,11 @@ function setupController (initState, initLangCode) { const processName = remotePort.name const isDekuSanInternalProcess = metamaskInternalProcessHash[processName] -<<<<<<< HEAD if (metamaskBlacklistedPorts.includes(remotePort.name)) { return false } - if (isMetaMaskInternalProcess) { -======= if (isDekuSanInternalProcess) { ->>>>>>> Complete onboarding flow const portStream = new PortStream(remotePort) // communication with popup controller.isClientOpen = true diff --git a/app/scripts/controllers/token-rates.js b/app/scripts/controllers/token-rates.js index 9d38278e..5017b687 100644 --- a/app/scripts/controllers/token-rates.js +++ b/app/scripts/controllers/token-rates.js @@ -47,8 +47,6 @@ class TokenRatesController { } /** -<<<<<<< HEAD -======= * Fetches a token exchange rate by address * * @param {String} address - Token contract address @@ -59,13 +57,12 @@ class TokenRatesController { const json = await response.json() return json && json.length ? json[0].averagePrice : 0 } catch (error) { - warn(`DekuSan - TokenRatesController exchange rate fetch failed for ${address}.`, error) + log.warn(`DekuSan - TokenRatesController exchange rate fetch failed for ${address}.`, error) return 0 } } /** ->>>>>>> Complete onboarding flow * @type {Number} */ set interval (interval) { diff --git a/app/scripts/ui.js b/app/scripts/ui.js index 3d8c0b9a..d749321e 100644 --- a/app/scripts/ui.js +++ b/app/scripts/ui.js @@ -28,7 +28,7 @@ async function start () { const state = window.getCleanAppState() // remove unnecessary data delete state.localeMessages - delete state.metamask.recentBlocks + delete state.dekusan.recentBlocks // return state to be added to request return state } @@ -46,29 +46,7 @@ async function start () { const container = document.getElementById('app-content') startPopup({ container, connectionStream }, (err, store) => { if (err) return displayCriticalError(err) -<<<<<<< HEAD - - const state = store.getState() - let betaUIState = Boolean(state.featureFlags && state.featureFlags.betaUI) - const useBetaCss = getShouldUseNewUi(state) - - let css = useBetaCss ? NewMetaMaskUiCss() : OldMetaMaskUiCss() - let deleteInjectedCss = injectCss(css) - let newBetaUIState - - store.subscribe(() => { - const state = store.getState() - newBetaUIState = state.metamask.featureFlags.betaUI - if (newBetaUIState !== betaUIState) { - deleteInjectedCss() - betaUIState = newBetaUIState - css = betaUIState ? NewMetaMaskUiCss() : OldMetaMaskUiCss() - deleteInjectedCss = injectCss(css) - } - }) -======= injectCss(NewMetaMaskUiCss()) ->>>>>>> Complete onboarding flow }) |