From 494726d79ee8dc6a6ddda4c6fff003e4e4b3342c Mon Sep 17 00:00:00 2001
From: Igor Sirotin <sirotin@status.im>
Date: Mon, 25 Nov 2024 23:26:18 +0000
Subject: [PATCH] fix_: rebase issues, linter

---
 logutils/override.go                             | 2 +-
 mobile/callog/status_request_log.go              | 1 +
 mobile/status.go                                 | 3 +--
 protocol/messenger_store_node_request_manager.go | 3 ++-
 wakuv2/history_processor_wrapper.go              | 3 ++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/logutils/override.go b/logutils/override.go
index c8180d74952..afb9b8cfc7c 100644
--- a/logutils/override.go
+++ b/logutils/override.go
@@ -37,7 +37,7 @@ func overrideCoreWithConfig(core *Core, settings LogSettings) error {
 		return err
 	}
 	core.SetLevel(level)
-	
+
 	if settings.File != "" {
 		if settings.MaxBackups == 0 {
 			// Setting MaxBackups to 0 causes all log files to be kept. Even setting MaxAge to > 0 doesn't fix it
diff --git a/mobile/callog/status_request_log.go b/mobile/callog/status_request_log.go
index 1b2841fcb22..00a3619c69b 100644
--- a/mobile/callog/status_request_log.go
+++ b/mobile/callog/status_request_log.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"go.uber.org/zap"
+
 	"github.com/status-im/status-go/internal/sentry"
 )
 
diff --git a/mobile/status.go b/mobile/status.go
index ad39944116a..761a917b0fb 100644
--- a/mobile/status.go
+++ b/mobile/status.go
@@ -149,14 +149,13 @@ func initializeApplication(requestJSON string) string {
 
 	// initialize sentry
 	statusBackend.SetSentryDSN(request.SentryDSN)
-	if centralizedMetricsInfo.Enabled {
+	if metricsInfo.Enabled {
 		err = statusBackend.EnablePanicReporting()
 		if err != nil {
 			return makeJSONResponse(err)
 		}
 	}
 
-
 	// Prepare response
 	response := &InitializeApplicationResponse{
 		Accounts:               accs,
diff --git a/protocol/messenger_store_node_request_manager.go b/protocol/messenger_store_node_request_manager.go
index fe725093f6a..362e1767a73 100644
--- a/protocol/messenger_store_node_request_manager.go
+++ b/protocol/messenger_store_node_request_manager.go
@@ -8,10 +8,11 @@ import (
 	"sync"
 	"time"
 
+	"github.com/waku-org/go-waku/waku/v2/api/history"
+
 	gocommon "github.com/status-im/status-go/common"
 	"github.com/status-im/status-go/eth-node/crypto"
 	"github.com/status-im/status-go/protocol/common/shard"
-	"github.com/waku-org/go-waku/waku/v2/api/history"
 
 	"go.uber.org/zap"
 
diff --git a/wakuv2/history_processor_wrapper.go b/wakuv2/history_processor_wrapper.go
index 25cee9e8f88..eba4b380957 100644
--- a/wakuv2/history_processor_wrapper.go
+++ b/wakuv2/history_processor_wrapper.go
@@ -3,9 +3,10 @@ package wakuv2
 import (
 	"github.com/libp2p/go-libp2p/core/peer"
 
-	"github.com/status-im/status-go/wakuv2/common"
 	"github.com/waku-org/go-waku/waku/v2/api/history"
 	"github.com/waku-org/go-waku/waku/v2/protocol"
+
+	"github.com/status-im/status-go/wakuv2/common"
 )
 
 type HistoryProcessorWrapper struct {