diff --git a/media/ethereum-eth-logo-diamond-purple-64.png b/media/ethereum-eth-logo-diamond-purple-64.png new file mode 100644 index 0000000..967a2d3 Binary files /dev/null and b/media/ethereum-eth-logo-diamond-purple-64.png differ diff --git a/src/blockchain/wallet.js b/src/blockchain/wallet.js index 970148d..f7a1f13 100644 --- a/src/blockchain/wallet.js +++ b/src/blockchain/wallet.js @@ -61,8 +61,7 @@ export function updateAccounts(chainId, provider) { function changeAccounts(chainId, accounts) { // this is a notification from the wallet that the user selected a different blockchain. that chain may or may not - // be supported. we store this value in walletStore.chainId, which may or may not be the same as - // the application's useStore().chainId + // be supported. console.log('changeAccounts', chainId, accounts) const store = useStore() if (chainId === store.chainId && accounts.length) { diff --git a/src/common.js b/src/common.js index 47f9a29..575be02 100644 --- a/src/common.js +++ b/src/common.js @@ -124,6 +124,7 @@ export class AbiURLCache extends AsyncURLCache { const files = { // If a contract is in a file different than its name, put the exception here // 'IVaultImpl' : 'IVault', // for example + 'IERC20Metadata' : 'interfaces/IERC20Metadata', } export function abiPath(name) { diff --git a/src/components/NativeRow.vue b/src/components/NativeRow.vue new file mode 100644 index 0000000..b4160a7 --- /dev/null +++ b/src/components/NativeRow.vue @@ -0,0 +1,46 @@ + + + + + + diff --git a/src/components/NativeWrap.vue b/src/components/NativeWrap.vue new file mode 100644 index 0000000..aeb2045 --- /dev/null +++ b/src/components/NativeWrap.vue @@ -0,0 +1,60 @@ + + + + + diff --git a/src/components/Status.vue b/src/components/Status.vue index 54f1ce3..1edb99f 100644 --- a/src/components/Status.vue +++ b/src/components/Status.vue @@ -117,8 +117,8 @@
-
{{ describeTrancheTime(item, true, t) }}
-
{{ describeTrancheTime(item, false, t) }}
+
{{ describeTrancheTime(item, i, true) }}
+
{{ describeTrancheTime(item, i, false) }}
market order
@@ -274,16 +274,17 @@ const orders = computed(()=>{ return result }) -function describeTrancheTime(st, isStart, t) { +function describeTrancheTime(st, trancheIndex, isStart) { + const t = st.order.tranches[trancheIndex] + const ts = st.trancheStatus[trancheIndex] let result = '' if( t.minIsBarrier || t.maxIsBarrier ) return 'barrier' const now = Math.round(Date.now()/1000) if( isStart && t.startTime > 0 ) { const start = t.startTimeIsRelative ? st.startTime + t.startTime : t.startTime - result += now < start ? 'Activates ' : - st.trancheStatus.activationTime < now ? 'Rate Limited ' : 'Activated ' - result += timestampString(st.trancheStatus.activationTime) + ' ' + result += now < start ? ts.activationTime < now ? 'Rate Limited ' : 'Activates ' : 'Activated ' + result += timestampString(ts.activationTime) + ' ' } if( !isStart && t.endTime < 4294967295 ) { const ended = t.endTimeIsRelative ? st.startTime + t.endTime : t.endTime diff --git a/src/components/TokenRow.vue b/src/components/TokenRow.vue index bded3fc..a475760 100644 --- a/src/components/TokenRow.vue +++ b/src/components/TokenRow.vue @@ -1,7 +1,7 @@