@@ -26,36 +26,32 @@ const Postcode: React.FC<PostcodeProps> = ({
2626 const { addressAPI } = useTrusteeContext ( ) ;
2727
2828 const search = useCallback (
29- ( postcode : string , country = 'GBR' , take = 100 ) => {
29+ ( postcode : string , country = 'GBR' , take = 25 ) => {
3030 setLoading ( true ) ;
31- addressAPI
32- . get ( `search?country=${ country } &query=${ postcode } &take=${ take } ` )
31+ addressAPI ( `search?country=${ country } &query=${ postcode } &take=${ take } ` )
3332 . then ( ( resp ) => {
34- if (
35- Array . isArray ( resp . data . results ) &&
36- resp . data . results . length > 0
37- ) {
33+ if ( Array . isArray ( resp . results ) && resp . results . length > 0 ) {
3834 Promise . all (
39- resp . data . results . map ( ( { format } : { format : string } ) => {
35+ resp . results . map ( ( { format } : { format : string } ) => {
4036 const [ url ] = format . split ( 'v2/' ) . slice ( - 1 ) ;
41- return addressAPI . get ( url ) . then ( ( { data } ) => {
42- const address = extractToObject ( data . address ) ;
37+ return addressAPI ( url ) . then ( ( { address } ) => {
38+ const addressObject = extractToObject ( address ) ;
4339
4440 const addressToOurFormat = {
45- addressLine1 : address . addressLine1 || '' ,
46- addressLine2 : address . addressLine2 || '' ,
47- addressLine3 : address . addressLine3 || '' ,
48- city : address . locality || '' ,
49- county : address . province || '' ,
50- postcode : address . postalCode || '' ,
51- country : address . country || '' ,
41+ addressLine1 : addressObject . addressLine1 || '' ,
42+ addressLine2 : addressObject . addressLine2 || '' ,
43+ addressLine3 : addressObject . addressLine3 || '' ,
44+ postTown : addressObject . locality || '' ,
45+ postcode : addressObject . postalCode || '' ,
46+ county : addressObject . province || '' ,
47+ country : addressObject . country || '' ,
5248 } ;
5349
5450 return {
55- ... addressToOurFormat ,
56- singleLineAddress : Object . keys ( addressToOurFormat )
57- . filter ( ( key ) => address [ key ] )
58- . map ( ( key ) => address [ key ] )
51+ value : addressToOurFormat ,
52+ label : Object . keys ( addressToOurFormat )
53+ . filter ( ( key ) => addressObject [ key ] )
54+ . map ( ( key ) => addressObject [ key ] )
5955 . join ( ', ' ) ,
6056 } ;
6157 } ) ;
0 commit comments