diff --git a/e2e/genesis/localnet/balances.toml b/e2e/genesis/localnet/balances.toml
index bfe8bf5a3..56f567d91 100644
--- a/e2e/genesis/localnet/balances.toml
+++ b/e2e/genesis/localnet/balances.toml
@@ -14,7 +14,7 @@
 # As for the established addresses, these are derived from their respective
 # genesis tx toml files.
 
-[token.naan]
+[token.NAM]
 # albert
 tnam1qxfj3sf6a0meahdu9t6znp05g8zx4dkjtgyn9gfu = "2000000"
 tpknam1qrnw8mxyqlj60mykgevnldcj5mg2fya7fs5a8xqdkd2gwtxhef0zy8a2wha = "2000000"
diff --git a/e2e/genesis/localnet/parameters.toml b/e2e/genesis/localnet/parameters.toml
index 4d7b37dc6..bd053840d 100644
--- a/e2e/genesis/localnet/parameters.toml
+++ b/e2e/genesis/localnet/parameters.toml
@@ -1,6 +1,6 @@
 # General protocol parameters.
 [parameters]
-native_token = "naan"
+native_token = "NAM"
 # Minimum number of blocks in an epoch.
 min_num_of_blocks = 4
 # Maximum expected time per block (in seconds).
@@ -28,7 +28,7 @@ fee_unshielding_descriptions_limit = 15
 
 # Map of the cost per gas unit for every token allowed for fee payment
 [parameters.minimum_gas_price]
-naan = "0.000001"
+NAM = "0.000001"
 
 # Proof of stake parameters.
 [pos_params]
diff --git a/e2e/genesis/localnet/tokens.toml b/e2e/genesis/localnet/tokens.toml
index 6d570edb5..18d039001 100644
--- a/e2e/genesis/localnet/tokens.toml
+++ b/e2e/genesis/localnet/tokens.toml
@@ -1,9 +1,9 @@
 # Token accounts with their validity predicates
 
-[token.naan]
+[token.NAM]
 denom = 6
 
-[token.naan.masp_params]
+[token.NAM.masp_params]
 max_reward_rate = "0.01"
 kd_gain_nom = "0.25"
 kp_gain_nom = "0.25"
diff --git a/e2e/setup-namada.sh b/e2e/setup-namada.sh
index 27e4a4160..db4b07a84 100755
--- a/e2e/setup-namada.sh
+++ b/e2e/setup-namada.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-VERSION="v0.31.1"
+VERSION="v0.31.4"
 CURRENT_VERSION=""
 NAMADA_DIR=".namada"
 NAMADA_BASE_DIR=".namada/basedir"
diff --git a/e2e/src/index.test.ts b/e2e/src/index.test.ts
index 3517de478..6d1222104 100644
--- a/e2e/src/index.test.ts
+++ b/e2e/src/index.test.ts
@@ -83,12 +83,6 @@ describe("Namada", () => {
 
     test("import account & derive addresses", async () => {
       await importAccount(browser, page);
-      // Wait for close page button
-      const closePageBtn = await page.waitForSelector(
-        "[data-testid='setup-close-page-btn']",
-        {}
-      );
-      expect(closePageBtn).not.toBeNull();
     });
 
     test("import accounts with passphrases", async () => {
@@ -101,7 +95,10 @@ describe("Namada", () => {
       );
       expect(closePageBtn).not.toBeNull();
 
-      await importAccount(browser, page, { passphrase: passphrase1 });
+      await importAccount(browser, page, {
+        passphrase: passphrase1,
+        skipExpect: true,
+      });
 
       // Wait for alert
       const errorAlert = await page.waitForSelector(
diff --git a/e2e/src/partial/setup.ts b/e2e/src/partial/setup.ts
index 8f33874b6..6f5fff20f 100644
--- a/e2e/src/partial/setup.ts
+++ b/e2e/src/partial/setup.ts
@@ -1,5 +1,4 @@
 import * as puppeteer from "puppeteer";
-
 import {
   allowClipboardRead,
   openSetup,
@@ -10,7 +9,7 @@ import { alias0, mnemonic0, pwd } from "../utils/values";
 export const importAccount = async (
   browser: puppeteer.Browser,
   page: puppeteer.Page,
-  options?: { passphrase?: string }
+  options?: { passphrase?: string; skipExpect?: boolean }
 ): Promise<void> => {
   await openSetup(browser, page);
 
@@ -67,6 +66,14 @@ export const importAccount = async (
     await page.waitForSelector("[data-testid='setup-import-keys-next-button']")
   )?.click();
   await page.waitForNavigation();
+
+  if (!options?.skipExpect) {
+    const closePageBtn = await page.waitForSelector(
+      "[data-testid='setup-close-page-btn']",
+      {}
+    );
+    expect(closePageBtn).not.toBeNull();
+  }
 };
 
 export const createAccount = async (
diff --git a/packages/shared/lib/Cargo.lock b/packages/shared/lib/Cargo.lock
index e59e7a596..3d791edfa 100644
--- a/packages/shared/lib/Cargo.lock
+++ b/packages/shared/lib/Cargo.lock
@@ -2710,8 +2710,8 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
 [[package]]
 name = "namada"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "async-trait",
  "bimap",
@@ -2773,8 +2773,8 @@ dependencies = [
 
 [[package]]
 name = "namada_account"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "borsh",
  "namada_core",
@@ -2785,8 +2785,8 @@ dependencies = [
 
 [[package]]
 name = "namada_core"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "bech32 0.8.1",
  "borsh",
@@ -2830,8 +2830,8 @@ dependencies = [
 
 [[package]]
 name = "namada_ethereum_bridge"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "borsh",
  "ethabi",
@@ -2859,8 +2859,8 @@ dependencies = [
 
 [[package]]
 name = "namada_gas"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "borsh",
  "namada_core",
@@ -2870,8 +2870,8 @@ dependencies = [
 
 [[package]]
 name = "namada_governance"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "borsh",
  "namada_core",
@@ -2887,8 +2887,8 @@ dependencies = [
 
 [[package]]
 name = "namada_ibc"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "borsh",
  "ibc",
@@ -2910,8 +2910,8 @@ dependencies = [
 
 [[package]]
 name = "namada_macros"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2920,8 +2920,8 @@ dependencies = [
 
 [[package]]
 name = "namada_merkle_tree"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "borsh",
  "eyre",
@@ -2934,8 +2934,8 @@ dependencies = [
 
 [[package]]
 name = "namada_parameters"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "borsh",
  "namada_core",
@@ -2946,8 +2946,8 @@ dependencies = [
 
 [[package]]
 name = "namada_proof_of_stake"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "borsh",
  "data-encoding",
@@ -2967,8 +2967,8 @@ dependencies = [
 
 [[package]]
 name = "namada_sdk"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "async-trait",
  "bimap",
@@ -3024,8 +3024,8 @@ dependencies = [
 
 [[package]]
 name = "namada_shielded_token"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "masp_primitives",
  "namada_core",
@@ -3039,8 +3039,8 @@ dependencies = [
 
 [[package]]
 name = "namada_state"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "borsh",
  "ics23",
@@ -3061,8 +3061,8 @@ dependencies = [
 
 [[package]]
 name = "namada_storage"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "borsh",
  "itertools 0.10.5",
@@ -3076,8 +3076,8 @@ dependencies = [
 
 [[package]]
 name = "namada_token"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "namada_core",
  "namada_shielded_token",
@@ -3087,8 +3087,8 @@ dependencies = [
 
 [[package]]
 name = "namada_trans_token"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "namada_core",
  "namada_storage",
@@ -3096,8 +3096,8 @@ dependencies = [
 
 [[package]]
 name = "namada_tx"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "ark-bls12-381",
  "borsh",
@@ -3118,8 +3118,8 @@ dependencies = [
 
 [[package]]
 name = "namada_tx_env"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "namada_core",
  "namada_storage",
@@ -3127,8 +3127,8 @@ dependencies = [
 
 [[package]]
 name = "namada_vote_ext"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "borsh",
  "namada_core",
@@ -3138,8 +3138,8 @@ dependencies = [
 
 [[package]]
 name = "namada_vp_env"
-version = "0.31.1"
-source = "git+https://github.com/anoma/namada#a7e581ab9ddddecc0cea2539cd32dbdbb2d867ff"
+version = "0.31.4"
+source = "git+https://github.com/anoma/namada#9181fbe7533e524e83ef7bb77333a0efc9b8847d"
 dependencies = [
  "derivative",
  "masp_primitives",
diff --git a/packages/shared/lib/Cargo.toml b/packages/shared/lib/Cargo.toml
index d0c984116..462531b5b 100644
--- a/packages/shared/lib/Cargo.toml
+++ b/packages/shared/lib/Cargo.toml
@@ -23,7 +23,7 @@ gloo-utils = { version = "0.1.5", features = ["serde"] }
 js-sys = "0.3.60"
 masp_primitives = { git = "https://github.com/anoma/masp", tag = "v1.1.0" }
 masp_proofs = { git = "https://github.com/anoma/masp", tag = "v1.1.0", default-features = false, features = ["local-prover"] }
-namada = { git = "https://github.com/anoma/namada", version = "0.31.1", default-features = false, features = ["namada-sdk"] }
+namada = { git = "https://github.com/anoma/namada", version = "0.31.4", default-features = false, features = ["namada-sdk"] }
 rand = "0.8.5"
 rexie = "0.5"
 serde = "^1.0.181"