Skip to content

sdk update #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev-submodules
Choose a base branch
from
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
14 changes: 11 additions & 3 deletions morpherwallet-sdk/package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
{
"name": "morpherwallet-sdk",
"version": "1.2.7",
"version": "1.2.9",
"description": "This is an SDK for the zero-wallet to simply add it to the website. Drop-In Replacement for Fortmatic/Portis/MetaMask",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"build": "tsc"
"build": "npm run bundle && npm run copy",
"bundle": "tsc",
"copy": "@powershell copy package.json lib/package.json && @powershell copy README.md lib/README.md && @powershell copy package-lock.json lib/package-lock.json"
},
"author": "Thomas Wiesner (thomas@morpher.com)",
"license": "ISC",
"repository": {
"type": "git",
"url": "https://github.com/Morpher-io/MorpherWallet.git"
"url": "git+https://github.com/Morpher-io/MorpherWallet.git"
},
"homepage": "https://www.morpher.com/wallet",
"dependencies": {
Expand All @@ -22,5 +24,11 @@
},
"devDependencies": {
"typescript": "^5.5.4"
},
"bugs": {
"url": "https://github.com/Morpher-io/MorpherWallet/issues"
},
"directories": {
"lib": "lib"
}
}
31 changes: 17 additions & 14 deletions morpherwallet-sdk/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export class MorpherWalletProvider extends EventEmitter {
protected chainId: number;
protected widget: any;
public isConnecting: boolean = false;
protected iframeLoad: boolean = false;

protected _on2FAUpdateCallback: any;
protected _onRecoveryUpdateCallback: any;
Expand Down Expand Up @@ -96,6 +97,9 @@ protected rpcURL: string;
this.morpherWalletContainer = document.createElement('div');
}

this.morpherWalletIframe.addEventListener('load', () => {
this.iframeLoad = true;
})

this.widget = this._initWidget();

Expand Down Expand Up @@ -440,26 +444,25 @@ protected rpcURL: string;

async iframeLoaded() {
return new Promise((resolve) => {
let frame:any = document.getElementById('morpher_wallet_sdk_iframe');
try {
if (frame && frame.contentWindow && !frame.contentDocument) {
return resolve(true);
}
} catch (err) {

if (this.iframeLoad) {
return resolve(true);
}
let counter = 0
const int = setInterval(() => {
try {
frame = document.getElementById('morpher_wallet_sdk_iframe');
if (frame && frame.contentWindow && !frame.contentDocument) {
clearInterval(int);
return resolve(true);
}
} catch (err) {
if (this.iframeLoad) {
clearInterval(int)
return resolve(true);

}
counter +=1
if (counter > 200) {
this.iframeLoad = true;
clearInterval(int)
return resolve(true);
}
}, 100);
});

}

async _setHeight(height: any) {
Expand Down
2 changes: 1 addition & 1 deletion vue
Submodule vue updated 96 files
+9 −11 .env.production
+1 −1 README.md
+23 −1 cypress.config.ts
+29 −0 cypress/e2e/01-Frontpage.cy.ts
+99 −0 cypress/e2e/02-Signup-Login.cy.ts
+298 −0 cypress/e2e/03-Email-2FA.cy.ts
+191 −0 cypress/e2e/04-Authenticator-2FA.cy.ts
+152 −0 cypress/e2e/05-Password.cy.ts
+230 −0 cypress/e2e/06-Export-Wallet.cy.ts
+0 −8 cypress/e2e/example.cy.ts
+5 −0 cypress/plugins/index.js
+3 −1 cypress/support/commands.ts
+1 −1 env.d.ts
+526 −34 package-lock.json
+6 −3 package.json
+ public/img/nft_backgrounds/AARCHES_NFT1.webp
+ public/img/nft_backgrounds/ACID_TRIP_NFT.webp
+ public/img/nft_backgrounds/MIRAGE_RIK_OOSTENBROEK.webp
+ public/img/nft_backgrounds/SPACE_JETSKI.webp
+ public/img/nft_backgrounds/Silent_wave_Rik_Oostenbroek.webp
+ public/img/nft_backgrounds/The_Soft_Parade_Rik_Oostenbroek.webp
+ public/img/nft_backgrounds/VIVID_DREAMS_NFT_PT.webp
+ public/img/nft_backgrounds/king-of-chrome.webp
+ public/img/nft_backgrounds/to-exist-is-to-survive-unfair-choices.webp
+27 −17 src/App.vue
+5 −0 src/assets/img/2fa-verification.svg
+5 −1 src/assets/img/apple_logo.svg
+5 −0 src/assets/img/authenticator-icon.svg
+5 −0 src/assets/img/back.svg
+33 −9 src/assets/img/checkmark.svg
+5 −0 src/assets/img/chevron-right.svg
+5 −0 src/assets/img/copy.svg
+5 −0 src/assets/img/delete-account.svg
+5 −0 src/assets/img/email-password.svg
+3 −42 src/assets/img/email_icon.svg
+6 −0 src/assets/img/encrypted.svg
+5 −0 src/assets/img/export-wallet.svg
+8 −16 src/assets/img/google_logo.svg
+5 −0 src/assets/img/logout.svg
+8 −0 src/assets/img/password-hide.svg
+5 −0 src/assets/img/password-show.svg
+28 −0 src/assets/img/recover.svg
+5 −0 src/assets/img/send.svg
+8 −0 src/assets/img/settings.svg
+6 −0 src/assets/img/support.svg
+30 −0 src/assets/img/switch-off.svg
+29 −0 src/assets/img/switch-on.svg
+5 −0 src/assets/img/trusted-account.svg
+744 −0 src/assets/img/unlock-account.svg
+4 −0 src/assets/img/warning-triangle.svg
+6 −0 src/assets/img/warning.svg
+375 −306 src/assets/stylesheet/wallet.scss
+6 −3 src/components/AccountDeletion.vue
+21 −26 src/components/AddRecoveryApple.vue
+23 −31 src/components/AddRecoveryFacebook.vue
+20 −13 src/components/AddRecoveryGoogle.vue
+19 −19 src/components/AddRecoveryVkontakte.vue
+59 −83 src/components/Change2FA.vue
+8 −12 src/components/Change2FAEmail.vue
+18 −19 src/components/ChangeAuthenticator.vue
+14 −25 src/components/ChangeEmail.vue
+104 −116 src/components/ChangePassword.vue
+20 −20 src/components/ConfirmAccess.vue
+3 −2 src/components/LoginApple.vue
+12 −4 src/components/LoginGoogleV2.vue
+81 −0 src/components/PasswordMeter.vue
+1 −1 src/components/RecoverWalletApple.vue
+2 −2 src/components/RecoverWalletFacebook.vue
+1 −1 src/components/RecoverWalletGoogle.vue
+2 −2 src/components/RecoverWalletVkontakte.vue
+3 −2 src/lang/locales/bs.json
+25 −10 src/lang/locales/de.json
+34 −15 src/lang/locales/en.json
+22 −7 src/lang/locales/ru.json
+7 −2 src/router/index.ts
+15 −0 src/shims-tsx.d.ts
+36 −61 src/stores/wallet.ts
+12 −0 src/types/global-types.ts
+0 −4 src/types/helpers.d.ts
+12 −2 src/utils/backupRestore.ts
+451 −0 src/utils/jsonKeystore.ts
+35 −0 src/utils/randombytes.ts
+9 −7 src/utils/utils.ts
+28 −32 src/views/DeleteSettings.vue
+8 −5 src/views/EmailSettings.vue
+52 −37 src/views/KeysSettings.vue
+28 −22 src/views/Login.vue
+17 −13 src/views/Recovery.vue
+16 −19 src/views/RecoverySettings.vue
+37 −27 src/views/Settings.vue
+2 −2 src/views/SignTx.vue
+40 −20 src/views/Signup.vue
+13 −13 src/views/TwoFA.vue
+28 −25 src/views/TwoFactorSettings.vue
+14 −5 src/views/Unlock.vue
+72 −112 src/views/Wallet.vue