Uplift of #16928 (squashed) to beta

brave · Jan 31, 2023 · 028acbf · 028acbf
1 parent 934c520
commit 028acbf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/components/brave_wallet/renderer/js_solana_provider.cc b/components/brave_wallet/renderer/js_solana_provider.cc
@@ -198,7 +198,7 @@ void JSSolanaProvider::AccountChangedEvent(
 }
 
 void JSSolanaProvider::DidFinishLoad() {
-  if (wallet_standard_loaded_) {
+  if (wallet_standard_loaded_ || !EnsureConnected()) {
     return;
   }
   solana_provider_->IsSolanaKeyringCreated(
@@ -993,7 +993,7 @@ v8::Local<v8::Value> JSSolanaProvider::CreateTransaction(
 }
 
 void JSSolanaProvider::OnIsSolanaKeyringCreated(bool created) {
-  if (!created) {
+  if (!created || !render_frame()) {
     return;
   }
   v8::Isolate* isolate = blink::MainThreadIsolate();