Skip to content
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
2 changes: 1 addition & 1 deletion fetchLists/lists/tokens.json

Large diffs are not rendered by default.

147 changes: 92 additions & 55 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"@walletconnect/browser": "1.0.0-beta.47",
"@walletconnect/qrcode-modal": "1.1.0",
"@xkeshi/vue-qrcode": "git+https://github.com/MyEtherWallet/vue-qrcode.git",
"axios": "0.21.0",
"axios": "0.21.1",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "10.1.0",
"babel-jest": "25.2.3",
Expand Down
14 changes: 14 additions & 0 deletions src/assets/images/icons/HardwareWallet/bitfiwallet.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 12 additions & 2 deletions src/containers/ConfirmationContainer/ConfirmationContainer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ import ErrorModal from './components/ErrorModal';
import ConfirmSignModal from './components/ConfirmSignModal';
import { mapState, mapActions } from 'vuex';
import { type as noticeTypes } from '@/helpers/notificationFormatters';
import { WEB3_WALLET, KEEPKEY } from '@/wallets/bip44/walletTypes';
import { WEB3_WALLET, KEEPKEY, BITFI_WALLET } from '@/wallets/bip44/walletTypes';
import { Toast, Misc } from '@/helpers';
import locStore from 'store';
import parseTokensData from '@/helpers/parseTokensData.js';
Expand Down Expand Up @@ -266,13 +266,23 @@ export default {

signPromise
.then(_response => {
if (this.account.identifier === BITFI_WALLET) {
this.showSuccessModal(
'Please, open your BITFI chrome extension and approve the operation',
'Close'
)
}

if (_response) {
this.signedTxObject = _response;
this.signedTx = this.signedTxObject.rawTransaction;
}
})
.catch(this.wallet.errorHandler);
if (this.account.identifier === KEEPKEY) {

if (this.account.identifier === BITFI_WALLET) {
//do nothing
} else if (this.account.identifier === KEEPKEY) {
signPromise.then(() => {
this.confirmationModalOpen();
});
Expand Down
30 changes: 29 additions & 1 deletion src/layouts/AccessWalletLayout/AccessWalletLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@
:networks="Networks"
@hardwareWalletOpen="hardwareWalletOpen"
/>

<bitfi-app-modal
ref="bitfiAppModal"
:networks="Networks"
@hardwareWalletOpen="hardwareWalletOpen"
/>
<mew-connect-modal
ref="mewconnectModal"
:network-and-address-open="networkAndAddressOpen"
Expand All @@ -16,6 +22,7 @@
<hardware-modal
ref="hardwareModal"
:ledger-app-open="ledgerAppModalOpen"
:bitfi-app-open="bitfiAppModalOpen"
:network-and-address-open="networkAndAddressOpen"
:bitbox-select-open="bitboxSelectModalOpen"
:open-finney="finneyModalOpen"
Expand Down Expand Up @@ -127,6 +134,7 @@ import PrivateKeyModal from './components/PrivateKeyModal';
import SoftwareModal from './components/SoftwareModal';
import MnemonicModal from './components/MnemonicModal';
import LedgerAppModal from './components/LedgerAppModal';
import BitfiAppModal from './components/BitfiAppModal';
import WalletPasswordModal from '@/components/WalletPasswordModal';
import EnterPinNumberModal from '@/components/EnterPinNumberModal';
import XwalletModal from './components/XwalletModal';
Expand All @@ -149,7 +157,7 @@ import { Toast } from '@/helpers';

import DetectRTC from 'detectrtc';

import { WalletConnectWallet, WalletLinkWallet } from '@/wallets';
import { BitfiWallet, WalletConnectWallet, WalletLinkWallet } from '@/wallets';

export default {
name: 'AccessWalletLayout',
Expand All @@ -168,6 +176,7 @@ export default {
'wallet-password-modal': WalletPasswordModal,
'enter-pin-number-modal': EnterPinNumberModal,
'ledger-app-modal': LedgerAppModal,
'bitfi-app-modal': BitfiAppModal,
'finney-modal': FinneyModal,
'xwallet-modal': XwalletModal,
'bcvault-address-modal': BcVaultAddressModal,
Expand Down Expand Up @@ -313,6 +322,25 @@ export default {
ledgerAppModalOpen() {
this.$refs.ledgerAppModal.$refs.ledgerApp.show();
},
bitfiAppModalOpen() {

BitfiWallet("")
.then(async _newWallet => {
//console.log(_newWallet)
//this.hardwareWalletOpen(_newWallet)

this.decryptWallet([await _newWallet.getAccount(0)]).then(() => {
this.$router.push({
path: 'interface'
});
});

})
.catch(e => {
console.log(e)
BitfiWallet.errorHandler(e);
})
},
networkAndAddressOpen() {
this.$refs.networkandaddressModal.$refs.networkAndAddress.show();
},
Expand Down
Loading