diff --git a/package.json b/package.json
index 625ec2273..320958817 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     },
     "dependencies": {
         "@avalabs/avalanche-wallet-sdk": "0.20.0-alpha.11",
-        "@avalabs/glacier-sdk": "2.8.0-alpha.92",
+        "@avalabs/glacier-sdk": "2.8.0-alpha.108",
         "@avalabs/vue_components": "0.10.0",
         "@ethereumjs/common": "2.0.0",
         "@ethereumjs/tx": "3.0.0",
@@ -28,7 +28,7 @@
         "@ledgerhq/hw-transport-u2f": "5.36.0-deprecated",
         "@ledgerhq/hw-transport-webhid": "5.51.1",
         "@ledgerhq/hw-transport-webusb": "5.51.1",
-        "@openzeppelin/contracts": "4.9.0",
+        "@openzeppelin/contracts": "4.9.2",
         "avalanche": "3.15.2",
         "axios": "0.21.2",
         "big.js": "5.2.2",
diff --git a/src/components/SidePanels/History/ViewTypes/BaseTx.vue b/src/components/SidePanels/History/ViewTypes/BaseTx.vue
index 36f3dfcbe..84d40c03e 100644
--- a/src/components/SidePanels/History/ViewTypes/BaseTx.vue
+++ b/src/components/SidePanels/History/ViewTypes/BaseTx.vue
@@ -181,230 +181,6 @@ export default class BaseTx extends Vue {
     get type() {
         return this.transaction.txType as TransactionTypeName
     }
-
-    // What did I lose?
-    // get inValues() {
-    //     let addrs: string[] = this.addresses
-    //
-    //     this.transaction.consumedUtxos.map((utxo) => {
-    //         utxo.addresses
-    //         utxo.addresses.in
-    //     })
-    //     let ins = this.transaction.inputs
-    //     let res: TransactionValueDict = {} // asset id -> value dict
-    //
-    //     // if empty
-    //     if (!ins) {
-    //         return res
-    //     }
-    //
-    //     ins.forEach((inputUtxo) => {
-    //         const include = this.includeUtxo(inputUtxo.output, true)
-    //         const assetId = inputUtxo.output.assetID
-    //         const amt = inputUtxo.output.amount
-    //
-    //         if (include) {
-    //             if (res[assetId]) {
-    //                 res[assetId] += parseInt(amt)
-    //             } else {
-    //                 res[assetId] = parseInt(amt)
-    //             }
-    //         }
-    //     })
-    //
-    //     return res
-    // }
-
-    /**
-     *
-     * @param utxo The UTXO object
-     * @param isInput is it an input UTXO?
-     */
-    // includeUtxo(utxo: Utxo, isInput?: boolean) {
-    //     // Does this wallet own this utxo
-    //     const isOwner = utxo.addresses.filter((value) => this.addrsRaw.includes(value)).length > 0
-    //
-    //     switch (this.transaction.txType) {
-    //         case 'export':
-    //             return utxo.consumedOnChainId === avm.getBlockchainID()
-    //         case 'pvm_export':
-    //             return utxo.consumedOnChainId === pChain.getBlockchainID()
-    //         case 'pvm_import':
-    //         case 'import':
-    //             if (isInput) return false
-    //             return isOwner
-    //         case 'add_validator':
-    //         case 'add_delegator':
-    //             return !isInput && utxo.stake
-    //         case 'operation':
-    //             // if no payload it is avax
-    //             // check if it is from wallet
-    //             if (!utxo.payload && !isOwner) return false
-    //             return true
-    //         // default just return original logic
-    //         // might need to be changed in the future as
-    //         // more tx types are added
-    //         case 'BaseTx':
-    //         default:
-    //             return isOwner
-    //     }
-    //
-    //     return false
-    // }
-
-    // get tokensReceived() {
-    //     let tokens = this.summary.tokens
-    //     let res = {}
-    //     for (var assetId in tokens) {
-    //         let asset = tokens[assetId]
-    //         if (asset.amount.gte(new BN(0))) {
-    //             //@ts-ignore
-    //             res[assetId] = asset
-    //         }
-    //     }
-    //     return res
-    // }
-
-    // get tokensSent() {
-    //     let tokens = this.summary.tokens
-    //     let res = {}
-    //     for (var assetId in tokens) {
-    //         let asset = tokens[assetId]
-    //         if (asset.amount.lt(new BN(0))) {
-    //             //@ts-ignore
-    //             res[assetId] = asset
-    //         }
-    //     }
-    //     return res
-    // }
-
-    // what did I gain?
-    // get outValues() {
-    //     let addrs: string[] = this.addresses
-    //     let addrsRaw = addrs.map((addr) => addr.split('-')[1])
-    //     let outs = this.transaction.outputs
-    //     let res: TransactionValueDict = {} // asset id -> value dict
-    //
-    //     // if empty
-    //     if (!outs) {
-    //         return res
-    //     }
-    //
-    //     outs.forEach((utxoOut) => {
-    //         let utxoAddrs = utxoOut.addresses
-    //         let assetId = utxoOut.assetID
-    //         let amt = utxoOut.amount
-    //
-    //         const include = this.includeUtxo(utxoOut)
-    //
-    //         if (include) {
-    //             if (res[assetId]) {
-    //                 res[assetId] += parseInt(amt)
-    //             } else {
-    //                 res[assetId] = parseInt(amt)
-    //             }
-    //         }
-    //     })
-    //
-    //     return res
-    // }
-
-    // get valList() {
-    //     let ins = this.inValues
-    //     let outs = this.outValues
-    //     let res = JSON.parse(JSON.stringify(outs))
-    //
-    //     for (var assetId in ins) {
-    //         let inAmount = ins[assetId] || 0
-    //         if (res[assetId]) {
-    //             res[assetId] -= inAmount
-    //         } else {
-    //             res[assetId] = -1 * inAmount
-    //         }
-    //     }
-    //
-    //     return res
-    // }
-
-    // get nftGroups() {
-    //     let addrs: string[] = this.addresses
-    //     let addrsRaw = addrs.map((addr) => addr.split('-')[1])
-    //
-    //     let ins = this.transaction.inputs
-    //     let outs = this.transaction.outputs
-    //     let res: { [key in string]: { [key in string]: PayloadBase[] } } = {}
-    //
-    //     // res = {
-    //     //     'asset id': { ['group id']: 'payload' },
-    //     // }
-    //
-    //     const pushPayload = (rawPayload: string, assetID: string, groupID: number) => {
-    //         let payload = Buffer.from(rawPayload, 'base64')
-    //         payload = Buffer.concat([new Buffer(4).fill(payload.length), payload])
-    //
-    //         try {
-    //             let typeId = payloadtypes.getTypeID(payload)
-    //             let pl: Buffer = payloadtypes.getContent(payload)
-    //             let payloadbase: PayloadBase = payloadtypes.select(typeId, pl)
-    //
-    //             if (res[assetID]) {
-    //                 if (res[assetID][groupID]) {
-    //                     res[assetID][groupID].push(payloadbase)
-    //                 } else {
-    //                     res[assetID] = {
-    //                         [groupID]: [payloadbase],
-    //                     }
-    //                 }
-    //             } else {
-    //                 res[assetID] = {
-    //                     [groupID]: [payloadbase],
-    //                 }
-    //             }
-    //         } catch (e) {
-    //             // console.error(e)
-    //         }
-    //     }
-    //
-    //     if (ins) {
-    //         ins.forEach((inputUtxo) => {
-    //             const groupID = inputUtxo.output.groupID
-    //             const assetID = inputUtxo.output.assetID
-    //
-    //             if (inputUtxo.output.payload) {
-    //                 pushPayload(inputUtxo.output.payload, assetID, groupID)
-    //             }
-    //         })
-    //     }
-    //
-    //     if (outs) {
-    //         outs.forEach((utxoOut) => {
-    //             let groupID = utxoOut.groupID
-    //             let assetID = utxoOut.assetID
-    //
-    //             if (utxoOut.payload) {
-    //                 pushPayload(utxoOut.payload, assetID, groupID)
-    //             }
-    //         })
-    //     }
-    //
-    //     return res
-    // }
-
-    // get operationDirection() {
-    //     if (this.type !== 'operation') return 'N/A'
-    //
-    //     let addrs: string[] = this.addresses
-    //     let addrsRaw = addrs.map((addr) => addr.split('-')[1])
-    //
-    //     let ins = this.transaction.inputs || []
-    //     const isFromWallet = ins.find((input) => {
-    //         return input.output.addresses.find((value) => {
-    //             return addrsRaw.includes(value)
-    //         })
-    //     })
-    //
-    //     return isFromWallet ? 'Sent' : 'Received'
-    // }
 }
 </script>
 <style scoped lang="scss">
diff --git a/src/components/SidePanels/History/ViewTypes/ImportExport.vue b/src/components/SidePanels/History/ViewTypes/ImportExport.vue
index eb875a0b2..55e0d7a8e 100644
--- a/src/components/SidePanels/History/ViewTypes/ImportExport.vue
+++ b/src/components/SidePanels/History/ViewTypes/ImportExport.vue
@@ -1,11 +1,16 @@
 <template>
-    <div class="import_row" :export="isExport">
+    <div class="import_row" :export="isExport && !isExportReceiver">
         <p class="actionTitle">{{ actionTitle }} ({{ chainAlias }})</p>
         <div class="flex-column">
-            <p class="amt" v-for="(bal, key) in balances" :key="key">
-                {{ isExport ? '-' : '' }}{{ toLocaleString(bal.amount, bal.decimals) }}
-                {{ bal.symbol }}
+            <p v-if="isExportReceiver" class="amt">
+                {{ toLocaleString(outputReceivedBalances, 9) }} AVAX
             </p>
+            <template v-else>
+                <p class="amt" v-for="(bal, key) in balances" :key="key">
+                    {{ isExport ? '-' : '' }}{{ toLocaleString(bal.amount, bal.decimals) }}
+                    {{ bal.symbol }}
+                </p>
+            </template>
         </div>
     </div>
 </template>
@@ -14,8 +19,27 @@ import { avm, cChain, pChain } from '@/AVA'
 import { Vue, Component, Prop } from 'vue-property-decorator'
 import { BN } from 'avalanche'
 import { bnToBig } from '@/helpers/helper'
-import { TransactionType, XChainTransaction } from '@/js/Glacier/models'
+import {
+    isTransactionP,
+    isTransactionX,
+    TransactionType,
+    XChainTransaction,
+} from '@/js/Glacier/models'
 import { getExportBalances } from '@/components/SidePanels/History/ViewTypes/getExportBalances'
+import { WalletType } from '@/js/wallets/types'
+import { isOwnedUTXO } from '@/js/Glacier/isOwnedUtxo'
+
+function idToAlias(chainId: string | undefined) {
+    if (chainId === pChain.getBlockchainID()) {
+        return 'P'
+    } else if (chainId === avm.getBlockchainID()) {
+        return 'X'
+    } else if (chainId === cChain.getBlockchainID()) {
+        return 'C'
+    }
+    return chainId
+}
+
 @Component
 export default class ImportExport extends Vue {
     @Prop() transaction!: TransactionType
@@ -33,7 +57,15 @@ export default class ImportExport extends Vue {
     }
 
     get actionTitle() {
-        return this.isExport ? 'Export' : 'Import'
+        if (this.isExport) {
+            if (this.isExportReceiver) {
+                return 'Received'
+            } else {
+                return 'Export'
+            }
+        } else {
+            return 'Import'
+        }
     }
 
     /**
@@ -51,20 +83,63 @@ export default class ImportExport extends Vue {
 
     get chainAlias() {
         let chainId = this.isExport ? this.sourceChainId : this.destinationChainId
+        return idToAlias(chainId)
+    }
 
-        if (chainId === pChain.getBlockchainID()) {
-            return 'P'
-        } else if (chainId === avm.getBlockchainID()) {
-            return 'X'
-        } else if (chainId === cChain.getBlockchainID()) {
-            return 'C'
+    /**
+     * All X/P addresses used by the wallet
+     */
+    get addresses() {
+        let wallet: WalletType | null = this.$store.state.activeWallet
+        if (!wallet) return []
+        return wallet.getHistoryAddresses()
+    }
+
+    get ownedInputs() {
+        const tx = this.transaction
+        if (isTransactionP(tx)) {
+            return tx.consumedUtxos.filter((utxo) => {
+                return isOwnedUTXO(utxo, this.addresses)
+            })
+        } else {
+            return []
         }
-        return chainId
+    }
+
+    get ownedOutputs() {
+        const tx = this.transaction
+        if (isTransactionP(tx)) {
+            return tx.emittedUtxos.filter((utxo) => {
+                return isOwnedUTXO(utxo, this.addresses)
+            })
+        } else {
+            return []
+        }
+    }
+
+    get sourceChainAlias() {
+        return idToAlias(this.sourceChainId)
+    }
+
+    get wallet(): WalletType {
+        return this.$store.state.activeWallet
     }
 
     get balances() {
         return getExportBalances(this.transaction, this.destinationChainId, this.getAssetFromID)
     }
+
+    // If user received tokens from the export, but didnt consume any of their utxos
+    // Essentially, the P chain sending hack
+    get isExportReceiver() {
+        return this.isExport && this.ownedInputs.length === 0 && this.ownedOutputs.length > 0
+    }
+
+    get outputReceivedBalances() {
+        return this.ownedOutputs.reduce((agg, utxo) => {
+            return agg.add(new BN(utxo.amount))
+        }, new BN(0))
+    }
 }
 </script>
 <style scoped lang="scss">
diff --git a/src/components/SidePanels/History/ViewTypes/StakingTx.vue b/src/components/SidePanels/History/ViewTypes/StakingTx.vue
index 23e88ea7f..e088917d6 100644
--- a/src/components/SidePanels/History/ViewTypes/StakingTx.vue
+++ b/src/components/SidePanels/History/ViewTypes/StakingTx.vue
@@ -39,7 +39,7 @@ import { ValidatorRaw } from '@/components/misc/ValidatorList/types'
 import { WalletType } from '@/js/wallets/types'
 import { getPriceAtUnixTime } from '@/helpers/price_helper'
 import Big from 'big.js'
-import { PChainTransaction, PChainEmittedUtxo } from '@avalabs/glacier-sdk'
+import { PChainTransaction, PChainUtxo, RewardType } from '@avalabs/glacier-sdk'
 import { filterOwnedAddresses } from './filterOwnedAddresses'
 
 @Component
@@ -87,18 +87,18 @@ export default class StakingTx extends Vue {
     /**
      * The validator reward UTXO of this tx
      */
-    get validatorReward(): PChainEmittedUtxo | undefined {
+    get validatorReward(): PChainUtxo | undefined {
         return (this.transaction.emittedUtxos || []).filter((utxo) => {
-            return utxo.rewardType === 'validator'
+            return utxo.rewardType === RewardType.VALIDATOR
         })[0]
     }
 
     /**
      * The delegator reward UTXO of this tx
      */
-    get delegatorReward(): PChainEmittedUtxo | undefined {
+    get delegatorReward(): PChainUtxo | undefined {
         return (this.transaction.emittedUtxos || []).filter((utxo) => {
-            return utxo.rewardType === 'delegator'
+            return utxo.rewardType === RewardType.DELEGATOR
         })[0]
     }
 
diff --git a/src/components/SidePanels/History/ViewTypes/getExportBalances.ts b/src/components/SidePanels/History/ViewTypes/getExportBalances.ts
index 31d1e992e..8b6343eb8 100644
--- a/src/components/SidePanels/History/ViewTypes/getExportBalances.ts
+++ b/src/components/SidePanels/History/ViewTypes/getExportBalances.ts
@@ -1,13 +1,13 @@
 import {
     isCChainExportTransaction,
     isCChainImportTransaction,
-    isPChainEmittedUTXO,
+    isPChainUtxo,
     isTransactionP,
     isTransactionX,
     TransactionType,
 } from '@/js/Glacier/models'
 import { BN } from 'avalanche'
-import { Utxo, PChainConsumedUtxo, PChainEmittedUtxo } from '@avalabs/glacier-sdk'
+import { Utxo, PChainUtxo, UtxoType } from '@avalabs/glacier-sdk'
 import AvaAsset from '@/js/AvaAsset'
 export function getExportBalances(tx: TransactionType, destinationChainId: string, getAsset: any) {
     const balances: {
@@ -20,10 +20,10 @@ export function getExportBalances(tx: TransactionType, destinationChainId: strin
     } = {}
 
     // For exported utxo, createdOnChainId is source chain, and consumedOnChainId is destination chain.
-    let exportedUTXOs: Array<Utxo | PChainEmittedUtxo> = []
+    let exportedUTXOs: Array<Utxo | PChainUtxo> = []
 
     if (isTransactionP(tx) || isTransactionX(tx) || isCChainExportTransaction(tx)) {
-        const utxosOut: Array<Utxo | PChainEmittedUtxo> = tx.emittedUtxos || []
+        const utxosOut: Array<Utxo | PChainUtxo> = tx.emittedUtxos || []
         exportedUTXOs = utxosOut.filter((utxo) => {
             return utxo.consumedOnChainId === destinationChainId
         })
@@ -39,14 +39,19 @@ export function getExportBalances(tx: TransactionType, destinationChainId: strin
                 createdOnChainId: '',
                 consumedOnChainId: '',
                 staked: false,
-            } as PChainEmittedUtxo
+                txHash: tx.txHash,
+                outputIndex: 0,
+                blockTimestamp: 0,
+                blockNumber: '0',
+                utxoType: UtxoType.TRANSFER,
+            } as PChainUtxo
         })
     }
 
     exportedUTXOs.forEach((utxo) => {
         let assetId, amount, decimals, symbol
 
-        if (isPChainEmittedUTXO(utxo)) {
+        if (isPChainUtxo(utxo)) {
             const asset = getAsset(utxo.assetId) as AvaAsset
             assetId = utxo.assetId
             amount = utxo.amount
diff --git a/src/components/SidePanels/TxHistoryRow.vue b/src/components/SidePanels/TxHistoryRow.vue
index b4edbd750..f1af8d618 100644
--- a/src/components/SidePanels/TxHistoryRow.vue
+++ b/src/components/SidePanels/TxHistoryRow.vue
@@ -41,7 +41,7 @@ import {
 import ImportExport from '@/components/SidePanels/History/ViewTypes/ImportExport.vue'
 import BaseTx from '@/components/SidePanels/History/ViewTypes/BaseTx.vue'
 import StakingTx from '@/components/SidePanels/History/ViewTypes/StakingTx.vue'
-import { PChainEmittedUtxo, Utxo, PChainTransaction } from '@avalabs/glacier-sdk'
+import { Utxo, PChainTransaction, PChainUtxo } from '@avalabs/glacier-sdk'
 import { getUrlFromTransaction } from '@/js/Glacier/getUrlFromTransaction'
 import { ava } from '@/AVA'
 import { isOwnedUTXO } from '@/js/Glacier/isOwnedUtxo'
@@ -66,7 +66,7 @@ export default class TxHistoryRow extends Vue {
     get hasMultisig() {
         if (!this.ownedOutputs) return false
         let totMultiSig = 0
-        this.ownedOutputs.forEach((utxo: Utxo | PChainEmittedUtxo) => {
+        this.ownedOutputs.forEach((utxo: Utxo | PChainUtxo) => {
             if (utxo.addresses.length > 1) {
                 totMultiSig++
             }
@@ -74,7 +74,7 @@ export default class TxHistoryRow extends Vue {
         return totMultiSig > 0
     }
 
-    get outputUTXOs(): (Utxo | PChainEmittedUtxo)[] {
+    get outputUTXOs(): Utxo[] | PChainUtxo[] {
         return this.transaction.emittedUtxos || []
     }
 
@@ -88,7 +88,7 @@ export default class TxHistoryRow extends Vue {
      * Outputs owned by this wallet
      */
     get ownedOutputs() {
-        return this.outputUTXOs.filter((utxo: Utxo | PChainEmittedUtxo) => {
+        return (this.outputUTXOs as (Utxo | PChainUtxo)[]).filter((utxo: Utxo | PChainUtxo) => {
             return isOwnedUTXO(utxo, this.addresses)
         })
     }
diff --git a/src/components/misc/MultiSelect.vue b/src/components/misc/MultiSelect.vue
new file mode 100644
index 000000000..65d47729a
--- /dev/null
+++ b/src/components/misc/MultiSelect.vue
@@ -0,0 +1,79 @@
+<template>
+    <div class="radio_buts">
+        <button
+            v-for="(key, i) in keys"
+            :key="key"
+            @click="select(key)"
+            :active="selectionSet.has(key)"
+            class="hover_border"
+            :disabled="disabled"
+        >
+            {{ labels[i] }}
+        </button>
+    </div>
+</template>
+<script lang="ts">
+import { Vue, Component, Prop, Model } from 'vue-property-decorator'
+import RadioButtons from './RadioButtons.vue'
+
+@Component
+export default class MultiSelect extends Vue {
+    @Prop() labels!: string[]
+    @Prop() keys!: string[]
+    @Prop({ default: false }) disabled!: boolean
+
+    @Model('change', { type: Array }) readonly selection!: string[]
+
+    get selectionSet() {
+        return new Set(this.selection)
+    }
+
+    select(val: string) {
+        const now: Set<string> = new Set(this.selection)
+        if (now.has(val)) {
+            now.delete(val)
+        } else {
+            now.add(val)
+        }
+        this.$emit('change', Array.from(now))
+    }
+}
+</script>
+<style scoped lang="scss">
+@use '../../main';
+.radio_buts {
+    display: flex;
+    flex-wrap: wrap;
+}
+button {
+    word-break: normal;
+    white-space: nowrap;
+    font-weight: bold;
+    font-size: 14px;
+    padding: 4px 14px;
+    border: 1px solid transparent;
+    color: var(--primary-color-light);
+    background-color: var(--bg-wallet);
+    border-radius: 4px;
+    margin-right: 6px;
+    margin-bottom: 6px;
+    transition-duration: 0.2s;
+    font-family: Inconsolata, monospace;
+
+    &[active] {
+        color: var(--bg-wallet);
+        background-color: var(--primary-color);
+    }
+
+    &[disabled] {
+        opacity: 0.4;
+    }
+}
+
+@include main.medium-device {
+    button {
+        font-size: 11px;
+        padding: 4px 8px;
+    }
+}
+</style>
diff --git a/src/components/misc/RadioButtons.vue b/src/components/misc/RadioButtons.vue
index a8bdc8cc6..4f9cfd152 100644
--- a/src/components/misc/RadioButtons.vue
+++ b/src/components/misc/RadioButtons.vue
@@ -6,6 +6,7 @@
             @click="select(key)"
             :active="selection === key"
             class="hover_border"
+            :disabled="disabled"
         >
             {{ labels[i] }}
         </button>
@@ -18,6 +19,7 @@ import { Vue, Component, Prop, Model } from 'vue-property-decorator'
 export default class RadioButtons extends Vue {
     @Prop() labels!: string[]
     @Prop() keys!: string[]
+    @Prop({ default: false }) disabled!: boolean
 
     @Model('change', { type: String }) readonly selection!: string
 
@@ -56,6 +58,10 @@ button {
         //border-color: #285599;
         background-color: var(--primary-color);
     }
+
+    &[disabled] {
+        opacity: 0.4;
+    }
 }
 
 @include main.medium-device {
diff --git a/src/components/modals/ExportGlacierHistoryModal.vue b/src/components/modals/ExportGlacierHistoryModal.vue
new file mode 100644
index 000000000..4e22bb68e
--- /dev/null
+++ b/src/components/modals/ExportGlacierHistoryModal.vue
@@ -0,0 +1,312 @@
+<template>
+    <modal ref="modal" title="Export Transaction History" class="modal_main">
+        <div class="csv_modal_body">
+            <div>
+                <label>Include Chains</label>
+                <MultiSelect
+                    style="margin: 0px auto"
+                    :labels="['X-Chain', 'P-Chain', 'C-Chain']"
+                    :keys="initialSelection"
+                    v-model="includeChains"
+                    :disabled="operationID"
+                ></MultiSelect>
+                <label>Date Range</label>
+                <RadioButtons
+                    :labels="timeframeOptions"
+                    :keys="timeframeOptions"
+                    :disabled="operationID"
+                    v-model="timeframe"
+                ></RadioButtons>
+                <div>
+                    <div>
+                        <label>From</label>
+                        <datetime
+                            v-model="formStartISO"
+                            type="datetime"
+                            class="date"
+                            :min-datetime="startDateMin"
+                            :max-datetime="startDateMax"
+                            :disabled="operationID || timeframe !== 'Custom'"
+                        ></datetime>
+                    </div>
+                    <div>
+                        <label>Until</label>
+                        <datetime
+                            v-model="formEndISO"
+                            type="datetime"
+                            class="date"
+                            :min-datetime="endDateMin"
+                            :max-datetime="endDateMax"
+                            :disabled="operationID || timeframe !== 'Custom'"
+                        ></datetime>
+                    </div>
+                </div>
+            </div>
+            <v-btn
+                class="button_secondary"
+                @click="submit"
+                :disabled="!canSubmit"
+                depressed
+                block
+                style="margin-top: 12px"
+                v-if="!operationID"
+            >
+                Generate
+            </v-btn>
+            <div style="justify-content: center; display: flex; padding: 1em">
+                <Spinner v-if="loading"></Spinner>
+                <p class="err" v-if="error">{{ error }}</p>
+                <p v-if="downloadURL">Your file is ready to download.</p>
+            </div>
+            <template v-if="downloadURL || error">
+                <v-btn
+                    :href="downloadURL"
+                    download
+                    depressed
+                    block
+                    :disabled="!downloadURL"
+                    class="button_primary"
+                    v-if="downloadURL"
+                >
+                    Download
+                </v-btn>
+                <v-btn variant="text" @click="reset" depressed block class="restart_button">
+                    Start Over
+                </v-btn>
+            </template>
+        </div>
+    </modal>
+</template>
+<script lang="ts">
+import 'reflect-metadata'
+import { Vue, Component, Prop, Watch } from 'vue-property-decorator'
+
+import Modal from '@/components/modals/Modal.vue'
+import { BlockchainId, Glacier, OperationStatus } from '@avalabs/glacier-sdk'
+import { WalletType } from '@/js/wallets/types'
+import MultiSelect from '../misc/MultiSelect.vue'
+import glacier from '@/js/Glacier/Glacier'
+import Spinner from '@/components/misc/Spinner.vue'
+import RadioButtons from '../misc/RadioButtons.vue'
+import { setTimeoutInterval } from '@/helpers/setTimeoutInterval'
+
+const DAY = 24 * 60 * 60 * 1000
+const MONTH = 30 * DAY
+
+const TIMEOUT_SECONDS = 15
+
+type Timeframe = 'Last 3 Months' | 'Last 6 Months' | 'This Year' | 'Last Year' | 'All' | 'Custom'
+
+@Component({
+    components: {
+        Modal,
+        MultiSelect,
+        Spinner,
+        RadioButtons,
+    },
+})
+export default class ExportGlacierHistoryModal extends Vue {
+    operationID: string | null = null
+    downloadURL: string | null = null
+    loading = false
+    error: Error | null = null
+    endDate: Date = new Date()
+    startDate: Date = new Date(this.endDate.getTime() - DAY)
+
+    timeframeOptions: Timeframe[] = [
+        'Last 3 Months',
+        'Last 6 Months',
+        'This Year',
+        'Last Year',
+        'All',
+        'Custom',
+    ]
+    timeframe: Timeframe = 'Last 3 Months'
+
+    includeChains: BlockchainId[] = [
+        BlockchainId.X_CHAIN,
+        BlockchainId.P_CHAIN,
+        BlockchainId.C_CHAIN,
+    ]
+
+    formEndISO: string = this.endDate.toISOString()
+    formStartISO: string = this.startDate.toISOString()
+
+    intervalPromise: Promise<void> | undefined
+
+    open(): void {
+        this.reset()
+        let modal = this.$refs.modal as Modal
+        modal.open()
+    }
+
+    async checkStatus(): Promise<boolean> {
+        if (!this.operationID || this.downloadURL) return true
+
+        const res = await glacier.operations.getOperationResult({ operationId: this.operationID })
+
+        if (res.operationStatus == OperationStatus.COMPLETED) {
+            this.downloadURL = res.metadata.downloadUrl || null
+            this.loading = false
+            return true
+        } else if (res.operationStatus == OperationStatus.FAILED) {
+            this.onError(new Error(res.message))
+            return true
+        } else if (res.operationStatus !== OperationStatus.RUNNING) {
+            this.loading = false
+            return true
+        }
+        return false
+    }
+
+    onError(error: any) {
+        this.loading = false
+        this.error = error
+    }
+
+    get initialSelection() {
+        return [BlockchainId.X_CHAIN, BlockchainId.P_CHAIN, BlockchainId.C_CHAIN]
+    }
+
+    get canSubmit() {
+        return this.includeChains.length
+        // return this.showDelegation || this.showValidation || this.showFees
+    }
+
+    get wallet() {
+        return this.$store.state.activeWallet
+    }
+
+    get startDateMax() {
+        return new Date(this.formEndDate.getTime() - DAY).toISOString()
+    }
+
+    get startDateMin() {
+        return new Date(1591236400).toISOString()
+    }
+
+    get endDateMax() {
+        return new Date().toISOString()
+    }
+
+    get endDateMin() {
+        return new Date(1591236400).toISOString()
+    }
+
+    get formStartDate() {
+        return new Date(this.formStartISO)
+    }
+
+    get formEndDate() {
+        return new Date(this.formEndISO)
+    }
+
+    @Watch('timeframe', { immediate: true })
+    onTimeframe(val: Timeframe) {
+        switch (val) {
+            case 'Last 3 Months':
+                this.formStartISO = this.last3Months.toISOString()
+                this.formEndISO = this.dateNow.toISOString()
+                break
+            case 'Last 6 Months':
+                this.formStartISO = this.last6Months.toISOString()
+                this.formEndISO = this.dateNow.toISOString()
+                break
+            case 'This Year':
+                this.formStartISO = this.thisYear.toISOString()
+                this.formEndISO = this.dateNow.toISOString()
+                break
+            case 'Last Year':
+                this.formStartISO = this.lastYear.toISOString()
+                this.formEndISO = this.thisYear.toISOString()
+                break
+            case 'All':
+                this.formStartISO = this.dateAll.toISOString()
+                this.formEndISO = this.dateNow.toISOString()
+                break
+        }
+    }
+
+    get dateNow() {
+        return new Date()
+    }
+
+    get last3Months() {
+        const date = new Date(this.dateNow.getTime() - 3 * MONTH)
+        return date
+    }
+
+    get last6Months() {
+        const date = new Date(this.dateNow.getTime() - 6 * MONTH)
+        return date
+    }
+
+    get thisYear() {
+        const date = new Date(`${this.dateNow.getFullYear()}-01-01`)
+        return date
+    }
+
+    get lastYear() {
+        const date = new Date(`${this.thisYear.getFullYear() - 1}-01-01`)
+        return date
+    }
+
+    get dateAll() {
+        const date = new Date(`2020-09-01`)
+        return date
+    }
+
+    generateCSVData() {
+        const w = this.$store.state.activeWallet as WalletType
+        if (!w) return
+        const start = new Date('2023-01-01')
+        const end = new Date()
+        w.startTxExportJob(this.formStartDate, this.formEndDate, this.includeChains).then((res) => {
+            this.operationID = res.operationId
+            this.loading = true
+
+            this.intervalPromise = setTimeoutInterval(
+                this.checkStatus,
+                2000,
+                TIMEOUT_SECONDS * 1000
+            ).catch((e) => {
+                this.onError(e)
+            })
+        })
+    }
+
+    submit() {
+        try {
+            this.error = null
+            this.generateCSVData()
+        } catch (e: any) {
+            this.error = e
+        }
+    }
+
+    reset() {
+        this.error = null
+        this.operationID = null
+        this.downloadURL = null
+        this.loading = false
+    }
+}
+</script>
+<style scoped lang="scss">
+.csv_modal_body {
+    width: 480px;
+    max-width: 100%;
+    padding: 10px 20px;
+
+    label {
+        font-size: 0.7em;
+        font-weight: bold;
+    }
+}
+
+.restart_button {
+    margin-top: 0.5em;
+    background-color: transparent !important;
+    color: var(--primary-color);
+}
+</style>
diff --git a/src/components/wallet/TopCards/AddressCard/AddressCard.vue b/src/components/wallet/TopCards/AddressCard/AddressCard.vue
index 60be64510..26166ed7f 100644
--- a/src/components/wallet/TopCards/AddressCard/AddressCard.vue
+++ b/src/components/wallet/TopCards/AddressCard/AddressCard.vue
@@ -196,7 +196,7 @@ export default class AddressCard extends Vue {
             return '-'
         }
 
-        return '0x' + wallet.getEvmAddress()
+        return wallet.getEvmChecksumAddress()
     }
 
     get addressEVMBech32() {
diff --git a/src/components/wallet/activity/TxRow.vue b/src/components/wallet/activity/TxRow.vue
index 9803eda3c..8565c77d1 100644
--- a/src/components/wallet/activity/TxRow.vue
+++ b/src/components/wallet/activity/TxRow.vue
@@ -34,7 +34,7 @@
 <script lang="ts">
 import { Vue, Component, Prop } from 'vue-property-decorator'
 import { AssetsDict, NftFamilyDict } from '@/store/modules/assets/types'
-import { PChainEmittedUtxo, Utxo } from '@avalabs/glacier-sdk'
+import { PChainUtxo, Utxo } from '@avalabs/glacier-sdk'
 
 import StakingTx from '@/components/SidePanels/History/ViewTypes/StakingTx.vue'
 import BaseTx from '@/components/SidePanels/History/ViewTypes/BaseTx.vue'
@@ -70,7 +70,7 @@ export default class TxRow extends Vue {
         if (!isCChainImportTransaction(this.source)) {
             if (!this.source.emittedUtxos) return false
             let totMultiSig = 0
-            this.source.emittedUtxos.forEach((utxo: Utxo | PChainEmittedUtxo) => {
+            this.source.emittedUtxos.forEach((utxo: Utxo | PChainUtxo) => {
                 if (utxo.addresses.length > 1) {
                     totMultiSig++
                 }
diff --git a/src/helpers/setTimeoutInterval.ts b/src/helpers/setTimeoutInterval.ts
new file mode 100644
index 000000000..e84676b1e
--- /dev/null
+++ b/src/helpers/setTimeoutInterval.ts
@@ -0,0 +1,46 @@
+/**
+ * Does `action` at every `interval` until `timeout`. Emits `callback` when finished.
+ * @param action Function to call on every interval. If action returns `true` the interval will cancel.
+ * @param interval in ms
+ * @param timeout in ms
+ * @param callback
+ */
+export async function setTimeoutInterval(
+    action: () => Promise<boolean>,
+    interval: number,
+    timeout: number
+): Promise<void> {
+    const start = performance.now()
+    const end = start + timeout
+
+    return new Promise((resolve, reject) => {
+        const intervalID = setInterval(() => {
+            try {
+                const now = performance.now()
+
+                if (now > end) {
+                    clearInterval(intervalID)
+                    reject(new Error('Timeout'))
+                    return
+                }
+
+                // Do action every interval
+                action()
+                    .then((res) => {
+                        // If action returns true, stop interval
+                        if (res) {
+                            clearInterval(intervalID)
+                            resolve()
+                        }
+                    })
+                    .catch((err) => {
+                        clearInterval(intervalID)
+                        reject(err)
+                    })
+            } catch (e) {
+                clearInterval(intervalID)
+                reject(e)
+            }
+        }, interval)
+    })
+}
diff --git a/src/js/Glacier/isOwnedUtxo.ts b/src/js/Glacier/isOwnedUtxo.ts
index ff7748aa7..04df17a9b 100644
--- a/src/js/Glacier/isOwnedUtxo.ts
+++ b/src/js/Glacier/isOwnedUtxo.ts
@@ -1,14 +1,11 @@
-import { PChainConsumedUtxo, Utxo, PChainEmittedUtxo } from '@avalabs/glacier-sdk'
+import { Utxo, PChainUtxo } from '@avalabs/glacier-sdk'
 
 /**
  * Check if the UTXO is owned by one of the given addresses
  * @param utxo
  * @param ownedAddresses
  */
-export function isOwnedUTXO(
-    utxo: Utxo | PChainConsumedUtxo | PChainEmittedUtxo,
-    ownedAddresses: string[]
-) {
+export function isOwnedUTXO(utxo: Utxo | PChainUtxo, ownedAddresses: string[]) {
     // Strip chain id
     ownedAddresses = ownedAddresses.map((addr) => {
         return addr.split('-')[1] ?? addr
diff --git a/src/js/Glacier/models.ts b/src/js/Glacier/models.ts
index 5fbac6bb4..32e59a1d9 100644
--- a/src/js/Glacier/models.ts
+++ b/src/js/Glacier/models.ts
@@ -9,8 +9,7 @@ import {
     CChainImportTransaction,
     SortOrder,
     Utxo,
-    PChainConsumedUtxo,
-    PChainEmittedUtxo,
+    PChainUtxo,
 } from '@avalabs/glacier-sdk'
 
 export type XChainTransaction = XChainLinearTransaction | XChainNonLinearTransaction
@@ -52,12 +51,13 @@ export type TransactionType =
     | CChainImportTransaction
     | CChainExportTransaction
 
-export type UtxoType = Utxo | PChainEmittedUtxo | PChainConsumedUtxo
+export type UtxoType = Utxo | PChainUtxo
 
 export function isTransactionX(tx: TransactionType): tx is XChainTransaction {
     return (
         (tx as XChainTransaction).amountUnlocked !== undefined &&
-        (tx as XChainTransaction).memo !== undefined
+        (tx as XChainTransaction).memo !== undefined &&
+        (tx as CChainImportTransaction).evmOutputs == undefined
     )
 }
 
@@ -90,12 +90,8 @@ export interface GetTransactionsParams {
     sortOrder?: SortOrder
 }
 
-export function isPChainEmittedUTXO(utxo: UtxoType): utxo is PChainEmittedUtxo {
-    return (utxo as PChainEmittedUtxo).assetId !== undefined
-}
-
-export function isPChainConsumedUTXO(utxo: UtxoType): utxo is PChainConsumedUtxo {
-    return (utxo as PChainConsumedUtxo).fromTx !== undefined
+export function isPChainUtxo(utxo: UtxoType): utxo is PChainUtxo {
+    return (utxo as PChainUtxo).staked !== undefined
 }
 
 export function isUtxo(utxo: UtxoType): utxo is Utxo {
diff --git a/src/js/wallets/AbstractHdWallet.ts b/src/js/wallets/AbstractHdWallet.ts
index c710902f8..5ba397c49 100644
--- a/src/js/wallets/AbstractHdWallet.ts
+++ b/src/js/wallets/AbstractHdWallet.ts
@@ -148,12 +148,14 @@ abstract class AbstractHdWallet extends AbstractWallet {
     // Returns addresses to check for history
     getHistoryAddresses(): string[] {
         const internalIndex = this.internalHelper.hdIndex
+
+        const evmBech32 = this.getEvmAddressBech()
         // They share the same address space, so whatever has the highest index
         const externalIndex = Math.max(this.externalHelper.hdIndex, this.platformHelper.hdIndex)
 
         const internal = this.internalHelper.getAllDerivedAddresses(internalIndex)
         const external = this.externalHelper.getAllDerivedAddresses(externalIndex)
-        return internal.concat(external)
+        return [...internal, ...external, evmBech32]
     }
 
     getCurrentAddressAvm(): string {
@@ -279,6 +281,6 @@ abstract class AbstractHdWallet extends AbstractWallet {
         return await this.signMessageByExternalAddress(msg, address)
     }
 
-    abstract async signHashByExternalIndex(index: number, hash: Buffer): Promise<string>
+    abstract signHashByExternalIndex(index: number, hash: Buffer): Promise<string>
 }
 export { AbstractHdWallet }
diff --git a/src/js/wallets/AbstractWallet.ts b/src/js/wallets/AbstractWallet.ts
index fa4f17afb..611f4cf02 100644
--- a/src/js/wallets/AbstractWallet.ts
+++ b/src/js/wallets/AbstractWallet.ts
@@ -30,6 +30,13 @@ import { isMainnetNetworkID } from '@/store/modules/network/isMainnetNetworkID'
 import { isTestnetNetworkID } from '@/store/modules/network/isTestnetNetworkID'
 import { web3 } from '@/evm'
 import { UTXO as PlatformUTXO } from 'avalanche/dist/apis/platformvm/utxos'
+import {
+    BlockchainId,
+    CreatePrimaryNetworkTransactionExportRequest,
+    PrimaryNetworkOptions,
+} from '@avalabs/glacier-sdk'
+import { toChecksumAddress } from 'ethereumjs-util'
+
 const uniqid = require('uniqid')
 
 abstract class AbstractWallet {
@@ -52,7 +59,7 @@ abstract class AbstractWallet {
     abstract getAllAddressesX(): string[]
     abstract getAllChangeAddressesX(): string[]
     abstract getAllExternalAddressesX(): string[]
-
+    abstract getHistoryAddresses(): string[]
     abstract signC(unsignedTx: EVMUnsignedTx): Promise<EVMTx>
     abstract signX(unsignedTx: AVMUnsignedTx): Promise<AVMTx>
     abstract signP(unsignedTx: PlatformUnsignedTx): Promise<PlatformTx>
@@ -60,6 +67,14 @@ abstract class AbstractWallet {
     abstract signMessage(msg: string, address?: string): Promise<string>
     abstract getPlatformUTXOSet(): PlatformUTXOSet
 
+    /**
+     *
+     * @returns Returns the checksum encoded EVM hex address per ERC-55.
+     */
+    getEvmChecksumAddress() {
+        return toChecksumAddress('0x' + this.getEvmAddress())
+    }
+
     getUTXOSet(): AVMUTXOSet {
         return this.utxoset
     }
@@ -450,6 +465,31 @@ abstract class AbstractWallet {
         return issueP(tx)
     }
 
+    /**
+     * Use Glacier to start a transaction history export job.
+     * Excluding EVM for now.
+     */
+    async startTxExportJob(startDate: Date, endDate: Date, chains: BlockchainId[]) {
+        const addresses = this.getHistoryAddresses()
+        const stripped = addresses.map((addr) => addr.split('-')[1] || addr)
+
+        const res = await glacier.operations.postTransactionExportJob({
+            requestBody: {
+                type:
+                    CreatePrimaryNetworkTransactionExportRequest.type
+                        .TRANSACTION_EXPORT_PRIMARY_NETWORK,
+                startDate: startDate.toISOString().split('T')[0],
+                endDate: endDate.toISOString().split('T')[0],
+                options: {
+                    // X/P/C and EVM addresses
+                    addresses: [...stripped, this.getEvmChecksumAddress()],
+                    includeChains: chains,
+                },
+            },
+        })
+        return res
+    }
+
     /**
      * Create and issue an AddDelegatorTx
      * @param nodeID
diff --git a/src/views/wallet/Activity.vue b/src/views/wallet/Activity.vue
index ad8f9bf06..b06bc9b2e 100644
--- a/src/views/wallet/Activity.vue
+++ b/src/views/wallet/Activity.vue
@@ -1,7 +1,6 @@
 <template>
     <div class="activity_page">
-        <ExportCsvModal ref="csv_modal"></ExportCsvModal>
-        <ExportAvaxCsvModal ref="avax_csv_modal"></ExportAvaxCsvModal>
+        <ExportGlacierHistoryModal ref="glacier_csv_modal"></ExportGlacierHistoryModal>
         <div class="explorer_warning" v-if="!hasExplorer">
             <div class="warning_body">
                 <h1>{{ $t('activity.no_explorer.title') }}</h1>
@@ -13,26 +12,19 @@
                 <div class="filter_cont">
                     <label>
                         Export CSV File (BETA)
-                        <span style="font-size: 0.8em; opacity: 0.8">Temporarily Disabled</span>
+                        <span style="font-size: 0.8em; opacity: 0.8" v-if="isCsvDisabled">
+                            Not Supported For This Network
+                        </span>
                     </label>
                     <div class="csv_buttons">
                         <v-btn
                             x-small
-                            @click="openCsvModal"
-                            class="button_secondary"
                             depressed
-                            disabled
-                        >
-                            Export Rewards
-                        </v-btn>
-                        <v-btn
-                            x-small
-                            @click="openAvaxCsvModal"
                             class="button_secondary"
-                            depressed
-                            disabled
+                            @click="openGlacierCsvModal"
+                            :disabled="isCsvDisabled"
                         >
-                            Export AVAX Transfers
+                            Export History
                         </v-btn>
                     </div>
                 </div>
@@ -93,7 +85,7 @@
     </div>
 </template>
 <script lang="ts">
-import { Vue, Component, Watch } from 'vue-property-decorator'
+import { Component, Vue } from 'vue-property-decorator'
 import {
     isTransactionC,
     isTransactionX,
@@ -104,15 +96,19 @@ import {
 import TxRow from '@/components/wallet/activity/TxRow.vue'
 import RadioButtons from '@/components/misc/RadioButtons.vue'
 import Spinner from '@/components/misc/Spinner.vue'
-
-type FilterModeType = 'all' | 'transfer' | 'export_import' | 'stake'
-type ModeKeyType = 'all' | 'transfer' | 'swap' | 'stake'
-
 //@ts-ignore
 import VirtualList from 'vue-virtual-scroll-list'
 import { AvaNetwork } from '@/js/AvaNetwork'
 import ExportCsvModal from '@/components/modals/ExportCsvModal.vue'
 import ExportAvaxCsvModal from '@/components/modals/ExportAvaxCsvModal.vue'
+import { WalletType } from '@/js/wallets/types'
+import { BlockchainId } from '@avalabs/glacier-sdk'
+import ExportGlacierHistoryModal from '@/components/modals/ExportGlacierHistoryModal.vue'
+import { isMainnetNetworkID } from '@/store/modules/network/isMainnetNetworkID'
+import { isTestnetNetworkID } from '@/store/modules/network/isTestnetNetworkID'
+
+type FilterModeType = 'all' | 'transfer' | 'export_import' | 'stake'
+type ModeKeyType = 'all' | 'transfer' | 'swap' | 'stake'
 
 const PAGE_LIMIT = 100
 
@@ -124,6 +120,7 @@ const MONTH_MIN = 8
     components: {
         ExportAvaxCsvModal,
         ExportCsvModal,
+        ExportGlacierHistoryModal,
         Spinner,
         TxRow,
         RadioButtons,
@@ -151,6 +148,7 @@ export default class Activity extends Vue {
     $refs!: {
         csv_modal: ExportCsvModal
         avax_csv_modal: ExportAvaxCsvModal
+        glacier_csv_modal: ExportGlacierHistoryModal
     }
 
     openCsvModal() {
@@ -161,6 +159,14 @@ export default class Activity extends Vue {
         this.$refs.avax_csv_modal.open()
     }
 
+    openGlacierCsvModal() {
+        this.$refs.glacier_csv_modal.open()
+    }
+
+    get isCsvDisabled() {
+        return !this.hasExplorer || this.isFuji
+    }
+
     get showList(): boolean {
         if (this.isUpdatingAll || this.isLoading || this.isError) return false
         return true
@@ -187,12 +193,24 @@ export default class Activity extends Vue {
         return this.$t(`activity.months.${this.monthNow}`)
     }
 
+    get activeNetwork(): AvaNetwork | null {
+        return this.$store.state.Network.selectedNetwork
+    }
+
+    get isMainnet() {
+        return this.activeNetwork && isMainnetNetworkID(this.activeNetwork.networkId)
+    }
+
+    get isFuji() {
+        return this.activeNetwork && isTestnetNetworkID(this.activeNetwork.networkId)
+    }
+
+    /**
+     * Returns true if conencted to mainnet or fuji
+     */
     get hasExplorer() {
-        let network: AvaNetwork | null = this.$store.state.Network.selectedNetwork
-        if (!network?.explorerUrl) {
-            return false
-        }
-        return true
+        if (!this.activeNetwork) return false
+        return this.isMainnet || this.isFuji
     }
 
     mounted() {
diff --git a/tests/js/wallets/SingletonWallet.test.ts b/tests/js/wallets/SingletonWallet.test.ts
index 230bd074e..b3f1ddb5b 100644
--- a/tests/js/wallets/SingletonWallet.test.ts
+++ b/tests/js/wallets/SingletonWallet.test.ts
@@ -1,19 +1,16 @@
 import { SingletonWallet } from '@/js/wallets/SingletonWallet'
-
+import { isValidChecksumAddress } from 'ethereumjs-util'
 const TEST_KEY = 'PrivateKey-r6yxM4MiGc93hZ4QxSHhixLEH5RtPjGw6Y85gzg8mgaia6HT3'
 const ADDR_X = 'X-fuji1np2h3agqvgxc29sqfh0dy2nvmedus0sa44ktlr'
 const ADDR_C = '506433b9338e2a5706e3c0d6bce041d30688935f'
 
 import { ava, avm, cChain, pChain } from '@/AVA'
-// import { avmGetAllUTXOs } from '@/helpers/utxo_helper'
 
 ava.setNetworkID(5)
 avm.setBlockchainAlias('X')
 pChain.setBlockchainAlias('P')
 cChain.setBlockchainAlias('C')
 
-// jest.mock('avmGetAllUTXOs')
-
 describe('Singleton Wallet', () => {
     const wallet = new SingletonWallet(TEST_KEY)
 
@@ -37,7 +34,9 @@ describe('Singleton Wallet', () => {
         expect(addr1).toEqual(ADDR_C)
     })
 
-    // test('update utxos', () => {
-    //     avmGetAllUTXOs.mockResolvedValue
-    // })
+    test('can get checksum address', () => {
+        const address = wallet.getEvmChecksumAddress()
+        expect(address).toEqual('0x506433b9338e2a5706E3c0D6BCe041D30688935f')
+        expect(isValidChecksumAddress(address)).toBe(true)
+    })
 })
diff --git a/yarn.lock b/yarn.lock
index 689f5a7fe..14a922336 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -46,6 +46,11 @@
     web3-eth-contract "1.8.1"
     xss "1.0.11"
 
+"@avalabs/glacier-sdk@2.8.0-alpha.108":
+  version "2.8.0-alpha.108"
+  resolved "https://registry.yarnpkg.com/@avalabs/glacier-sdk/-/glacier-sdk-2.8.0-alpha.108.tgz#8d22cbb292773a12763382e5657e739fd8222505"
+  integrity sha512-BMG8yfp6YyHbTQuOpN8xOqzShO0DSgL0wlZxX736+NVtWEgOZdG/PRqFxI82ISpP12w0JLUYeWwtOYLAP2E/sQ==
+
 "@avalabs/glacier-sdk@2.8.0-alpha.92":
   version "2.8.0-alpha.92"
   resolved "https://registry.yarnpkg.com/@avalabs/glacier-sdk/-/glacier-sdk-2.8.0-alpha.92.tgz#91f63d893432ceed46d701813ad67acf9d6b912d"
@@ -2179,10 +2184,10 @@
   resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.8.3.tgz#cbef3146bfc570849405f59cba18235da95a252a"
   integrity sha512-bQHV8R9Me8IaJoJ2vPG4rXcL7seB7YVuskr4f+f5RyOStSZetwzkWtoqDMl5erkBJy0lDRUnIR2WIkPiC0GJlg==
 
-"@openzeppelin/contracts@4.9.0":
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.0.tgz#683f33b6598970051bc5f0806fd8660da9e018dd"
-  integrity sha512-DUP74AFGKlic2sQb/CmgrN2aUPMFGxRrmCTUxLHsiU2RzwWqVuMPZBxiAyvlff6Pea77uylAX6B5x9W6evEbhA==
+"@openzeppelin/contracts@4.9.2":
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/@openzeppelin/contracts/-/contracts-4.9.2.tgz#1cb2d5e4d3360141a17dbc45094a8cad6aac16c1"
+  integrity sha512-mO+y6JaqXjWeMh9glYVzVu8HYPGknAAnWyxTRhGeckOruyXQMNnlcW6w/Dx9ftLeIQk6N+ZJFuVmTwF7lEIFrg==
 
 "@samverschueren/stream-to-observable@^0.3.0":
   version "0.3.1"