fix: Merge conflicts

0xPolygonID · Nov 7, 2023 · 819d87e · 819d87e
1 parent a5d258d
commit 819d87e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 245 deletions.
diff --git a/internal/api/config_handler.go b/internal/api/config_handler.go
@@ -45,7 +45,7 @@ func (s *Server) GetConfig(_ context.Context, _ GetConfigRequestObject) (GetConf
 
 		KeyValue{
 			Key:   "ISSUER_API_IPFS_GATEWAY_URL",
-			Value: s.cfg.IFPS.GatewayURL,
+			Value: s.cfg.IPFS.GatewayURL,
 		},
 	}
 

diff --git a/internal/api_ui/config_handler.go b/internal/api_ui/config_handler.go
@@ -70,7 +70,7 @@ func (s *Server) GetConfig(_ context.Context, _ GetConfigRequestObject) (GetConf
 
 		KeyValue{
 			Key:   "ISSUER_API_IPFS_GATEWAY_URL",
-			Value: s.cfg.IFPS.GatewayURL,
+			Value: s.cfg.IPFS.GatewayURL,
 		},
 	}
 

diff --git a/internal/core/services/claims.go b/internal/core/services/claims.go
@@ -79,7 +79,6 @@ func NewClaim(repo ports.ClaimsRepository, idenSrv ports.IdentityService, qrServ
 	}
 	if ipfsGatewayURL != "" {
 		s.ipfsClient = shell.NewShell(ipfsGatewayURL)
-		s.ipfsGatewayURL = ipfsGatewayURL
 	}
 	return s
 }

diff --git a/internal/loader/w3CDocumentLoader.go b/internal/loader/w3CDocumentLoader.go